Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE] JWT 토큰 사용 제거, Interceptor와 ArgumentResolver 중복 로직 제거 #733

Merged
merged 10 commits into from
Nov 21, 2023
4 changes: 0 additions & 4 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ dependencies {
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-mysql'

implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'

implementation 'mysql:mysql-connector-java:8.0.33'

compileOnly 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
package harustudy.backend.auth;

import harustudy.backend.auth.dto.AuthMember;
import harustudy.backend.auth.service.AuthService;
import harustudy.backend.auth.util.BearerAuthorizationParser;
import lombok.RequiredArgsConstructor;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;

@RequiredArgsConstructor
@Component
public class AuthArgumentResolver implements HandlerMethodArgumentResolver {

private final AuthService authService;

private final BearerAuthorizationParser bearerAuthorizationParser;

@Override
public boolean supportsParameter(MethodParameter parameter) {
return parameter.hasParameterAnnotation(Authenticated.class);
Expand All @@ -28,9 +22,7 @@ public boolean supportsParameter(MethodParameter parameter) {
@Override
public AuthMember resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
String authorizationHeader = webRequest.getHeader(HttpHeaders.AUTHORIZATION);
String accessToken = bearerAuthorizationParser.parse(authorizationHeader);
long memberId = Long.parseLong(authService.parseMemberId(accessToken));
Long memberId = (Long) webRequest.getAttribute("memberId", RequestAttributes.SCOPE_REQUEST);
return new AuthMember(memberId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
}
String authorizationHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
String accessToken = bearerAuthorizationParser.parse(authorizationHeader);
authService.validateAccessToken(accessToken);
Long memberId = authService.parseMemberId(accessToken);
request.setAttribute("memberId", memberId);
return HandlerInterceptor.super.preHandle(request, response, handler);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

@Component
public record TokenConfig(
@Value("${jwt.secret-key}") String secretKey,
@Value("${jwt.expire-length}") long accessTokenExpireLength,
@Value("${jwt.guest-expire-length}") long guestAccessTokenExpireLength,
@Value("${access-token.secret-key}") String secretKey,
@Value("${access-token.expire-length}") long accessTokenExpireLength,
@Value("${access-token.guest-expire-length}") long guestAccessTokenExpireLength,
@Value("${refresh-token.expire-length}") long refreshTokenExpireLength) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

import harustudy.backend.common.exception.HaruStudyException;

public class InvalidAccessTokenException extends
HaruStudyException {
public class InvalidAccessTokenException extends HaruStudyException {

public InvalidAccessTokenException() {

}

public InvalidAccessTokenException(Exception e) {
super(e);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@
import harustudy.backend.auth.dto.OauthLoginRequest;
import harustudy.backend.auth.dto.TokenResponse;
import harustudy.backend.auth.dto.UserInfo;
import harustudy.backend.auth.exception.InvalidAccessTokenException;
import harustudy.backend.auth.exception.InvalidRefreshTokenException;
import harustudy.backend.auth.repository.RefreshTokenRepository;
import harustudy.backend.auth.util.JwtTokenProvider;
import harustudy.backend.auth.util.AesTokenProvider;
import harustudy.backend.member.domain.LoginType;
import harustudy.backend.member.domain.Member;
import harustudy.backend.member.repository.MemberRepository;
import io.jsonwebtoken.JwtException;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -24,7 +21,7 @@
@Service
public class AuthService {

private final JwtTokenProvider jwtTokenProvider;
private final AesTokenProvider aesTokenProvider;
private final TokenConfig tokenConfig;
private final MemberRepository memberRepository;
private final RefreshTokenRepository refreshTokenRepository;
Expand All @@ -44,11 +41,8 @@ private Member saveOrUpdateMember(String oauthProvider, UserInfo userInfo) {
}

private String generateAccessToken(Long memberId) {
return jwtTokenProvider.builder()
.subject(String.valueOf(memberId))
.accessTokenExpireLength(tokenConfig.accessTokenExpireLength())
.secretKey(tokenConfig.secretKey())
.build();
return aesTokenProvider.createAccessToken(memberId, tokenConfig.accessTokenExpireLength(),
tokenConfig.secretKey());
}

private RefreshToken saveRefreshTokenOf(Member member) {
Expand All @@ -67,11 +61,8 @@ public TokenResponse guestLogin() {
}

private String generateGuestAccessToken(Long memberId) {
return jwtTokenProvider.builder()
.subject(String.valueOf(memberId))
.accessTokenExpireLength(tokenConfig.guestAccessTokenExpireLength())
.secretKey(tokenConfig.secretKey())
.build();
return aesTokenProvider.createAccessToken(memberId,
tokenConfig.guestAccessTokenExpireLength(), tokenConfig.secretKey());
}

public TokenResponse refresh(String refreshTokenRequest) {
Expand All @@ -80,19 +71,12 @@ public TokenResponse refresh(String refreshTokenRequest) {
refreshToken.validateExpired();
refreshToken.updateUuidAndExpireDateTime(tokenConfig.refreshTokenExpireLength());
String accessToken = generateAccessToken(refreshToken.getMember().getId());
return TokenResponse.forLoggedIn(accessToken, refreshToken, tokenConfig.refreshTokenExpireLength());
}

public void validateAccessToken(String accessToken) {
try {
jwtTokenProvider.validateAccessToken(accessToken, tokenConfig.secretKey());
} catch (JwtException e) {
throw new InvalidAccessTokenException();
}
return TokenResponse.forLoggedIn(accessToken, refreshToken,
tokenConfig.refreshTokenExpireLength());
Comment on lines +74 to +75
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요기 개행은 안해도 되지 않을까 싶습니다!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDE 설정을 맞췄을텐데 저는 여기에서는 글자수가 길어서 그런지 자동으로 리포맷을 해주네요..😂

}

public String parseMemberId(String accessToken) {
return jwtTokenProvider.parseSubject(accessToken, tokenConfig.secretKey());
public Long parseMemberId(String accessToken) {
return aesTokenProvider.parseSubject(accessToken, tokenConfig.secretKey());
}

public void deleteStringifiedRefreshToken(String refreshToken) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package harustudy.backend.auth.util;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import harustudy.backend.auth.exception.InvalidAccessTokenException;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

public class AccessTokenUtils {

public static String issue(ObjectMapper objectMapper, Long subject, Long accessTokenExpireLength) {
Date now = new Date();
Date expireAt = new Date(now.getTime() + accessTokenExpireLength);
RawToken rawToken = new RawToken(subject, expireAt);
return stringify(objectMapper, rawToken);
}

private static String stringify(ObjectMapper objectMapper, RawToken rawToken) {
try {
return objectMapper.writeValueAsString(rawToken);
} catch (JsonProcessingException e) {
throw new InvalidAccessTokenException(e);
}
}

public static Long parseSubject(ObjectMapper objectMapper, byte[] decrypted) {
RawToken rawToken = toRawToken(objectMapper, decrypted);
validateExpiration(rawToken);
return rawToken.subject;
}

private static RawToken toRawToken(ObjectMapper objectMapper, byte[] decrypted) {
String string = new String(decrypted, StandardCharsets.UTF_8);
try {
return objectMapper.readValue(string, RawToken.class);
} catch (JsonProcessingException e) {
throw new InvalidAccessTokenException(e);
}
}

private static void validateExpiration(RawToken rawToken) {
if (rawToken.expireAt.before(new Date())) {
throw new InvalidAccessTokenException();
}
}

@Getter
@RequiredArgsConstructor
private static class RawToken {

private final Long subject;

private final Date expireAt;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package harustudy.backend.auth.util;

import com.fasterxml.jackson.databind.ObjectMapper;
import harustudy.backend.auth.exception.InvalidAccessTokenException;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

@RequiredArgsConstructor
@Component
public class AesTokenProvider {

private static final String alg = "AES/CBC/PKCS5Padding";
private static final String iv = "0123456789abcdef"; // 16byte
Comment on lines +18 to +19
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AES 암호화 방식에서는 어떤 알고리즘을 사용하는지, IV가 고정인지 유동인지 등의 정보가 외부로 노출되어도 큰 보안적 위험은 이론적으로 없다고는 하지만 그럼에도 최대한 정보를 노출하지 않는 편이 좋다고 생각합니다. 요 정보들을 submodule로 같이 분리해서 TokenConfig를 통해 접근하도록 통일하는 방향은 어떠신가요? 혹시 이렇게 구현하신 다른 이유가 있으셨다면 말씀 부탁드립니다!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오프라인으로 얘기하여 굳이 적용하지 않는 것으로...


private final ObjectMapper objectMapper;

public String createAccessToken(Long subject, Long accessTokenExpireLength, String secretKey) {
String token = AccessTokenUtils.issue(objectMapper, subject, accessTokenExpireLength);
return encrypt(token, secretKey);
}

private String encrypt(String text, String secretKey) {
try {
Cipher cipher = Cipher.getInstance(alg);
SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), "AES");
IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes());
cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivParamSpec);

byte[] encrypted = cipher.doFinal(text.getBytes(StandardCharsets.UTF_8));
return Base64.getEncoder().encodeToString(encrypted);
} catch (GeneralSecurityException e) {
throw new InvalidAccessTokenException(e);
}
}

public Long parseSubject(String accessToken, String secretKey) {
byte[] decrypted = decrypt(accessToken, secretKey);
return AccessTokenUtils.parseSubject(objectMapper, decrypted);
}

private byte[] decrypt(String accessToken, String secretKey) {
try {
Cipher cipher = Cipher.getInstance(alg);
SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), "AES");
IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes());
cipher.init(Cipher.DECRYPT_MODE, keySpec, ivParamSpec);

byte[] decodedBytes = Base64.getDecoder().decode(accessToken);
return cipher.doFinal(decodedBytes);
} catch (GeneralSecurityException | IllegalArgumentException e) {
throw new InvalidAccessTokenException();
}
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

개행 부탁드립니다 🙏

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

제 IDE와 깃헙에서는 괜찮아보이는데 다른 분들도 없는 것으로 보이면 말씀해주세요!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

제꺼에서는 일단 개행이 있는 것으로 표기되기는 하네요~

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ public abstract class HaruStudyException extends RuntimeException {
protected HaruStudyException() {
}

protected HaruStudyException(Exception e) {
super(e);
}

protected HaruStudyException(String message) {
super(message);
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/submodule
Loading