[FIXED JENKINS-7894] Prevent parameter values from disappearing when …

…user is not logged in
jenkinsci · Aug 17, 2012 · 74d2607 · 74d2607
1 parent 36ab713
commit 74d2607
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -72,6 +72,9 @@
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14769">issue 14769</a>)
   <li class=bug>
     Description preview and syntax highlighting broken since 1.477.
+  <li class=bug>
+    Parameter values disappear if user is not logged in
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7894">issue 7894</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
@@ -23,6 +23,7 @@
  */
 package hudson.security;
 
+import com.google.common.base.Strings;
 import org.acegisecurity.AuthenticationException;
 import org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint;
 
@@ -74,8 +75,10 @@ public void commence(ServletRequest request, ServletResponse response, Authentic
             rsp.sendError(SC_FORBIDDEN);
         } else {
             // give the opportunity to include the target URL
+            String uriFrom = req.getRequestURI();
+            if(!Strings.isNullOrEmpty(req.getQueryString())) uriFrom += "?" + req.getQueryString();
             String loginForm = req.getContextPath()+getLoginFormUrl();
-            loginForm = MessageFormat.format(loginForm, URLEncoder.encode(req.getRequestURI(),"UTF-8"));
+            loginForm = MessageFormat.format(loginForm, URLEncoder.encode(uriFrom,"UTF-8"));
             req.setAttribute("loginForm", loginForm);
 
             rsp.setStatus(SC_FORBIDDEN);