Ensured Netty provider uses CONNECT when proxying ws

The WS standard requires that clients use the CONNECT method when
proxying WebSockets, even if they aren't using SSL.  The Grizzly
provider already supported this, but the Netty didn't.

I also implemented a test that tested this case.

Author: jroper

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -649,7 +649,7 @@ protected final static HttpRequest buildRequest(AsyncHttpClientConfig config, Re
             throws IOException {
 
         String method = request.getMethod();
-        if (allowConnect && proxyServer != null && isSecure(uri)) {
+        if (allowConnect && proxyServer != null && (isSecure(uri) || isWebSocket(uri.getScheme()))) {
             method = HttpMethod.CONNECT.toString();
         }
         return construct(config, request, new HttpMethod(method), uri, buffer, proxyServer);

src/test/java/com/ning/http/client/websocket/ProxyTunnellingTest.java

@@ -27,6 +27,7 @@
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -43,39 +44,46 @@ public abstract class ProxyTunnellingTest extends AbstractBasicTest {
     int port2;
     private Server server2;
 
-    @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        server2 = new Server();
+    }
+
+    private void setUpServers(Connector server2Connector) throws Exception {
 
         port1 = findFreePort();
         port2 = findFreePort();
-
         Connector listener = new SelectChannelConnector();
-
         listener.setHost("127.0.0.1");
         listener.setPort(port1);
-
         addConnector(listener);
+        setHandler(new ConnectHandler());
+        start();
 
-        SslSelectChannelConnector connector = new SslSelectChannelConnector();
-        connector.setHost("127.0.0.1");
-        connector.setPort(port2);
+        server2 = new Server();
+
+        server2Connector.setHost("127.0.0.1");
+        server2Connector.setPort(port2);
+
+        server2.addConnector(server2Connector);
+
+        server2.setHandler(getWebSocketHandler());
+        server2.start();
+        log.info("Local HTTP server started successfully");
+
+    }
+
+    private void setUpServer() throws Exception {
+        setUpServers(new SelectChannelConnector());
+    }
 
+    private void setUpSSlServer2() throws Exception {
+        SslSelectChannelConnector connector = new SslSelectChannelConnector();
         ClassLoader cl = getClass().getClassLoader();
         URL keystoreUrl = cl.getResource("ssltest-keystore.jks");
         String keyStoreFile = new File(keystoreUrl.toURI()).getAbsolutePath();
         connector.setKeystore(keyStoreFile);
         connector.setKeyPassword("changeit");
         connector.setKeystoreType("JKS");
-
-        server2.addConnector(connector);
-
-        setHandler(new ConnectHandler());
-        start();
-
-        server2.setHandler(getWebSocketHandler());
-        server2.start();
-        log.info("Local HTTP server started successfully");
+        setUpServers(connector);
     }
 
     @Override
@@ -88,27 +96,38 @@ public org.eclipse.jetty.websocket.WebSocket doWebSocketConnect(HttpServletReque
         };
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterMethod(alwaysRun = true)
     public void tearDownGlobal() throws Exception {
         stop();
-        server2.stop();
+        if (server2 != null) {
+            server2.stop();
+        }
+        server2 = null;
     }
 
-    protected String getTargetUrl() {
-        return String.format("wss://127.0.0.1:%d/", port2);
+    @Test(timeOut = 60000)
+    public void echoWSText() throws Exception {
+        setUpServer();
+        runTest("ws");
     }
 
     @Test(timeOut = 60000)
-    public void echoText() throws Exception {
+    public void echoWSSText() throws Exception {
+        setUpSSlServer2();
+        runTest("wss");
+    }
 
-        ProxyServer ps = new ProxyServer(ProxyServer.Protocol.HTTPS, "127.0.0.1", port1);
+    private void runTest(String protocol) throws Exception {
+        String targetUrl = String.format("%s://127.0.0.1:%d/", protocol, port2);
+
+        ProxyServer ps = new ProxyServer(ProxyServer.Protocol.HTTP, "127.0.0.1", port1);
         AsyncHttpClientConfig config = new AsyncHttpClientConfig.Builder().setProxyServer(ps).build();
         AsyncHttpClient asyncHttpClient = getAsyncHttpClient(config);
         try {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<String> text = new AtomicReference<String>("");
 
-            WebSocket websocket = asyncHttpClient.prepareGet(getTargetUrl()).execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketTextListener() {
+            WebSocket websocket = asyncHttpClient.prepareGet(targetUrl).execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketTextListener() {
 
                 @Override
                 public void onMessage(String message) {
@@ -143,5 +162,6 @@ public void onError(Throwable t) {
         } finally {
             asyncHttpClient.close();
         }
+
     }
 }