ABP/Android proxy service

src/org/adblockplus/brazil/RequestHandler.java

 package org.adblockplus.brazil;
 
 import java.io.EOFException;
 import java.io.FilterInputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.List;
-import java.util.Properties;
+import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;
 
 import org.adblockplus.ChunkedOutputStream;
 import org.adblockplus.android.AdblockPlus;
 import org.literateprograms.BoyerMoore;
 
-import sunlabs.brazil.server.Handler;
 import sunlabs.brazil.server.Request;
 import sunlabs.brazil.server.Server;
 import sunlabs.brazil.util.MatchString;
 import sunlabs.brazil.util.http.HttpInputStream;
 import sunlabs.brazil.util.http.HttpRequest;
 import sunlabs.brazil.util.http.MimeHeaders;
 import android.util.Log;
 
 /**
  * The <code>RequestHandler</code> implements a proxy service optionally
@@ skipping 22 matching lines @@
  * 
  * <pre>
  * handler=adblock
  * adblock.class=org.adblockplus.brazil.RequestHandler
  * </pre>
  * 
  * See the description under {@link sunlabs.brazil.server.Handler#respond
  * respond} for a more detailed explanation.
  */
 
-public class RequestHandler implements Handler
+public class RequestHandler extends BaseRequestHandler
 {
-  public static final String PROXY_HOST = "proxyHost";
-  public static final String PROXY_PORT = "proxyPort";
-  public static final String AUTH = "auth";
-
   private AdblockPlus application;
-  private String prefix;
-
   private String via;
-
-  private String proxyHost;
-  private int proxyPort = 80;
-  private String auth;
+  private static Pattern RE_HTTP = Pattern.compile("^https?:");
 
   private boolean shouldLogHeaders;
 
   @Override
   public boolean init(Server server, String prefix)
   {
-    this.prefix = prefix;
+    super.init(server, prefix);
+
     application = AdblockPlus.getApplication();
-
-    Properties props = server.props;
-
-    proxyHost = props.getProperty(prefix + PROXY_HOST);
-
-    String s = props.getProperty(prefix + PROXY_PORT);
-    try
-    {
-      proxyPort = Integer.decode(s).intValue();
-    }
-    catch (Exception e)
-    {
-      // use default port
-    }
-
-    auth = props.getProperty(prefix + AUTH);
-
-    shouldLogHeaders = (props.getProperty(prefix + "proxylog") != null);
-
+    shouldLogHeaders = (server.props.getProperty(prefix + "proxylog") != null);
     via = " " + server.hostName + ":" + server.listen.getLocalPort() + " (" + server.name + ")";
 
     return true;
   }
 
   @Override
   public boolean respond(Request request) throws IOException
   {
     boolean block = false;
     String reqHost = null;
     String refHost = null;
 
+    String referrer = request.getRequestHeader("referer");
+    
     try
     {
       reqHost = (new URL(request.url)).getHost();
-      refHost = (new URL(request.getRequestHeader("referer"))).getHost();
+      if (referrer != null)
+        refHost = (new URL(referrer)).getHost();
     }
     catch (MalformedURLException e)
     {
       // We are transparent, it's not our deal if it's malformed.
     }
 
     try
     {
-      block = application.matches(request.url, request.query, reqHost, refHost, request.getRequestHeader("accept"));
+      if (referrer != null)
+        block = application.matches(request.url, request.query, reqHost, refHost, request.getRequestHeader("accept"));
     }
     catch (Exception e)
     {
       Log.e(prefix, "Filter error", e);
     }
 
-    request.log(Server.LOG_LOG, prefix, block + ": " + request.url);
+    request.log(Server.LOG_LOG, prefix, block + ": " + request.url + " ("+ refHost +")");
 
     int count = request.server.requestCount;
     if (shouldLogHeaders)
     {
       System.err.println(dumpHeaders(count, request, request.headers, true));

[Felix Dahlke, 2012/11/09 14:40:46]

Haven't seen this code before, it was further down below before. Why
System.err.println() and not my beloved Log.e()? :)

[Andrey Novikov, 2012/11/12 08:53:16]

For the same reason. It's not Android specific domain, I will have to remove all
Log.* in fact.

     }
 
     if (block)
     {
       request.sendHeaders(204, null, 0);

[Felix Dahlke, 2012/11/09 14:40:46]

This part is new, I presume it wasn't to address any review comments?

[Andrey Novikov, 2012/11/12 08:53:16]

No, it's a fix I introduced. I can not wait for reviews so long. Sorry.

       return true;
     }
 
     // Do not further process non-http requests
-    if (request.url.startsWith("http:") == false && request.url.startsWith("https:") == false)
+    if (!RE_HTTP.matcher(request.url).find())
     {
       return false;
     }
 
     String url = request.url;
 
     if ((request.query != null) && (request.query.length() > 0))
     {
       url += "?" + request.query;
     }
@@ skipping 238 matching lines @@
     }
 
     for (int i = 0; i < headers.size(); i++)
     {
       sb.append(prompt).append(headers.getKey(i));
       sb.append(": ").append(headers.get(i)).append("\n");
     }
     return (sb.toString());
   }
 }