code review

Author: publicarray

HttpRequest.java

@@ -98,22 +98,6 @@ public HttpRequest(String method, String url, String version, String headers, St
         this.error = 0;
     }
 
-    /**
-     * Copy constructor
-     * <p>
-     * Returns a deep copy of the 'other' HttpRequest.
-     * @param  other An existing HttpRequest to create the copy from.
-     */
-    public HttpRequest(HttpRequest other) {
-        this.method = other.method;
-        this.URL = other.URL;
-        this.version = other.version;
-        this.headers = other.headers;
-        this.host = other.host;
-        this.port = other.port;
-        this.error = other.error;
-    }
-
     public HttpResponse askServerIfvalid(Date lastModified, String etag) {
         if (lastModified == null || etag == null || etag.isEmpty()) {
             return null;

HttpResponse.java

@@ -154,19 +154,6 @@ public HttpResponse(int statusCode) {
         body.write(bodyStr.getBytes(), 0, bodyStr.length());
     }
 
-    // copy constructor
-    public HttpResponse (HttpResponse other) {
-        this.version = other.version;
-        this.status = other.status;
-        this.statusMessage = other.statusMessage;
-        this.statusLine = other.statusLine;
-        this.headers = other.headers;
-        this.lastModified = other.lastModified;
-        this.expires = other.expires;
-        this.etag = other.etag;
-        this.body = other.body;
-    }
-
     public HttpResponse setStaus(int status) {
         this.status = status;
         return this;
@@ -207,6 +194,7 @@ public Socket send(Socket host) {
             // Write response to host.
             DataOutputStream toClient = new DataOutputStream(host.getOutputStream());
             toClient.writeBytes(toString());
+            ProxyCache.verbose("<--- Response <--- \n" + toString());
         } catch (IOException e) {
             System.out.println("Error writing response to client: " + e);
         }

ProxyCache.java

@@ -5,6 +5,7 @@
 public class ProxyCache {
     private static boolean secure = false;
     public static boolean expires = false;
+    public static boolean verbose = false;
 
     /** Port for the proxy */
     private static int port;
@@ -25,6 +26,12 @@ public static void init(int p) {
         }
     }
 
+    public static void verbose(String message) {
+        if (verbose) {
+            System.out.println(message);
+        }
+    }
+
     public static int ifErrorSend(int errorCode, Socket client) {
         if (errorCode != 0) {
             HttpResponse errorResponse = new HttpResponse(errorCode);
@@ -47,45 +54,42 @@ public static void handle(Socket client) {
         /* Read request */
         try {
             BufferedReader fromClient = new BufferedReader(new InputStreamReader(client.getInputStream()));
-            System.out.println("\n**** New Request ****");
+            verbose("\n**** New Request ****");
             request = new HttpRequest(fromClient);
-            System.out.println("---> Request --->\n" + request.toString()); // Debug
+            verbose("---> Request --->\n" + request.toString()); // Debug
         } catch (IOException e) {
             System.out.println("Error reading request from client: " + e);
             new HttpResponse(400).send(client);
         }
 
-        if (request.method.equals("GET")) { // Only GET requests are cached
+        if (request.method.equals("GET")) { // Handle GET requests
             // Check if key is in cache
-            if ((response = cache.get(request.getURL())) != null) {// && response.isValid()) { // get item from cache if the cache is still fresh
-                // response is set and valid
-                // System.out.println("Retrieved " + request.getURL());
-                // System.out.println("Is valid? " + cache.isValid(request));
-            } else { // handle requests
-                    /* Send request to server */
-                    response = request.send();
-
-                    /* Read response and forward it to client */
-                    cache.put(request.getURL(), response);// Save response to cache
+            if ((response = cache.get(request.getURL())) == null) { // get item from cache
+                // if the item is not in the cache.
+
+                /* Send request to server */
+                response = request.send();
+
+                /* Read response and forward it to client */
+                cache.put(request.getURL(), response);// Save response to cache
             }
 
-            System.out.println("<--- Response <--- \n" + response.toString()); // Debug
+            verbose("<--- Response <--- \n" + response.toString());
             try {
                 /* Write response to client. First headers, then body */
                 DataOutputStream toClient = new DataOutputStream(client.getOutputStream());
                 toClient.writeBytes(response.toString()); // headers
                 response.body.writeTo(toClient); // body
                 client.close();
             } catch (IOException e) {
-                System.out.println("Error writing response to client (cached): " + e);
-                // new HttpResponse(500).send(client);
+                System.out.println("Error writing response to client: " + e);
             }
         }
 
         // http://stackoverflow.com/questions/16358589/implementing-a-simple-https-proxy-application-with-java
         // http://stackoverflow.com/questions/18273703/tunneling-two-socket-client-in-java#18274109
         else if (secure && request.method.equals("CONNECT")) {
-            System.out.println("CONNECT found! Tunnelling HTTPS connection.");
+            System.out.println("CONNECT found! attempt tunnel HTTPS connection.");
             InputStream fromClient;
             OutputStream toServer;
             try {
@@ -123,33 +127,14 @@ else if (secure && request.method.equals("CONNECT")) {
             } catch (SocketTimeoutException e) {
                 System.out.println("Connection Timed out " + e);
                 // EXIT HERE
-                // servertToClient.interrupt();
                 return;
-                // new HttpResponse(404).send(client);
             } catch (IOException e) {
                 System.out.println("Error tunnelling request: " + e);
-                // new HttpResponse(500).send(client);
-                // return;
-            // } catch (InterruptedException e) {
-                // System.out.println("Thread: Interrupted" + e);
             }
         } else { // e.g POST, HEAD or DELETE requests
+            System.out.println("Ignoring " + request.method + " request.");
             new HttpResponse(501).send(client);
             return;
-            // response = request.send();
-            // System.out.println("<--- Response <--- \n" + response.toString()); // Debug
-
-            // try {
-            //     /* Write response to client. First headers, then body */
-            //     DataOutputStream toClient = new DataOutputStream(client.getOutputStream());
-            //     toClient.writeBytes(response.toString()); // headers // broken pipe /Protocol wrong type for socket
-            //     response.body.writeTo(toClient); // body
-            //     client.close();
-            // } catch (IOException e) {
-            //     System.out.println("Error writing response to client: " + e);
-            //     e.printStackTrace();
-            //     // new HttpResponse(500).send(client);
-            // }
         }
     }
 
@@ -163,8 +148,7 @@ public static void main(String args[]) {
         try {
             myPort = Integer.parseInt(args[0]);
         } catch (ArrayIndexOutOfBoundsException e) {
-            System.out.println("Usage: ProxyCache <Port Number> [args]\nArguments:\n  -s, --secure    Proxy HTTPS/TLS (experimental, can use 100% CPU)\n  -e, --expires   Check expires header");
-            // System.out.println("Need port number as argument");
+            System.out.println("Usage: ProxyCache <Port Number> [args]\nArguments:\n  -v --verbose    Verbose output (more logging) \n  -s, --secure    Proxy HTTPS/TLS (experimental, can use 100% CPU)\n  -e, --expires   Check expires header");
             System.exit(-1);
         } catch (NumberFormatException e) {
             System.out.println("Please give port number as integer.");
@@ -173,6 +157,12 @@ public static void main(String args[]) {
         init(myPort);
 
         for (String argument: args) { // http://java.about.com/od/javasyntax/a/Using-Command-Line-Arguments.htm
+            if(argument.equals("-v") || argument.equals("--verbose")) {
+                // Verbose output (more logging)
+                verbose = true;
+                System.out.println("Verbose logging=true");
+
+            }
             if(argument.equals("-s") || argument.equals("--secure")) {
                 // proxy secure HTTPS/TLS connections (experimental as it can course 100% CPU usage)
                 secure = true;
@@ -194,7 +184,6 @@ public static void main(String args[]) {
             try {
                 client = socket.accept();
                 new Thread(new ProxyThread(client)).start();
-                // new ProxyThread(client);
             } catch (IOException e) {
                 System.out.println("Error reading request from client: " + e);
                 /* Definitely cannot continue processing this request,
@@ -216,7 +205,6 @@ class ProxyThread extends Thread {
 
     public void run() {
         ProxyCache.handle(client);
-        // System.out.println("Handling client from thread! " + client.toString());
     }
 }
 
@@ -246,7 +234,7 @@ public void run() {
         } catch (IOException e) {
             System.out.println("Thread: IOError: " + e);
             interrupt();
-            // return;
+            return;
         }
     }
 }

SCache.java

@@ -83,9 +83,10 @@ public boolean isValid(String requestURL, HttpResponse response) {
             return true; // use the cached response if new response has an unrecoverable error.
         }
         if (newResponse.status == 304) { // Not modified, so still valid
-            System.out.println("SCACHE: 304 Not modified");
+            System.out.println("SCACHE: recieved 304 Not modified");
             return true;
         } else { // 200 OK and other responses
+            System.out.println("SCACHE: recieved " + newResponse.status);
             System.out.println("SCACHE: response was modified. Updating Cache.");
             put(requestURL, newResponse); // save the new response
             return false;