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.

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

[BE] refactor: TooManyRequest 로깅에 사용되는 IP 추출 로직 변경 #944

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

[BE] refactor: TooManyRequest 로깅에 사용되는 IP 추출 로직 변경 #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b4918a
refactor: X-FORWARDED-FOR 헤더 추출
nayonsoso Oct 24, 2024
b98dbcc
refactor: 프록시의 종류에 종속적이지 않도록 헤더 종류 추가
nayonsoso Oct 25, 2024
209f5b4
refactor: 프록시를 사용하지 않는 경우도 추가
nayonsoso Oct 25, 2024
4e694a6
refactor: private 함수 사용하지 않도록
nayonsoso Oct 25, 2024
18e01f3
fix: 깨지는 테스트 봉합
nayonsoso Oct 25, 2024
bb859c8
refactor: redis 의 key 값 수정
nayonsoso Oct 28, 2024
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
15 changes: 10 additions & 5 deletions backend/src/main/java/reviewme/config/requestlimit/RequestLimitInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package reviewme.config.requestlimit;

import static org.springframework.http.HttpHeaders.USER_AGENT;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.data.redis.core.RedisTemplate;
Expand All @@ -17,6 +17,8 @@
@RequiredArgsConstructor
public class RequestLimitInterceptor implements HandlerInterceptor {

private static final List<String> PROXY_HEADERS = List.of("X-FORWARDED-FOR", "X-REAL-IP");

private final RedisTemplate<String, Long> redisTemplate;
private final RequestLimitProperties requestLimitProperties;

Expand All @@ -40,9 +42,12 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons

private String generateRequestKey(HttpServletRequest request) {
String requestURI = request.getRequestURI();
String remoteAddr = request.getRemoteAddr();
String userAgent = request.getHeader(USER_AGENT);
String remoteAddress = PROXY_HEADERS.stream()
.map(request::getHeader)
.filter(Objects::nonNull)
.findFirst()
.orElse(request.getRemoteAddr());

return String.format("RequestURI: %s, RemoteAddr: %s, UserAgent: %s", requestURI, remoteAddr, userAgent);
return String.format("RequestURI: %s, RemoteAddress: %s", requestURI, remoteAddress);
}
}
2 changes: 1 addition & 1 deletion backend/src/test/java/reviewme/config/requestlimit/RequestLimitInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RequestLimitInterceptorTest {
private final ValueOperations<String, Long> valueOperations = mock(ValueOperations.class);
private final RequestLimitProperties requestLimitProperties = mock(RequestLimitProperties.class);
private final RequestLimitInterceptor interceptor = new RequestLimitInterceptor(redisTemplate, requestLimitProperties);
private final String requestKey = "RequestURI: /api/v2/reviews, RemoteAddr: localhost, UserAgent: Postman";
private final String requestKey = "RequestURI: /api/v2/reviews, RemoteAddress: localhost";

@BeforeEach
void setUp() {
Expand Down