Skip to content

Commit e291921

Browse files
hyoseong-Choihyoseong-Choi
committed
Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop
2 parents 7be324a + 5868164 commit e291921

File tree

189 files changed

+1591
-1051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+1591
-1051
lines changed

src/main/java/clap/server/config/security/SecurityConfig.java renamed to src/main/java/clap/server/adapter/inbound/security/SecurityConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package clap.server.config.security;
1+
package clap.server.adapter.inbound.security;
22

3-
import clap.server.adapter.inbound.security.LoginAttemptFilter;
43
import clap.server.adapter.inbound.security.filter.JwtAuthenticationFilter;
54
import clap.server.adapter.inbound.security.filter.JwtExceptionFilter;
5+
import clap.server.adapter.inbound.security.filter.LoginAttemptFilter;
66
import lombok.RequiredArgsConstructor;
77
import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity;
88
import org.springframework.boot.autoconfigure.security.SecurityProperties;
@@ -24,7 +24,7 @@
2424
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2525
import org.springframework.web.cors.CorsConfigurationSource;
2626

27-
import static clap.server.config.security.WebSecurityUrl.*;
27+
import static clap.server.adapter.inbound.security.WebSecurityUrl.*;
2828

2929

3030
@Configuration

‎src/main/java/clap/server/adapter/inbound/security/WebSecurityUrl.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package clap.server.adapter.inbound.security;
2+
3+
public class WebSecurityUrl {
4+
private WebSecurityUrl() {
5+
throw new IllegalStateException("Utility class");
6+
}
7+
8+
public static final String [] HEALTH_CHECK_ENDPOINT = {"/health"};
9+
public static final String[] READ_ONLY_PUBLIC_ENDPOINTS = {"/favicon.ico"};
10+
public static final String LOGIN_ENDPOINT = "/api/auths/login";
11+
public static final String[] SWAGGER_ENDPOINTS = {
12+
"/swagger/api-docs/**", "/swagger/v3/api-docs/**",
13+
"/swagger-ui/**", "/swagger"
14+
};
15+
public static final String REISSUANCE_ENDPOINTS = "/api/auths/reissuance";
16+
public static final String[] PUBLIC_ENDPOINTS = {LOGIN_ENDPOINT, REISSUANCE_ENDPOINTS};
17+
public static final String TEMPORARY_TOKEN_ALLOWED_ENDPOINT = "/api/members/initial-password";
18+
}

‎src/main/java/clap/server/adapter/inbound/security/filter/JwtAuthenticationFilter.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import clap.server.adapter.outbound.jwt.access.AccessTokenClaimKeys;
55
import clap.server.application.port.outbound.auth.ForbiddenTokenPort;
66
import clap.server.application.port.outbound.auth.JwtProvider;
7+
import clap.server.exception.AuthException;
78
import clap.server.exception.JwtException;
89
import clap.server.exception.code.AuthErrorCode;
910
import io.jsonwebtoken.Claims;
@@ -27,12 +28,14 @@
2728
import org.springframework.web.filter.OncePerRequestFilter;
2829

2930
import java.io.IOException;
31+
import java.util.Arrays;
32+
33+
import static clap.server.adapter.inbound.security.WebSecurityUrl.*;
3034

