Improve redirect to use custom request cache

Author: mraible

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

@@ -1,15 +1,32 @@
 package com.okta.developer.jugtours.config;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 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.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
+import org.springframework.security.web.savedrequest.RequestCache;
+import org.springframework.security.web.savedrequest.SavedRequest;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 @Configuration
 @EnableOAuth2Sso
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+    private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class);
 
     @Override
     public void configure(WebSecurity web) throws Exception {
@@ -18,15 +35,108 @@ public void configure(WebSecurity web) throws Exception {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
+        RequestCache requestCache = refererRequestCache();
+        SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
+        handler.setRequestCache(requestCache);
         http
                 .csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+            .and()
+                .oauth2Login()
+                .successHandler(handler)
             .and()
                 .authorizeRequests()
+                .antMatchers("/**/*.{js,html,css}").permitAll()
                 .antMatchers("/", "/api/user").permitAll()
                 .anyRequest().authenticated();/*
             .and()
                 .requiresChannel()
                 .requestMatchers(r -> r.getHeader("x-forwarded-proto") != null)
                 .requiresSecure();*/
     }
+
+    @Bean
+    @Profile("dev")
+    public RequestCache refererRequestCache() {
+        return new RequestCache() {
+            private String savedAttrName = getClass().getName().concat(".SAVED");
+
+            @Override
+            public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
+                String referrer = request.getHeader("referer");
+                if (referrer != null) {
+                    request.getSession().setAttribute(this.savedAttrName, referrerRequest(referrer));
+                }
+            }
+
+            @Override
+            public SavedRequest getRequest(HttpServletRequest request, HttpServletResponse response) {
+                HttpSession session = request.getSession(false);
+
+                if (session != null) {
+                    return (SavedRequest) session.getAttribute(this.savedAttrName);
+                }
+
+                return null;
+            }
+
+            @Override
+            public HttpServletRequest getMatchingRequest(HttpServletRequest request, HttpServletResponse response) {
+                return request;
+            }
+
+            @Override
+            public void removeRequest(HttpServletRequest request, HttpServletResponse response) {
+                HttpSession session = request.getSession(false);
+
+                if (session != null) {
+                    log.debug("Removing SavedRequest from session if present");
+                    session.removeAttribute(this.savedAttrName);
+                }
+            }
+        };
+    }
+
+    private SavedRequest referrerRequest(final String referrer) {
+        return new SavedRequest() {
+            @Override
+            public String getRedirectUrl() {
+                return referrer;
+            }
+
+            @Override
+            public List<Cookie> getCookies() {
+                return null;
+            }
+
+            @Override
+            public String getMethod() {
+                return null;
+            }
+
+            @Override
+            public List<String> getHeaderValues(String name) {
+                return null;
+            }
+
+            @Override
+            public Collection<String> getHeaderNames() {
+                return null;
+            }
+
+            @Override
+            public List<Locale> getLocales() {
+                return null;
+            }
+
+            @Override
+            public String[] getParameterValues(String name) {
+                return new String[0];
+            }
+
+            @Override
+            public Map<String, String[]> getParameterMap() {
+                return null;
+            }
+        };
+    }
 }

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

@@ -18,7 +18,8 @@ public class GroupEventHandler {
     public void handleBeforeSave(Group group) {
         Map<String, Object> details = (Map<String, Object>) SecurityContextHolder.getContext()
                 .getAuthentication().getDetails();
-        User user = new User(null, details.get("name").toString(), details.get("email").toString());
+        User user = new User(details.get("sub").toString(),
+                details.get("name").toString(), details.get("email").toString());
         log.info("Creating group: {} with user: {}", group.getName());
         group.setUser(user);
     }

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

@@ -5,7 +5,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 @Data
@@ -15,8 +14,7 @@
 public class User {
 
     @Id
-    @GeneratedValue
-    private Long id;
+    private String id;
     private String name;
     private String email;
 }

src/main/java/com/okta/developer/jugtours/model/GroupEventHandler.java

@@ -1,6 +1,5 @@
 package com.okta.developer.jugtours.web;
 
-import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateFactory;
 import org.springframework.http.HttpStatus;
@@ -12,7 +11,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.Response;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.Map;