ABP/Android proxy service

src/org/adblockplus/brazil/SSLConnectionHandler.java

 package org.adblockplus.brazil;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.util.Properties;
 
-import sunlabs.brazil.server.Handler;
 import sunlabs.brazil.server.Request;
 import sunlabs.brazil.server.Server;
 import sunlabs.brazil.util.MatchString;
-import android.util.Log;
 
 /**
  * <code>RequestHandler</code> implements a SSL tunnel.
  * 
  * The following configuration parameters are used to initialize this
  * <code>Handler</code>:
  * <dl class=props>
  * 
  * <dt>prefix, suffix, glob, match
  * <dd>Specify the URL that triggers this handler. (See {@link MatchString}).
@@ skipping 14 matching lines @@
  * handler=https
  * https.class=org.adblockplus.brazil.SSLConnectionHandler
  * </pre>
  * 
  * See the description under {@link sunlabs.brazil.server.Handler#respond
  * respond} for a more detailed explanation.
  * 
  * Original source by Jochen Luell, PAW (http://paw-project.sourceforge.net/)
  */
 
-public class SSLConnectionHandler implements Handler
+public class SSLConnectionHandler extends BaseRequestHandler
 {
-        public static final String PROXY_HOST = "proxyHost";

[Felix Dahlke, 2012/11/09 06:04:32]

The indentation level in this file seems to be off.

[Andrey Novikov, 2012/11/09 09:23:47]

I will fix it after review.

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

Thanks, it would ruin the diffs :D

-        public static final String PROXY_PORT = "proxyPort";
-        public static final String AUTH = "auth";
-
-        private String prefix;
-
-        private String proxyHost;
-        private int proxyPort = 80;
-        private String auth;
-
-        @Override
-        public boolean init(Server server, String prefix)
-        {
-                this.prefix = prefix;
-
-                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)
-                {

[Felix Dahlke, 2012/11/09 06:04:32]

As in RequestHandler.init(), a comment would be nice. Actually, I think there is
some potential for reducing duplication here.

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

Done.

-                }
-
-                auth = props.getProperty(prefix + AUTH);
-
-                return true;
-        }
-
         @Override
         public boolean respond(Request request) throws IOException
         {
                 if (!request.method.equals("CONNECT"))
                         return false;
 
                 request.log(Server.LOG_LOG, prefix, "SSL connection to " + request.url);
 
                 String host = null;
                 int port = 0;
@@ skipping 51 matching lines @@
                         ConnectionHandler server = new ConnectionHandler(serverSocket, request.sock);
                         client.start();
                         server.start();
 
                         // Wait for connections to close
                         client.join();
                         server.join();
                 }
                 catch (InterruptedException e)
                 {
-                        Log.e(prefix, "Data exchange error", e);
+                    request.log(Server.LOG_ERROR, prefix, "Data exchange error: " + e.getMessage());
                 }
 
                 // Close connection
                 serverSocket.close();
                 request.log(Server.LOG_LOG, prefix, "SSL connection closed");
 
                 return true;
         }
 
         private class ConnectionHandler extends Thread
@@ skipping 16 matching lines @@
                         try
                         {
                                 while ((count = in.read(buf, 0, buf.length)) != -1)
                                 {
                                         out.write(buf, 0, count);
                                 }
                                 out.flush();
                         }
                         catch (IOException e)
                         {
                                 e.printStackTrace();

[Felix Dahlke, 2012/11/09 06:04:32]

Log.e()?

[Andrey Novikov, 2012/11/09 09:23:47]

No, should remove Log.e above. This is not Android aware object.

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

I see.

                         }
                 }
         }
 }