3135
@Slf4j
3236
@Component
3337
@RequiredArgsConstructor
3438
public class JwtAuthenticationFilter extends OncePerRequestFilter {
35-
private static final String TEMPORARY_TOKEN_ALLOWED_ENDPOINT = "/api/members/initial-password";
3639
private final UserDetailsService securityUserDetailsService;
3740
private final JwtProvider accessTokenProvider;
3841
private final JwtProvider temporaryTokenProvider;

‎src/main/java/clap/server/adapter/inbound/security/filter/JwtErrorCodeUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static BaseErrorCode determineErrorCode(Exception exception, BaseErrorCod
3636
public static JwtException determineAuthErrorException(Exception exception) {
3737
return findAuthErrorException(exception).orElseGet(
3838
() -> {
39-
BaseErrorCode errorCode = determineErrorCode(exception, GlobalErrorCode.INTERNAL_SERVER_ERROR);
39+
BaseErrorCode errorCode = determineErrorCode(exception, AuthErrorCode.UNAUTHORIZED);
4040
log.debug(exception.getMessage(), exception);
4141
return new JwtException(errorCode);
4242
}

‎src/main/java/clap/server/adapter/inbound/security/filter/JwtExceptionFilter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ protected void doFilterInternal(
3333

3434
private void sendAuthError(HttpServletResponse response, JwtException e) throws IOException {
3535
if (!response.isCommitted()) {
36-
response.setContentType("application/json;charset=UTF-8");
3736
response.setStatus(e.getErrorCode().getHttpStatus().value());
3837
response.getWriter().write(e.getErrorCode().getCustomCode());
3938
}

src/main/java/clap/server/adapter/inbound/security/LoginAttemptFilter.java renamed to src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package clap.server.adapter.inbound.security;
1+
package clap.server.adapter.inbound.security.filter;
22

33
import clap.server.application.service.auth.LoginAttemptService;
44
import clap.server.exception.AuthException;
5-
import clap.server.exception.code.GlobalErrorCode;
65
import jakarta.servlet.FilterChain;
76
import jakarta.servlet.ServletException;
87
import jakarta.servlet.http.HttpServletRequest;
98
import jakarta.servlet.http.HttpServletResponse;
109
import lombok.RequiredArgsConstructor;
1110
import lombok.extern.slf4j.Slf4j;
11+
import org.springframework.http.HttpStatus;
1212
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
1313
import org.springframework.security.core.context.SecurityContextHolder;
1414
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
@@ -17,27 +17,32 @@
1717
import java.io.IOException;
1818
import java.util.ArrayList;
1919

20-
import static clap.server.common.constants.AuthConstants.SESSION_ID;
20+
import static clap.server.adapter.inbound.security.WebSecurityUrl.LOGIN_ENDPOINT;
21+
import static clap.server.common.utils.ClientIpParseUtil.getClientIp;
2122

2223

2324
@RequiredArgsConstructor
2425
@Slf4j
2526
public class LoginAttemptFilter extends OncePerRequestFilter {
2627

27-
private static final String LOGIN_ENDPOINT = "/api/auths/login";
2828
private final LoginAttemptService loginAttemptService;
2929

3030
@Override
3131
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
3232
throws ServletException, IOException {
33+
try {
34+
if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
35+
String clientIp = getClientIp(request);
3336

34-
String sessionId = request.getHeader(SESSION_ID.getValue().toLowerCase());
37+
loginAttemptService.checkAccountIsLocked(clientIp);
3538

36-
if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
37-
if (sessionId == null) {
38-
throw new AuthException(GlobalErrorCode.BAD_REQUEST);
3939
}
40-
loginAttemptService.checkAccountIsLocked(sessionId);
40+
} catch (AuthException e) {
41+
log.warn("Authentication failed for IP: {}. Error: {}", getClientIp(request), e.getMessage());
42+
response.setStatus(HttpStatus.UNAUTHORIZED.value());
43+
response.getWriter().write(e.getErrorCode().getCustomCode());
44+
log.info("Sent error response: {}", e.getErrorCode().getCustomCode());
45+
return;
4146
}
4247

4348
UsernamePasswordAuthenticationToken authenticationToken =

‎src/main/java/clap/server/adapter/inbound/security/handler/JwtAccessDeniedHandler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public void handle(
2323
) throws IOException, ServletException {
2424
AuthErrorCode errorCode = AuthErrorCode.FORBIDDEN;
2525

26-
response.setContentType("application/json;charset=UTF-8");
2726
response.setStatus(errorCode.getHttpStatus().value());
2827
response.getWriter().write(errorCode.getCustomCode());
2928
}

‎src/main/java/clap/server/adapter/inbound/security/handler/JwtAuthenticationEntryPoint.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public void commence(
2323
) throws IOException, ServletException {
2424
AuthErrorCode errorCode = AuthErrorCode.UNAUTHORIZED;
2525

26-
response.setContentType("application/json;charset=UTF-8");
2726
response.setStatus(errorCode.getHttpStatus().value());
2827
response.getWriter().write(errorCode.getCustomCode());
2928
}

src/main/java/clap/server/adapter/inbound/security/CustomGrantedAuthority.java renamed to src/main/java/clap/server/adapter/inbound/security/service/CustomGrantedAuthority.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.security;
1+
package clap.server.adapter.inbound.security.service;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/clap/server/adapter/inbound/security/SecurityUserDetails.java renamed to src/main/java/clap/server/adapter/inbound/security/service/SecurityUserDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.security;
1+
package clap.server.adapter.inbound.security.service;
22

33
import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
44
import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;

0 commit comments

Comments
 (0)