Merge pull request #26 from hyundai-fruitfruit/HEENDY-89-Security-filter

fix: Security AuthTokenFilter에서 에러 잡고 다음 필터로 넘기도록 설정 변경
hyundai-fruitfruit · Mar 3, 2024 · 3f592ae · 3f592ae
2 parents e5c07d3 + 6761ebc
commit 3f592ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/src/main/java/com/hyundai/app/config/SecurityConfig.java b/src/main/java/com/hyundai/app/config/SecurityConfig.java
@@ -36,9 +36,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     public void configure(WebSecurity web) {
         web.ignoring().antMatchers(
-                "/", "/resources/**",
-                "/v2/api-docs", "/swagger-resources/**", "/swagger-ui/index.html", "/swagger-ui.html","/webjars/**", "/swagger/**",   // swagger
-                "/api/v1/auth/**", "/api/v1/admin/**", "/api/v1/fcm-push/random-spot/**", "/api/v1/heendy-guide/**", "/websocket/**");
+                "/", "/resources/**"
+                , "/v2/api-docs", "/swagger-resources/**", "/swagger-ui/index.html"
+                , "/swagger-ui.html","/webjars/**", "/swagger/**"   // swagger
+                );
     }
 
     @Override
@@ -60,10 +61,14 @@ public void configure(HttpSecurity httpSecurity) throws Exception {
                     .accessDeniedHandler(authTokenAccessDeniedHandler)
                 .and()
                     .authorizeRequests()
-                    .antMatchers("/api/v1/auth/**").permitAll()
-                    .antMatchers("/api/v1/admin/**").permitAll()
-                    .antMatchers("/api/v1/fcm-push/**").permitAll()
-                    .antMatchers("/api/v1/fcm-push/**").permitAll()
+                .antMatchers("/api/v1/auth/**"
+                            ,"/api/v1/admin/**"
+                            , "/api/v1/fcm-push/**"
+                            , "/api/v1/auth/**"
+                            , "/api/v1/admin/**"
+                            , "/api/v1/fcm-push/random-spot/**"
+                            , "/api/v1/heendy-guide/**"
+                            , "/websocket/**").permitAll()
                     .antMatchers("/api/v1/stores/**").authenticated()
                     .antMatchers("/api/v1/members/**").authenticated()
                     .anyRequest().permitAll()

diff --git a/src/main/java/com/hyundai/app/security/filter/AuthTokenFilter.java b/src/main/java/com/hyundai/app/security/filter/AuthTokenFilter.java
@@ -41,13 +41,15 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             log.debug("AuthTokenFilter : request " + request);
             String accessToken = resolveToken(request);
             log.debug("AuthTokenFilter : accessToken " + accessToken);
-            jwtTokenGenerator.isTokenValidate(accessToken);
+            if (!jwtTokenGenerator.isTokenValidate(accessToken)) {
+                log.error("AuthTokenFilter ERROR : accessToken 토큰이 유효하지 않습니다.");
+                throw new AdventureOfHeendyException(ErrorCode.ACCESS_TOKEN_INVALID);
+            }
 
             Authentication authentication = createAuthentication(accessToken);
             SecurityContextHolder.getContext().setAuthentication(authentication);
         } catch (Exception e) {
-            log.debug("AuthTokenFilter : accessToken 토큰이 유효하지 않습니다.");
-            throw new AdventureOfHeendyException(ErrorCode.ACCESS_TOKEN_INVALID);
+            log.error("AuthTokenFilter ERROR catch! accessToken 토큰이 유효하지 않습니다.");
         }
         filterChain.doFilter(request, response);
     }

diff --git a/src/main/java/com/hyundai/app/security/jwt/JwtTokenGenerator.java b/src/main/java/com/hyundai/app/security/jwt/JwtTokenGenerator.java
@@ -96,13 +96,15 @@ public Claims getClaims(String accessToken) {
      * @since 2024/02/14
      * 토큰 유효성 검증
      */
-    public void isTokenValidate(String token) {
+    public boolean isTokenValidate(String token) {
         try {
             Jwts.parser()
                 .setSigningKey(jwtSecret)
                 .parseClaimsJws(token);
+            return true;
         } catch (JwtException | IllegalArgumentException e) {
-            throw new AdventureOfHeendyException(ErrorCode.ACCESS_TOKEN_INVALID);
+            log.error("isTokenValidate() 토큰 파싱 시, 에러 발생 ");
         }
+        return false;
     }
 }