Merge pull request #475 from eva-mueller-coremedia/fix-redirect-refre…

…sh-token-has-expired Redirect to login page if refresh token has expired
jenkinsci · Dec 9, 2024 · 6e62f67 · 6e62f67
2 parents 81d9392 + 84359ac
commit 6e62f67
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/oic/OicSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/oic/OicSecurityRealm.java
@@ -1376,10 +1376,12 @@ public boolean handleTokenExpiration(HttpServletRequest httpRequest, HttpServlet
     }
 
     private void redirectToLoginUrl(HttpServletRequest req, HttpServletResponse res) throws IOException {
-        if (req.getSession(false) != null || Strings.isNullOrEmpty(req.getHeader("Authorization"))) {
+        if (req != null && (req.getSession(false) != null || Strings.isNullOrEmpty(req.getHeader("Authorization")))) {
             req.getSession().invalidate();
         }
-        res.sendRedirect(Jenkins.get().getSecurityRealm().getLoginUrl());
+        if (res != null) {
+            res.sendRedirect(Jenkins.get().getSecurityRealm().getLoginUrl());
+        }
     }
 
     public boolean isExpired(OicCredentials credentials) {
@@ -1475,7 +1477,7 @@ private boolean refreshExpiredToken(
                     return false;
                 }
                 LOGGER.log(Level.FINE, "Failed to refresh expired token", e);
-                redirectToLoginUrl(Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+                redirectToLoginUrl(httpRequest, httpResponse);
                 return false;
             }
             LOGGER.log(Level.WARNING, "Failed to refresh expired token", e);