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...
---
 .../search/browser/ie/IEProxySearchStrategy.java     | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java')

diff --git a/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
index 6641aff..dd062cd 100644
--- a/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
+++ b/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
@@ -165,7 +165,15 @@ public class IEProxySearchStrategy implements ProxySearchStrategy {
 	private void addFallbackSelector(Properties settings, ProtocolDispatchSelector ps) {
 		String proxy = settings.getProperty("default");
 		if (proxy != null) {
-			ps.setFallbackSelector(ProxyUtil.parseProxySettings(proxy));
+			Proxy defaultProxy = ProxyUtil.parseProxyString(proxy, Proxy.Type.HTTP, 0);
+			if (defaultProxy.type() == Proxy.Type.SOCKS) {
+				ps.setSelector("socket", new FixedProxySelector(defaultProxy));
+				return;
+			}
+			FixedProxySelector fp = new FixedProxySelector(defaultProxy);
+			ps.setSelector("http", fp);
+			ps.setSelector("https", fp);
+			ps.setSelector("ftp", fp);
 		}
 	}
 
@@ -180,8 +188,14 @@ public class IEProxySearchStrategy implements ProxySearchStrategy {
 	private void addSelectorForProtocol(Properties settings, String protocol, ProtocolDispatchSelector ps) {
 		String proxy = settings.getProperty(protocol);
 		if (proxy != null) {
-			Proxy.Type fb = protocol.startsWith("socks") ? Proxy.Type.SOCKS : Proxy.Type.HTTP;
-			ProxySelector protocolSelector = ProxyUtil.parseProxySettings(proxy, fb, 0);
+			Proxy.Type type;
+			if (protocol.startsWith("socks")) {
+				type = Proxy.Type.SOCKS;
+				protocol = "socket";
+			} else {
+				type = Proxy.Type.HTTP;
+			}
+			ProxySelector protocolSelector = ProxyUtil.parseProxySettings(proxy, type, 0);
 			ps.setSelector(protocol, protocolSelector);
 		}
 	}
-- 
cgit v1.2.3-55-g7522