[merge] 배포, 로컬 url 분리 배포환경에 반영

[deploy] 배포, 로컬 url 분리 배포환경에 반영

Author: laura-jung

src/main/java/com/Timo/Timo/global/auth/filter/OAuthOriginCaptureFilter.java

@@ -0,0 +1,34 @@
+package com.Timo.Timo.global.auth.filter;
+
+import java.io.IOException;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class OAuthOriginCaptureFilter extends OncePerRequestFilter {
+
+    public static final String SESSION_KEY = "OAUTH_FRONTEND_ORIGIN";
+    private static final String AUTHORIZATION_PATH_PREFIX = "/oauth2/authorization/";
+    private static final String ORIGIN_PARAM = "redirect_origin";
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            FilterChain filterChain
+    ) throws ServletException, IOException {
+        if (request.getRequestURI().startsWith(AUTHORIZATION_PATH_PREFIX)) {
+            String origin = request.getParameter(ORIGIN_PARAM);
+            if (origin != null && !origin.isBlank()) {
+                request.getSession().setAttribute(SESSION_KEY, origin);
+            }
+        }
+        filterChain.doFilter(request, response);
+    }
+}

src/main/java/com/Timo/Timo/global/auth/handler/OAuthSuccessHandler.java

@@ -1,5 +1,6 @@
 package com.Timo.Timo.global.auth.handler;
 
+import com.Timo.Timo.global.auth.filter.OAuthOriginCaptureFilter;
 import com.Timo.Timo.global.auth.principal.CustomUserDetails;
 import com.Timo.Timo.global.auth.service.AuthCodeService;
 import com.Timo.Timo.global.auth.service.RefreshTokenService;
@@ -8,6 +9,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -24,8 +26,11 @@ public class OAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
   private final RefreshTokenService refreshTokenService;
   private final AuthCodeService authCodeService;
 
-  @Value("${app.oauth2.redirect-uri}")
-  private String redirectUri;
+  @Value("${app.oauth2.allowed-frontend-urls}")
+  private List<String> allowedFrontendUrls;
+
+  @Value("${app.oauth2.callback-path}")
+  private String callbackPath;
 
   @Value("${app.auth.cookie-secure}")
   private boolean cookieSecure;
@@ -37,6 +42,8 @@ public void onAuthenticationSuccess(
       Authentication authentication
   ) throws IOException {
 
+    String frontendOrigin = resolveFrontendOrigin(request);
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
     Long userId = userDetails.getUserId();
     boolean onboardingCompleted = userDetails.getUser().isOnboardingCompleted();
@@ -56,10 +63,23 @@ public void onAuthenticationSuccess(
         onboardingCompleted
     );
 
-    String redirectUrl = UriComponentsBuilder.fromUriString(redirectUri)
+    String redirectUrl = UriComponentsBuilder.fromUriString(frontendOrigin + callbackPath)
         .queryParam("code", code)
         .build().toUriString();
 
     getRedirectStrategy().sendRedirect(request, response, redirectUrl);
   }
+
+  private String resolveFrontendOrigin(HttpServletRequest request) {
+    String origin = null;
+    if (request.getSession(false) != null) {
+      origin = (String) request.getSession().getAttribute(OAuthOriginCaptureFilter.SESSION_KEY);
+      request.getSession().removeAttribute(OAuthOriginCaptureFilter.SESSION_KEY);
+    }
+
+    if (origin != null && allowedFrontendUrls.contains(origin)) {
+      return origin;
+    }
+    return allowedFrontendUrls.get(0);
+  }
 }

src/main/java/com/Timo/Timo/global/config/SecurityConfig.java

@@ -2,6 +2,7 @@
 
 import com.Timo.Timo.global.auth.handler.JwtAuthenticationEntryPoint;
 import com.Timo.Timo.global.auth.handler.OAuthFailureHandler;
+import com.Timo.Timo.global.auth.filter.OAuthOriginCaptureFilter;
 import com.Timo.Timo.global.auth.handler.OAuthSuccessHandler;
 import com.Timo.Timo.global.auth.service.CustomOAuth2UserService;
 import com.Timo.Timo.global.jwt.filter.JwtAuthenticationFilter;
@@ -14,6 +15,7 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfigurationSource;
@@ -29,6 +31,7 @@ public class SecurityConfig {
   private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
   private final JwtAuthenticationFilter jwtAuthenticationFilter;
   private final CorsConfigurationSource corsConfigurationSource;
+  private final OAuthOriginCaptureFilter oAuthOriginCaptureFilter;
 
 	@Bean
 	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
@@ -64,7 +67,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
             exception.authenticationEntryPoint(jwtAuthenticationEntryPoint)
         )
         .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
-        .addFilterBefore(mdcLoggingFilter(), JwtAuthenticationFilter.class);
+        .addFilterBefore(mdcLoggingFilter(), JwtAuthenticationFilter.class)
+        .addFilterBefore(oAuthOriginCaptureFilter, OAuth2AuthorizationRequestRedirectFilter.class);
 
     return http.build();
   }
@@ -82,4 +86,4 @@ public FilterRegistrationBean<MdcLoggingFilter> mdcLoggingFilterRegistration(
     registrationBean.setEnabled(false);
     return registrationBean;
   }
-}
+}

src/main/resources/application-local.yml

@@ -33,7 +33,7 @@ security:
 
 app:
   oauth2:
-    redirect-uri: http://localhost:5173/oauth/callback
+    allowed-frontend-urls: ${FRONTEND_URLS}
   calendar:
     redirect-uri: ${FRONTEND_URL}/oauth/calendar/callback
   auth:

src/main/resources/application-prod.yml

@@ -42,7 +42,7 @@ security:
 
 app:
   oauth2:
-    redirect-uri: ${FRONTEND_URL}/oauth/callback
+    allowed-frontend-urls: ${FRONTEND_URLS}
   calendar:
     redirect-uri: ${FRONTEND_URL}/oauth/calendar/callback
   auth:
@@ -72,4 +72,4 @@ sentry:
   dsn: ${SENTRY_DSN}
   environment: ${SENTRY_ENVIRONMENT:prod}
   traces-sample-rate: ${SENTRY_TRACES_SAMPLE_RATE:0.0}
-  release: ${SENTRY_RELEASE:unknown}
+  release: ${SENTRY_RELEASE:unknown}

src/main/resources/application.yml

@@ -28,6 +28,10 @@ springdoc:
   default-produces-media-type: application/json
   default-consumes-media-type: application/json
 
+app:
+  oauth2:
+    callback-path: /oauth/callback
+
 management:
   endpoints:
     web: