Skip to content

Fix: jwtAuth 과정 중 검증 로직 수정 #47

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.

Sign up for GitHub

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

Merged
Hexeong merged 1 commit into from
Oct 18, 2024
Merged

Fix: jwtAuth 과정 중 검증 로직 수정 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions src/main/java/com/mtvs/devlinkbackend/config/JwtAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse

// Authorization 헤더에서 Bearer 토큰 추출
String authorizationHeader = request.getHeader("Authorization");
String token = null;

// 헤더에서 액세스 토큰 추출
if (StringUtils.hasText(authorizationHeader) && authorizationHeader.startsWith("Bearer ")) {
token = authorizationHeader.substring(7); // "Bearer " 이후의 토큰 부분 추출
} else {
response.setStatus(450); // 잘못된 인증 헤더
return;
}

try {
// 토큰 검증 | 검증 성공 시 SecurityContext에 인증 정보 저장
String accountId = jwtUtil.getSubjectFromAuthHeaderWithAuth(token);
String accountId = jwtUtil.getSubjectFromAuthHeaderWithAuth(authorizationHeader);
UsernamePasswordAuthenticationToken authentication =
new UsernamePasswordAuthenticationToken(accountId, null, null);

Expand Down Expand Up @@ -73,16 +64,4 @@ protected boolean shouldNotFilter(HttpServletRequest request) {
|| path.startsWith("/webjars")
|| path.startsWith("/api");
}

// 쿠키에서 리프레시 토큰을 추출하는 메서드
private String getRefreshTokenFromCookies(HttpServletRequest request) {
if (request.getCookies() != null) {
for (Cookie cookie : request.getCookies()) {
if ("refreshToken".equals(cookie.getName())) {
return cookie.getValue();
}
}
}
return null;
}
}
6 changes: 2 additions & 4 deletions src/main/java/com/mtvs/devlinkbackend/util/JwtUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@Component
public class JwtUtil {

private static final String ISSUER_URL = "https://api.epicgames.dev";
private static final String ISSUER_URL = "https://api.epicgames.dev/epic/oauth/v1";

@Value("${spring.security.oauth2.client.registration.epicgames.client-id}")
private String clientId;
Expand All @@ -31,7 +31,6 @@ public JwtUtil(EpicGamesJWKCache jwkCache) {
public Map<String, Object> getClaimsFromAuthHeaderWithAuth(String authorizationHeader) throws Exception {
// Claims 검증
JWTClaimsSet claims = getClaimsFromToken(extractToken(authorizationHeader));
System.out.println(claims);
validateClaims(claims);

// 검증이 완료되었을 경우 모든 Claims을 Map으로 변환하여 반환
Expand Down Expand Up @@ -61,7 +60,7 @@ public String getSubjectFromAuthHeaderWithoutAuth(String authorizationHeader) th

private void validateClaims(JWTClaimsSet claims) throws BadJWTException {
// 'iss' 검증
if (claims.getIssuer() == null || !claims.getIssuer().startsWith(ISSUER_URL)) {
if (claims.getIssuer() == null || !claims.getIssuer().equals(ISSUER_URL)) {
throw new BadJWTException("Invalid issuer");
}

Expand Down Expand Up @@ -107,7 +106,6 @@ private Map<String, Object> convertClaimsToMap(JWTClaimsSet claims) {
}

private String extractToken(String authorizationHeader) {
System.out.println(authorizationHeader);
if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) {
return authorizationHeader.substring(7);
} else {
Expand Down