From 02de232411ed145e1850995f06da66384ab7f674 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 14 Jun 2013 09:40:49 -0700 Subject: [PATCH] 405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String + After discussion with simone, we have changed from using IP address to hostnames in both websocket and spdy. --- .../main/java/org/eclipse/jetty/spdy/client/SPDYClient.java | 2 +- .../websocket/client/io/WebSocketClientSelectorManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java index 2456a2228fc..e2a0cba22ad 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java @@ -143,7 +143,7 @@ public class SPDYClient protected SSLEngine newSSLEngine(SslContextFactory sslContextFactory, SocketChannel channel) { - String peerHost = channel.socket().getInetAddress().getHostAddress(); + String peerHost = channel.socket().getInetAddress().getHostName(); int peerPort = channel.socket().getPort(); SSLEngine engine = sslContextFactory.newSSLEngine(peerHost, peerPort); engine.setUseClientMode(true); diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java index 9144de9757a..b17008a7f66 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java @@ -104,7 +104,7 @@ public class WebSocketClientSelectorManager extends SelectorManager } catch (IOException e) { - LOG.debug(e); + LOG.ignore(e); connectPromise.failed(e); // rethrow throw e; @@ -120,7 +120,7 @@ public class WebSocketClientSelectorManager extends SelectorManager public SSLEngine newSSLEngine(SslContextFactory sslContextFactory, SocketChannel channel) { - String peerHost = channel.socket().getInetAddress().getHostAddress(); + String peerHost = channel.socket().getInetAddress().getHostName(); int peerPort = channel.socket().getPort(); SSLEngine engine = sslContextFactory.newSSLEngine(peerHost,peerPort); engine.setUseClientMode(true);