Skip to content
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

Use secure proxy also for websocket protocol #43

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Use secure proxy also for websocket protocol #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...a/com/github/markusbernhardt/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
1 change: 1 addition & 0 deletions .../com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
1 change: 1 addition & 0 deletions .../java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
1 change: 1 addition & 0 deletions ...main/java/com/github/markusbernhardt/proxy/search/desktop/kde/KdeProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/github/markusbernhardt/proxy/search/env/EnvProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down