Merge pull request #43 from poeschik/master

Use secure proxy also for websocket protocol
akuhtz · Nov 10, 2023 · 323e344 · 323e344
2 parents 1c9e452 + 25d21c0
commit 323e344
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/...a/com/github/markusbernhardt/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java b/...a/com/github/markusbernhardt/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java
@@ -268,6 +268,7 @@ private void installSecureProxy(ProtocolDispatchSelector ps, Properties settings
 			Logger.log(getClass(), LogLevel.TRACE, "Firefox secure proxy is {}:{}", proxyHost, proxyPort);
 			ps.setSelector("https", new FixedProxySelector(proxyHost, proxyPort));
 			ps.setSelector("sftp", new FixedProxySelector(proxyHost, proxyPort));
+			ps.setSelector("wss", new FixedProxySelector(proxyHost, proxyPort));
 		}
 	}
 

diff --git a/.../com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java b/.../com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java
@@ -272,6 +272,7 @@ private void installSecureSelector(Properties settings, ProtocolDispatchSelector
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome secure proxy is {}:{}", proxyHost, proxyPort);
 			ps.setSelector("https", new FixedProxySelector(proxyHost.trim(), proxyPort));
 			ps.setSelector("sftp", new FixedProxySelector(proxyHost.trim(), proxyPort));
+			ps.setSelector("wss", new FixedProxySelector(proxyHost.trim(), proxyPort));
 		}
 	}
 

diff --git a/.../java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java b/.../java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java
@@ -312,6 +312,7 @@ private void installSecureSelector(Properties settings, ProtocolDispatchSelector
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome secure proxy is {}:{}", proxyHost, proxyPort);
 			ps.setSelector("https", new FixedProxySelector(proxyHost.trim(), proxyPort));
 			ps.setSelector("sftp", new FixedProxySelector(proxyHost.trim(), proxyPort));
+			ps.setSelector("wss", new FixedProxySelector(proxyHost.trim(), proxyPort));
 		}
 	}
 

diff --git a/...main/java/com/github/markusbernhardt/proxy/search/desktop/kde/KdeProxySearchStrategy.java b/...main/java/com/github/markusbernhardt/proxy/search/desktop/kde/KdeProxySearchStrategy.java
@@ -189,6 +189,7 @@ private ProxySelector setupFixedProxySelector(Properties settings) {
 		if (httpsPS != null) {
 			Logger.log(getClass(), LogLevel.TRACE, "Kde https proxy is {}", proxyVar);
 			ps.setSelector("https", httpsPS);
+			ps.setSelector("wss", httpsPS);
 		}
 
 		proxyVar = settings.getProperty("ftpProxy", null);

diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/env/EnvProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/env/EnvProxySearchStrategy.java
@@ -120,6 +120,8 @@ public ProxySelector getProxySelector() {
 		Logger.log(getClass(), LogLevel.TRACE, "Https Proxy is {}", httpsPS == null ? this.httpsProxy : httpsPS);
 		ps.setSelector("https", httpsPS != null ? httpsPS : httpPS);
 
+		ps.setSelector("wss", httpsPS != null ? httpsPS : httpPS);
+
 		ProxySelector ftpPS = ProxyUtil.parseProxySettings(this.ftpProxy);
 		if (ftpPS != null) {
 			Logger.log(getClass(), LogLevel.TRACE, "Ftp Proxy is {}", this.ftpProxy);