You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2021/03/05 14:57:08 UTC
[wicket] 02/02: Cleanup code and updated tests for new
getRemoteAddr behavior
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit af6dfbdff02b5f7e8a4e67d13893aa9866d211f0
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Fri Mar 5 14:02:39 2021 +0100
Cleanup code and updated tests for new getRemoteAddr behavior
---
.../protocol/http/request/WebClientInfo.java | 5 --
.../protocol/http/request/WebClientInfoTest.java | 65 +---------------------
2 files changed, 2 insertions(+), 68 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
index c7ce9ee..0127c5e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
@@ -16,21 +16,16 @@
*/
package org.apache.wicket.protocol.http.request;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
index 10ed68d..de44888 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
@@ -32,9 +32,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import org.mockito.Mockito;
/**
* Tests the WebClientInfo class
@@ -885,39 +883,6 @@ public class WebClientInfoTest
}
}
-
- /**
- * Test X-Forwarded-For ip address extraction.
- */
- @Test
- public void testExtractFromXForwardedForHeader()
- {
- String expected = "127.0.0.1";
- when(webRequest.getHeader("X-Forwarded-For")).thenReturn(expected);
- WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
- String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
- Mockito.verifyZeroInteractions(servletRequest);
- }
-
- /**
- * Test X-Forwarded-For ip address extraction with fallback when no ip is contained.
- *
- * Note mgrigorov: this test could fail in network setups where unknown addresses, like "blah",
- * will resolve to some DNS service saying "'blah' domain is free. Buy it."
- */
- @Test
- @Ignore
- public void testExtractFromContainerRequestUnknownXForwardedFor()
- {
- String expected = "10.17.37.8";
- when(servletRequest.getRemoteAddr()).thenReturn(expected);
- when(webRequest.getHeader("X-Forwarded-For")).thenReturn("unknown");
- WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
- String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
- }
-
/**
* Test default ip address extraction for container request.
*/
@@ -925,37 +890,11 @@ public class WebClientInfoTest
public void testExtractFromContainerRequestNoXForwardedFor()
{
String expected = "10.17.37.8";
+ String invalid = "10.17.9.55";
when(servletRequest.getRemoteAddr()).thenReturn(expected);
+ when(webRequest.getHeader("X-Forwarded-For")).thenReturn(invalid);
WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
String actual = clientInfo.getRemoteAddr(requestCycleMock);
assertThat(actual, is(equalTo(expected)));
}
-
- /**
- * Test X-Forwarded-For ip address extraction when proxy chain is given.
- */
- @Test
- public void testExtractFromXForwardedForHeaderChainedIps()
- {
- String expected = "10.17.37.156";
- when(servletRequest.getRemoteAddr()).thenReturn("10.17.1.1");
- when(webRequest.getHeader("X-Forwarded-For")).thenReturn(expected + ", 10.17.37.1");
- WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
- String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
- }
-
- /**
- * Test X-Forwarded-For ipv6 address extraction.
- */
- @Test
- public void testExtractFromXForwardedForHeaderIPv6()
- {
- String expected = "2001:db8::1428:57";
- when(webRequest.getHeader("X-Forwarded-For")).thenReturn("2001:db8::1428:57");
- WebClientInfo clientInfo = new WebClientInfo(requestCycleMock, "No user agent");
- String actual = clientInfo.getRemoteAddr(requestCycleMock);
- assertThat(actual, is(equalTo(expected)));
- }
-
}