Skip to content

fixed ssl with proxy #259

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixed ssl with proxy #259

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6301c82
fixed ssl with proxy
May 7, 2020
9a436f3
Merge branch 'master' into fix-proxy-ssl
sonologico Oct 21, 2022
208d29a
Update WebSocketClientWrapper.java
sonologico Oct 21, 2022
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
Next Next commit
fixed ssl with proxy
  • Loading branch information
Sam Nelson committed May 7, 2020
commit 6301c821cfdf9e8b8dfd8d720e6a1277d11a7182
14 changes: 12 additions & 2 deletions src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.pusher.client.connection.websocket;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Socket;
import java.net.URI;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
Expand All @@ -10,6 +12,8 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocketFactory;

import org.java_websocket.WebSocket;
import org.java_websocket.WebSocketImpl;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;

Expand Down Expand Up @@ -37,9 +41,15 @@ public WebSocketClientWrapper(final URI uri, final Proxy proxy, final WebSocketL
// certificates

final SSLSocketFactory factory = sslContext.getSocketFactory();// (SSLSocketFactory)
// SSLSocketFactory.getDefault();
// SSLSocketFactory.getDefault();

setSocket(factory.createSocket());
int port = uri.getPort();
if( port == -1 ) {
port = WebSocketImpl.DEFAULT_WSS_PORT;
}
Socket socket = new Socket(proxy);
socket.connect(new InetSocketAddress(uri.getHost(), port));
setSocket(factory.createSocket(socket, uri.getHost(), port, true));
}
catch (final IOException e) {
throw new SSLException(e);
Expand Down