From f2f9d36c06f10f13532f01c8e2f212a7a2b16468 Mon Sep 17 00:00:00 2001
From: "Ing. Pavel Janousek" <pjanouse@redhat.com>
Date: Thu, 12 May 2016 14:43:54 +0200
Subject: [PATCH] Fixed per Oliver's comments

---
 .../main/java/hudson/security/SecurityRealm.java  | 15 ++++++++-------
 .../hudson/security/SecurityRealm/loginLink.jelly |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index f0afc62ae7..1c91520d3c 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -49,6 +49,8 @@ import org.acegisecurity.userdetails.UserDetailsService;
 import org.acegisecurity.userdetails.UserDetails;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.apache.commons.lang.StringUtils;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
@@ -494,6 +496,7 @@ public abstract class SecurityRealm extends AbstractDescribableImpl<SecurityReal
      *
      * @since TODO
      */
+    @Restricted(DoNotUse.class)
     public static String getFrom() {
         String from = null, returnValue = null;
         final StaplerRequest request = Stapler.getCurrentRequest();
@@ -503,10 +506,8 @@ public abstract class SecurityRealm extends AbstractDescribableImpl<SecurityReal
         if (request != null
                 && request.getSession(false) != null) {
             from = (String) request.getSession().getAttribute("from");
-        } else {
-            if (request != null) {
-                from = request.getParameter("from");
-            }
+        } else if (request != null) {
+            from = request.getParameter("from");
         }
 
         // If entry point was not found, try to deduce it from the request URI
@@ -514,18 +515,18 @@ public abstract class SecurityRealm extends AbstractDescribableImpl<SecurityReal
         if (from == null
                 && request != null
                 && request.getRequestURI() != null
-                && request.getRequestURI().compareTo("/loginError") != 0
-                && request.getRequestURI().compareTo("/login") != 0) {
+                && request.getRequestURI().equals("/loginError")
+                && request.getRequestURI().equals("/login")) {
 
                 from = request.getRequestURI();
         }
 
         // If deduced entry point isn't deduced yet or the content is a blank value
         // use the root web point "/" as a fallback
-        from.trim();
         if (StringUtils.isBlank(from)) {
             from = "/";
         }
+        from.trim();
 
         // Encode the return value
         try {
diff --git a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
index bd53c7e3ee..8b065c318b 100644
--- a/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
+++ b/core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
@@ -25,5 +25,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-  <a href="${rootURL}/${app.securityRealm.loginUrl}?from=${from}"><b>${%login}</b></a>
+  <a href="${rootURL}/${app.securityRealm.loginUrl}?from=${app.securityRealm.from}"><b>${%login}</b></a>
 </j:jelly>
-- 
GitLab