Polish refererRequestCache

Author: rwinch

src/main/java/com/okta/developer/jugtours/config/SecurityConfiguration.java

@@ -8,23 +8,16 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.web.PortResolver;
-import org.springframework.security.web.PortResolverImpl;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
 import org.springframework.security.web.savedrequest.RequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;
-import org.springframework.security.web.util.matcher.AnyRequestMatcher;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.util.StringUtils;
 
 import javax.servlet.http.*;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Configuration
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
-    private static final String SAVED_LOGIN_ORIGIN_URI = SecurityConfiguration.class.getName() + "_SAVED_ORIGIN";
     private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class);
 
     @Override
@@ -34,13 +27,20 @@ public void configure(WebSecurity web) throws Exception {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.oauth2Login()
-            .and()
-                .csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-            .and()
-                .requestCache().requestCache(refererRequestCache())
-            .and()
-                .authorizeRequests()
+        RequestCache requestCache = refererRequestCache();
+        SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
+        handler.setRequestCache(requestCache);
+        http
+            .oauth2Login()
+                .successHandler(handler)
+                .and()
+            .csrf()
+                .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+                .and()
+            .requestCache()
+                .requestCache(requestCache)
+                .and()
+            .authorizeRequests()
                 .antMatchers("/", "/api/user").permitAll()
                 .anyRequest().authenticated();/*
             .and()
@@ -53,21 +53,13 @@ protected void configure(HttpSecurity http) throws Exception {
     @Profile("dev")
     public RequestCache refererRequestCache() {
         return new RequestCache() {
-            private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
-            private PortResolver portResolver = new PortResolverImpl();
+            private String savedAttrName = getClass().getName().concat(".SAVED");
 
             @Override
             public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
-                if (request.getRemoteUser() == null && this.requestMatcher.matches(request)) {
-                    String referrer = request.getHeader("referer");
-                    if (!StringUtils.isEmpty(referrer) &&
-                            request.getSession().getAttribute(SAVED_LOGIN_ORIGIN_URI) == null) {
-                        log.info("Saving login origin URI: {}", referrer);
-                        SavedRequest savedRequest = referrerRequest(referrer);
-                        request.getSession().setAttribute(SAVED_LOGIN_ORIGIN_URI, savedRequest);
-                    }
-                } else {
-                    log.debug("Request not saved as configured RequestMatcher did not match");
+                String referrer = request.getHeader("referer");
+                if (referrer != null) {
+                    request.getSession().setAttribute(this.savedAttrName, referrerRequest(referrer));
                 }
             }
 
@@ -76,23 +68,15 @@ public SavedRequest getRequest(HttpServletRequest request, HttpServletResponse r
                 HttpSession session = request.getSession(false);
 
                 if (session != null) {
-                    return (SavedRequest) session.getAttribute(SAVED_LOGIN_ORIGIN_URI);
+                    return (SavedRequest) session.getAttribute(this.savedAttrName);
                 }
 
                 return null;
             }
 
             @Override
             public HttpServletRequest getMatchingRequest(HttpServletRequest request, HttpServletResponse response) {
-                SavedRequest saved = getRequest(request, response);
-
-                if (saved == null) {
-                    return null;
-                }
-
-                removeRequest(request, response);
-
-                return new SavedRequestAwareWrapper(saved, request);
+                return request;
             }
 
             @Override
@@ -101,37 +85,12 @@ public void removeRequest(HttpServletRequest request, HttpServletResponse respon
 
                 if (session != null) {
                     log.debug("Removing SavedRequest from session if present");
-                    session.removeAttribute(SAVED_LOGIN_ORIGIN_URI);
+                    session.removeAttribute(this.savedAttrName);
                 }
             }
         };
     }
 
-    private static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
-    private SavedRequest savedRequest = null;
-    /**
-     * The set of SimpleDateFormat formats to use in getDateHeader(). Notice that because
-     * SimpleDateFormat is not thread-safe, we can't declare formats[] as a static
-     * variable.
-     */
-    protected final SimpleDateFormat[] formats = new SimpleDateFormat[3];
-
-    class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
-
-        SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request){
-            super(request);
-            savedRequest = saved;
-
-            formats[0] = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
-            formats[1] = new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US);
-            formats[2] = new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US);
-
-            formats[0].setTimeZone(GMT_ZONE);
-            formats[1].setTimeZone(GMT_ZONE);
-            formats[2].setTimeZone(GMT_ZONE);
-        }
-    }
-
     private SavedRequest referrerRequest(final String referrer) {
         return new SavedRequest() {
             @Override