Add some logging.

Author: Jarrod Ribble

src/main/java/com/netiq/websockify/PortUnificationHandler.java

@@ -17,6 +17,7 @@
 
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Logger;
 
 import javax.net.ssl.SSLEngine;
 
@@ -145,6 +146,8 @@ private boolean isFlashPolicy(int magic1, int magic2 ) {
     private void enableSsl(ChannelHandlerContext ctx) {
         ChannelPipeline p = ctx.getPipeline();
 
+		Logger.getLogger(PortUnificationHandler.class.getName()).fine("SSL request from " + ctx.getChannel().getRemoteAddress() + ".");
+
         SSLEngine engine = WebsockifySslContext.getInstance(keystore, keystorePassword).getServerContext().createSSLEngine();
         engine.setUseClientMode(false);
 
@@ -156,6 +159,8 @@ private void enableSsl(ChannelHandlerContext ctx) {
     private void switchToWebsocketProxy(ChannelHandlerContext ctx) {
         ChannelPipeline p = ctx.getPipeline();
 
+		Logger.getLogger(PortUnificationHandler.class.getName()).fine("Websocket proxy request from " + ctx.getChannel().getRemoteAddress() + ".");
+
         p.addLast("decoder", new HttpRequestDecoder());
         p.addLast("aggregator", new HttpChunkAggregator(65536));
         p.addLast("encoder", new HttpResponseEncoder());
@@ -167,6 +172,8 @@ private void switchToWebsocketProxy(ChannelHandlerContext ctx) {
     private void switchToFlashPolicy(ChannelHandlerContext ctx) {
         ChannelPipeline p = ctx.getPipeline();
 
+		Logger.getLogger(PortUnificationHandler.class.getName()).fine("Flash policy request from " + ctx.getChannel().getRemoteAddress() + ".");
+
         p.addLast("flash", new FlashPolicyHandler());
 
         p.remove(this);
@@ -175,6 +182,8 @@ private void switchToFlashPolicy(ChannelHandlerContext ctx) {
     private void switchToDirectProxy(ChannelHandlerContext ctx) {
         ChannelPipeline p = ctx.getPipeline();
 
+		Logger.getLogger(PortUnificationHandler.class.getName()).fine("Direct proxy request from " + ctx.getChannel().getRemoteAddress() + ".");
+		
         p.addLast("proxy", new DirectProxyHandler( ctx.getChannel(), cf, resolver ));
 
         p.remove(this);
@@ -192,5 +201,6 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e)
     public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e)
             throws Exception {
         cancelDirectionConnectionTimer ( );
+		Logger.getLogger(PortUnificationHandler.class.getName()).severe("Exception on connection to " + ctx.getChannel().getRemoteAddress() + ": " + e.getCause().getMessage() );
     }
 }

src/main/java/com/netiq/websockify/WebsockifyProxyHandler.java

@@ -100,11 +100,13 @@ private void ensureTargetConnection(ChannelEvent e, boolean websocket, final Obj
 	        // Suspend incoming traffic until connected to the remote host.
 	        final Channel inboundChannel = e.getChannel();
 	        inboundChannel.setReadable(false);
+			Logger.getLogger(WebsockifyProxyHandler.class.getName()).info("Inbound proxy connection from " + inboundChannel.getRemoteAddress() + ".");
 
 	        // resolve the target
-	        InetSocketAddress target = resolver.resolveTarget(e.getChannel());
+	        final InetSocketAddress target = resolver.resolveTarget(inboundChannel);
 	        if ( target == null )
 	        {
+				Logger.getLogger(WebsockifyProxyHandler.class.getName()).severe("Connection from " + inboundChannel.getRemoteAddress() + " failed to resolve target.");
 	        	// there is no target
 	        	inboundChannel.close();
 	        	return;
@@ -128,8 +130,10 @@ public void operationComplete(ChannelFuture future) throws Exception {
 	                if (future.isSuccess()) {
 	                    // Connection attempt succeeded:
 	                    // Begin to accept incoming traffic.
+	    				Logger.getLogger(WebsockifyProxyHandler.class.getName()).info("Created outbound connection to " + target + ".");
 	                    inboundChannel.setReadable(true);
 	                } else {
+	    				Logger.getLogger(WebsockifyProxyHandler.class.getName()).severe("Failed to create outbound connection to " + target + ".");
 	                    // Close the connection if the connection attempt has failed.
 	                    inboundChannel.close();
 	                }
@@ -166,6 +170,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, HttpRequest req, final
 
         String upgradeHeader = req.getHeader("Upgrade");
         if(upgradeHeader != null && upgradeHeader.toUpperCase().equals("WEBSOCKET")){
+			Logger.getLogger(WebsockifyProxyHandler.class.getName()).fine("Websocket request from " + e.getRemoteAddress() + ".");
 	        // Handshake
 	        WebSocketServerHandshakerFactory wsFactory = new WebSocketServerHandshakerFactory(
 	                this.getWebSocketLocation(req), "base64", false);
@@ -189,6 +194,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, HttpRequest req, final
             HttpRequest request = (HttpRequest) e.getMessage();
             String redirectUrl = isRedirect(request.getUri());
 		    if ( redirectUrl != null) {
+				Logger.getLogger(WebsockifyProxyHandler.class.getName()).fine("Redirecting to " + redirectUrl + ".");
 		        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, TEMPORARY_REDIRECT);
 		        response.setHeader(HttpHeaders.Names.LOCATION, redirectUrl);
 	            sendHttpResponse(ctx, req, response);
@@ -238,6 +244,8 @@ private void handleWebRequest(ChannelHandlerContext ctx, final MessageEvent e) t
             sendError(ctx, METHOD_NOT_ALLOWED);
             return;
         }
+        
+		Logger.getLogger(WebsockifyProxyHandler.class.getName()).info("Web request from " + e.getRemoteAddress() + " for " + request.getUri() + ".");
 
         final String path = sanitizeUri(request.getUri());
         if (path == null) {

src/main/java/com/netiq/websockify/WebsockifySslContext.java

@@ -4,6 +4,7 @@
 import java.security.KeyStore;
 import java.security.Security;
 import java.util.HashMap;
+import java.util.logging.Logger;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -70,6 +71,7 @@ private WebsockifySslContext(String keystore, String keystorePassword) {
                 serverContext = SSLContext.getInstance(PROTOCOL);
                 serverContext.init(kmf.getKeyManagers(), null, null);
             } catch (Exception e) {
+        		Logger.getLogger(WebsockifySslContext.class.getName()).severe("Error creating SSL context for keystore " + keystore + ": " + e.getMessage());
                 throw new Error("Failed to initialize the server-side SSLContext", e);
             }
             _serverContext = serverContext;