Skip to content

Fix client ip for rate limiting #4009

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

Draft
joemahady-comm wants to merge 4 commits into
base: develop
Choose a base branch
from
+12 −44
Draft

Fix client ip for rate limiting #4009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83acb7a
Implement AI Scan -- MEDIUM -- client-ip-for-rate-limiting-taken-from…
joemahady-comm Jul 29, 2026
838018d
Merge branch 'develop' into TNZGOV-15480
joemahady-comm Aug 7, 2026
0b9ab39
Fix client ip for rate limiting
joemahady-comm Aug 7, 2026
9f71e0f
Fix client ip for rate limiting
joemahady-comm Aug 7, 2026
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: 1 addition & 14 deletions ...r/src/main/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,7 @@ public String getAuthorizationHeader() {

@Override
public String getClientIP() {
String value = header("X-Client-IP");
if (value == null) {
value = header("X-Real-IP");
}
if (value == null) {
value = header("X-Forwarded-For"); // Added by the GoRouter
if (value != null) {
int at = value.indexOf(',');
if (at != -1) {
value = StringUtils.stripToNull(value.substring(0, at));
}
}
}
return value != null ? value : StringUtils.stripToNull(getRemoteAddr());
return StringUtils.stripToNull(getRemoteAddr());
}

public boolean hasHeaderNames() {
Expand Down
41 changes: 11 additions & 30 deletions ...c/test/java/org/cloudfoundry/identity/uaa/ratelimiting/core/http/RequestInfoImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ void getAuthorizationHeader() {
assertThat(requestInfo.getAuthorizationHeader()).isEqualTo("Mocking Bearer");
}

@Test
void getClientIP_remoteAddr() {
when(mockHSRequest.getHeader("X-Client-IP")).thenReturn("Spoofed-IP-1");
when(mockHSRequest.getHeader("X-Real-IP")).thenReturn("Spoofed-IP-2");
when(mockHSRequest.getHeader("X-Forwarded-For")).thenReturn("Spoofed-IP-3");
when(mockHSRequest.getRemoteAddr()).thenReturn("Mocked-IP-R ");
RequestInfo requestInfo = RequestInfoImpl.from(mockHSRequest);
assertThat(requestInfo).isNotNull();
assertThat(requestInfo.getClientIP()).isEqualTo("Mocked-IP-R");
}

@Test
void getClientIP_fallsBackToRemoteAddr_whenSpoofableHeadersAbsent() {
// Regression: after HeaderFilter strips X-Client-IP and X-Real-IP, rate limiting must
Expand All @@ -49,36 +60,6 @@ void getClientIP_fallsBackToRemoteAddr_whenSpoofableHeadersAbsent() {
assertThat(requestInfo.getClientIP()).isEqualTo("10.0.0.1");
}

@Test
void getClientIP_X_Client() {
when(mockHSRequest.getHeader("X-Client-IP")).thenReturn("Mocked-IP-C ");
when(mockHSRequest.getHeader("X-Real-IP")).thenReturn("Mocked-IP-R ");
when(mockHSRequest.getHeader("X-Forwarded-For")).thenReturn("Mocked-IP-FF0, Mocked-IP-FF1");
RequestInfo requestInfo = RequestInfoImpl.from(mockHSRequest);
assertThat(requestInfo).isNotNull();
assertThat(requestInfo.getClientIP()).isEqualTo("Mocked-IP-C");
}

@Test
void getClientIP_X_Real() {
when(mockHSRequest.getHeader("X-Client-IP")).thenReturn(" ");
when(mockHSRequest.getHeader("X-Real-IP")).thenReturn("Mocked-IP-R ");
when(mockHSRequest.getHeader("X-Forwarded-For")).thenReturn("Mocked-IP-FF0 , Mocked-IP-FF1");
RequestInfo requestInfo = RequestInfoImpl.from(mockHSRequest);
assertThat(requestInfo).isNotNull();
assertThat(requestInfo.getClientIP()).isEqualTo("Mocked-IP-R");
}

@Test
void getClientIP_X_Forwarded() {
when(mockHSRequest.getHeader("X-Client-IP")).thenReturn(" ");
when(mockHSRequest.getHeader("X-Real-IP")).thenReturn(" ");
when(mockHSRequest.getHeader("X-Forwarded-For")).thenReturn("Mocked-IP-FF0 , Mocked-IP-FF1");
RequestInfo requestInfo = RequestInfoImpl.from(mockHSRequest);
assertThat(requestInfo).isNotNull();
assertThat(requestInfo.getClientIP()).isEqualTo("Mocked-IP-FF0");
}

@Test
void proxyingWorking() {
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
Expand Down
Loading