From 90349ff2bf27a81ef7412f15b22769ff6ca6bd6e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 9 Aug 2017 16:36:25 +0200 Subject: Sophisticate proxy parsing and generating, fix misinterpretation if SOCKS proxies This is a quick and dirty fix; it seems a major redesign is appropriate. We should also switch to some maintained version of proxy-vole from github. This one looks halfway active: https://github.com/MarkusBernhardt/proxy-vole or maybe one of its forks... --- .../java/com/btr/proxy/util/ProxyUtilTest.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'src/test/java/com/btr/proxy/util/ProxyUtilTest.java') diff --git a/src/test/java/com/btr/proxy/util/ProxyUtilTest.java b/src/test/java/com/btr/proxy/util/ProxyUtilTest.java index 5634600..ffcf03e 100644 --- a/src/test/java/com/btr/proxy/util/ProxyUtilTest.java +++ b/src/test/java/com/btr/proxy/util/ProxyUtilTest.java @@ -73,6 +73,49 @@ public class ProxyUtilTest { assertEquals("HTTP @ 192.123.123.1:8080", psList.get(0).toString()); } + /************************************************************************* + * Test parsing method. + ************************************************************************/ + + @Test + public void testParseProxySettings6() { + ProxySelector rs = ProxyUtil.parseProxySettings("192.123.123.1:8080",Proxy.Type.SOCKS, 1234); + List psList = rs.select(TestUtil.HTTP_TEST_URI); + assertEquals("SOCKS @ 192.123.123.1:8080", psList.get(0).toString()); + } + + /************************************************************************* + * Test parsing method. + ************************************************************************/ + + @Test + public void testParseProxySettings7() { + ProxySelector rs = ProxyUtil.parseProxySettings("192.123.123.1", Proxy.Type.SOCKS, 1234); + List psList = rs.select(TestUtil.HTTP_TEST_URI); + assertEquals("SOCKS @ 192.123.123.1:1234", psList.get(0).toString()); + } + + /************************************************************************* + * Test parsing method. + ************************************************************************/ + + @Test + public void testParseProxySettings8() { + ProxySelector rs = ProxyUtil.parseProxySettings("socks://192.123.123.1", Proxy.Type.HTTP, 1234); + List psList = rs.select(TestUtil.HTTP_TEST_URI); + assertEquals("SOCKS @ 192.123.123.1:1234", psList.get(0).toString()); + } + + /************************************************************************* + * Test parsing method. + ************************************************************************/ + + @Test + public void testParseProxySettings9() { + ProxySelector rs = ProxyUtil.parseProxySettings("socks://http_proxy.unit-test.invalid/"); + List psList = rs.select(TestUtil.HTTP_TEST_URI); + assertEquals("SOCKS @ http_proxy.unit-test.invalid:1080", psList.get(0).toString()); + } } -- cgit v1.2.3-55-g7522