From 6c8e257a1ee39bf026c57a15df864971bbdec7db Mon Sep 17 00:00:00 2001
From: PIG AI <wangiegie@gmail.com>
Date: Thu, 5 Jun 2025 00:29:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(auth/templates):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=ADrequest.contextPath=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在confirm.ftl和login.ftl模板中增加request对象判空逻辑
- 优化OAuth2授权和登录表单的action路径安全性
---
 pigx-auth/src/main/resources/templates/ftl/confirm.ftl | 3 ++-
 pigx-auth/src/main/resources/templates/ftl/login.ftl   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
index 4568b00ba..2161c611b 100644
--- a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
+++ b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
@@ -18,7 +18,8 @@
 		</div>
 	</div>
 
-	<form id='confirmationForm' name='confirmationForm' action="${request.contextPath}/oauth2/authorize" method='post'>
+	<form id='confirmationForm' name='confirmationForm'
+		  action="<#if request??>${request.contextPath!}</#if>/oauth2/authorize" method='post'>
 		<input type="hidden" name="client_id" value="${clientId}">
 		<input type="hidden" name="state" value="${state}">
 
diff --git a/pigx-auth/src/main/resources/templates/ftl/login.ftl b/pigx-auth/src/main/resources/templates/ftl/login.ftl
index e2a3d241f..b582267fe 100755
--- a/pigx-auth/src/main/resources/templates/ftl/login.ftl
+++ b/pigx-auth/src/main/resources/templates/ftl/login.ftl
@@ -12,7 +12,7 @@
         <p class="mt-2 text-sm text-gray-600 dark:text-gray-400">安全便捷的企业级认证服务</p>
     </div>
 
-    <form class="form-signin" action="${request.contextPath}/oauth2/form" method="post">
+    <form class="form-signin" action="<#if request??>${request.contextPath!}</#if>/oauth2/form" method="post">
         <input type="hidden" name="client_id" value="pig">
         <input type="hidden" name="grant_type" value="password">
         <div class="space-y-6">