[FEATURE] Security 관련 리팩토링 #21

bongsh0112 · 2023-10-10T04:25:13Z

CustomUserDetails 변경점 확인
claim에 새로운 값 추가

donsonioc2010

바꿔줘 응애

donsonioc2010 · 2023-10-10T04:39:41Z

src/main/java/HookKiller/server/config/security/SecurityConfig.java

@@ -56,6 +54,5 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
    PasswordEncoder passwordEncoder() {


접근제어자 필요하지 않을까요?

donsonioc2010 · 2023-10-10T04:44:45Z

src/main/java/HookKiller/server/jwt/JwtAuthenticationFilter.java

        if (header != null && header.startsWith(TOKEN_PREFIX)) {
            authToken = header.replace(TOKEN_PREFIX," ");
            try {
-                username = this.jwtTokenProvider.getUsernameFromToken(authToken);
+                CustomUserDetails userDetails = CustomUserDetails.of(
+                        jwtTokenProvider.getUserIdFromToken(authToken),
+                        jwtTokenProvider.getUserRoleFromToken(authToken),
+                        jwtTokenProvider.getUserNickNameFromToken(authToken)
+                );
+
+                SecurityContextHolder.getContext().setAuthentication(
+                        new UsernamePasswordAuthenticationToken(userDetails, "user", userDetails.getAuthorities())
+                );
            } catch (IllegalArgumentException ex) {
-                log.info("fail get user id");
+                throw UserNotFoundException.EXCEPTION;
            } catch (ExpiredJwtException ex) {
-                log.info("Token expired");
+                throw TokenNotFoundException.EXCEPTION;
            } catch (MalformedJwtException ex) {
-                log.info("Invalid JWT !!");
+                throw InvalidTokenException.EXCEPTION;
            } catch (Exception e) {
-                log.info("Unable to get JWT Token !!");
+                throw TokenException.EXCEPTION;
            }
        } else {
            log.info("JWT does not begin with Bearer !!");
        }


if (header != null && header.startsWith(TOKEN_PREFIX)) { authToken = header.replace(TOKEN_PREFIX," "); try { CustomUserDetails userDetails = CustomUserDetails.of( jwtTokenProvider.getUserIdFromToken(authToken), jwtTokenProvider.getUserRoleFromToken(authToken), jwtTokenProvider.getUserNickNameFromToken(authToken) ); SecurityContextHolder.getContext().setAuthentication( new UsernamePasswordAuthenticationToken(userDetails, "user", userDetails.getAuthorities()) ); } catch (IllegalArgumentException ex) { throw UserNotFoundException.EXCEPTION; } catch (ExpiredJwtException ex) { throw TokenNotFoundException.EXCEPTION; } catch (MalformedJwtException ex) { throw InvalidTokenException.EXCEPTION; } catch (Exception e) { throw TokenException.EXCEPTION; } } filterChain.doFilter(request, response);

이걸로도 끝낼 수 있지 않을까요?

donsonioc2010 · 2023-10-10T04:45:19Z

src/main/java/HookKiller/server/jwt/JwtTokenProvider.java

@@ -15,7 +14,7 @@
 import java.util.Map;
 import java.util.function.Function;

-import static HookKiller.server.common.constants.StaticVariable.*;
+import static HookKiller.server.jwt.ClaimVal.*;


*는 하나하나 다 호출하는걸로 변경가능할까요?

donsonioc2010

LGTM 정말 잘해쒀요~

bongsh0112 and others added 7 commits October 9, 2023 19:52

Merge branch 'dev' into feat/4-security-login

9343285

Merge branch 'dev' into feat/4-security-login

3d26fad

feat: CustomUserDetails 설정 변경 후 사용 방법 변경 #4

3a254ea

add : JwtTokenException 예외처리 추가

366e26e

fix : import 수정, TODO 작성 #4

8984a2e

edit : CustomUserDetails record로 변경. 확인 바람 #4

e2b3821

feat: claim에 새로운 값 추가 관련 리팩토링 #4

0cad937

bongsh0112 requested a review from donsonioc2010 October 10, 2023 04:25

bongsh0112 assigned wooni89 and bongsh0112 Oct 10, 2023

donsonioc2010 requested changes Oct 10, 2023

View reviewed changes

edit : 수정사항 변경 #4

9fedc40

donsonioc2010 self-requested a review October 10, 2023 05:05

donsonioc2010 approved these changes Oct 10, 2023

View reviewed changes

donsonioc2010 merged commit b7d8fe2 into dev Oct 10, 2023
1 check passed

donsonioc2010 deleted the feat/4-security-login branch October 10, 2023 05:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEATURE] Security 관련 리팩토링 #21

[FEATURE] Security 관련 리팩토링 #21

bongsh0112 commented Oct 10, 2023

donsonioc2010 left a comment

donsonioc2010 Oct 10, 2023

donsonioc2010 Oct 10, 2023

donsonioc2010 Oct 10, 2023

donsonioc2010 left a comment

		@@ -56,6 +54,5 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
		PasswordEncoder passwordEncoder() {

[FEATURE] Security 관련 리팩토링 #21

[FEATURE] Security 관련 리팩토링 #21

Conversation

bongsh0112 commented Oct 10, 2023

donsonioc2010 left a comment

Choose a reason for hiding this comment

donsonioc2010 Oct 10, 2023

Choose a reason for hiding this comment

donsonioc2010 Oct 10, 2023

Choose a reason for hiding this comment

donsonioc2010 Oct 10, 2023

Choose a reason for hiding this comment

donsonioc2010 left a comment

Choose a reason for hiding this comment