Merge pull request #115 from Likelion-YeungNam-Univ/feature-filter

feat: filter 수정
Likelion-YeungNam-Univ · Aug 6, 2024 · 60de82e · 60de82e
2 parents 022559f + 0c5f5c3
commit 60de82e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/main/java/com/example/holing/base/config/JwtFilter.java b/src/main/java/com/example/holing/base/config/JwtFilter.java
@@ -8,6 +8,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -19,6 +20,21 @@
 public class JwtFilter extends OncePerRequestFilter {
     private final UserService userService;
     private final JwtProvider jwtProvider;
+    @Value("${webUrl}")
+    private String webUrl;
+
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) {
+        String path = request.getRequestURI();
+        return path.startsWith("/auth/") ||
+                path.startsWith("/survey/self-test") ||
+                path.startsWith("/swagger-resources/") ||
+                path.startsWith("/swagger-ui/") ||
+                path.startsWith("/v3/api-docs/") ||
+                path.startsWith("/webjars/") ||
+                path.startsWith("/error");
+    }
+
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
@@ -27,11 +43,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             String userId = jwtProvider.getUserId(accessToken);
             User user = userService.read(Long.parseLong(userId));
 
-            Authentication authentication = new UsernamePasswordAuthenticationToken(userId, null, null); //인증객체 생성
+            Authentication authentication = new UsernamePasswordAuthenticationToken(user, null, null); //인증객체 생성
             SecurityContextHolder.getContext().setAuthentication(authentication); //인증정보 저장
             filterChain.doFilter(request, response);
         } catch (Exception e) {
-
+            response.sendRedirect("/auth/login");
         }
     }
 }
diff --git a/src/main/java/com/example/holing/base/config/SecurityConfig.java b/src/main/java/com/example/holing/base/config/SecurityConfig.java
@@ -44,17 +44,17 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
                 }))
                 .csrf(csrf -> csrf.disable())
                 .authorizeHttpRequests(request ->
-                        request.requestMatchers("/auth/**").permitAll()
-                                .requestMatchers("/survey/self-test").permitAll()
-                                .requestMatchers("/swagger-resources/**",
+                        request.requestMatchers("/auth/**",
+                                        "/survey/self-test",
+                                        "/swagger-resources/**",
                                         "/swagger-ui/**",
                                         "/v3/api-docs/**",
                                         "/webjars/**",
                                         "/error").permitAll()
                                 .anyRequest().authenticated())
                 .addFilterBefore(new JwtFilter(userService, jwtProvider), UsernamePasswordAuthenticationFilter.class)
-                .exceptionHandling(hp -> hp
-                        .authenticationEntryPoint(customAuthenticationEntryPoint))
+//                .exceptionHandling(hp -> hp
+//                        .authenticationEntryPoint(customAuthenticationEntryPoint))
                 .formLogin(Customizer.withDefaults())
                 .build();
     }