From dd8628ff2806e7e0532acec90f0da9ce2f5c2eab Mon Sep 17 00:00:00 2001 From: youth Date: Mon, 24 Jun 2024 15:40:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EA=B8=B0=EC=88=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D,=20=EC=84=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20API=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/cotato/csquiz/common/config/SecurityConfig.java | 4 ++-- .../common/config/filter/JwtAuthorizationFilter.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java b/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java index 5126df26..17cf48d7 100644 --- a/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java @@ -28,6 +28,8 @@ public class SecurityConfig { "/swagger-ui/**", "/v3/api-docs/**", "/swagger-ui.html", + "/v1/api/generation", + "/v1/api/session", "/websocket/csquiz" }; @@ -49,7 +51,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { AuthenticationManager authenticationManager = sharedObject.build(); http.authenticationManager(authenticationManager); http.cors(); - http.csrf().disable() .cors().disable() .formLogin().disable() @@ -67,7 +68,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .hasAnyRole("MEMBER", "EDUCATION", "ADMIN") .requestMatchers(new AntPathRequestMatcher("/v1/api/education", "GET")).authenticated() .requestMatchers("/v1/api/education/**").hasAnyRole("EDUCATION", "ADMIN") - .requestMatchers("/v1/api/generation").authenticated() .requestMatchers("/v1/api/generation/**").hasAnyRole("ADMIN") .requestMatchers("/v1/api/mypage/**").hasAnyRole("MEMBER", "OLD_MEMBER", "EDUCATION", "ADMIN") .requestMatchers("/v1/api/quiz/cs-admin/**").hasAnyRole("EDUCATION", "ADMIN") diff --git a/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java index 228db3c7..988ab98d 100644 --- a/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java +++ b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java @@ -28,7 +28,10 @@ public class JwtAuthorizationFilter extends OncePerRequestFilter { private static final String LOGIN_PATH = "/login"; private static final String SWAGGER_PATH = "/swagger-ui"; private static final String SWAGGER_PATH_3 = "/v3/api-docs"; + private static final String SWAGGER_FAVICON = "/favicon.ico"; private static final String WS = "/websocket/csquiz"; + private static final String GENERATION_PATH = "/v1/api/generation"; + private static final String SESSION_PATH = "/v1/api/session"; private final JwtTokenProvider jwtTokenProvider; private final MemberRepository memberRepository; @@ -63,7 +66,9 @@ protected boolean shouldNotFilter(HttpServletRequest request) { String path = request.getRequestURI(); log.info("요청 경로: {}", path); log.info("요청 메서드: {}", request.getMethod()); - return path.startsWith(AUTH_PATH) || path.startsWith(LOGIN_PATH) - || path.startsWith(SWAGGER_PATH) || path.startsWith(SWAGGER_PATH_3) || path.startsWith(WS); + return path.startsWith(AUTH_PATH) || path.equals(LOGIN_PATH) + || path.startsWith(SWAGGER_PATH) || path.equals(SWAGGER_FAVICON) + || path.startsWith(SWAGGER_PATH_3) || path.startsWith(WS) + || path.equals(GENERATION_PATH) || path.startsWith(SESSION_PATH); } } From 18d648bd11f391c88795511cb4642cb41e9102ae Mon Sep 17 00:00:00 2001 From: youth Date: Mon, 24 Jun 2024 15:40:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=EA=B8=B0=EC=88=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D,=20=EC=84=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20API=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csquiz/common/config/filter/JwtAuthorizationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java index 988ab98d..4ed3c4f3 100644 --- a/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java +++ b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java @@ -69,6 +69,6 @@ protected boolean shouldNotFilter(HttpServletRequest request) { return path.startsWith(AUTH_PATH) || path.equals(LOGIN_PATH) || path.startsWith(SWAGGER_PATH) || path.equals(SWAGGER_FAVICON) || path.startsWith(SWAGGER_PATH_3) || path.startsWith(WS) - || path.equals(GENERATION_PATH) || path.startsWith(SESSION_PATH); + || path.equals(GENERATION_PATH) || path.equals(SESSION_PATH); } }