[tbb-commits] [tor-browser] 52/70: Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.0.1-12.0-1
in repository tor-browser.

commit 08d711b49550df72d25a5e1780a16bef19da0064
Author: Amogh Pradeep <amoghbl1 at gmail.com>
AuthorDate: Fri Jun 12 02:07:45 2015 -0400

    Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
    
    See Bug 1357997 for partial uplift.
    
    Also:
    Bug 28051 - Use our Orbot for proxying our connections
    
    Bug 31144 - ESR68 Network Code Review
---
 .../java/org/mozilla/gecko/util/ProxySelector.java | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index 2fb4015f4126f..5925da91d6dab 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -28,6 +28,10 @@ import java.net.URLConnection;
 import java.util.List;
 
 public class ProxySelector {
+  private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
+  private static final int TOR_SOCKS_PROXY_PORT = 9150;
+  private static final int TOR_HTTP_PROXY_PORT = 8218;
+
   public static URLConnection openConnectionWithProxy(final URI uri) throws IOException {
     final java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
     Proxy proxy = Proxy.NO_PROXY;
@@ -38,7 +42,26 @@ public class ProxySelector {
       }
     }
 
-    return uri.toURL().openConnection(proxy);
+    /* Ignore the proxy we found from the VM, only use Tor. We can probably
+     * safely use the logic in this class in the future. */
+    return uri.toURL().openConnection(getProxy());
+  }
+
+  public static Proxy getProxy() {
+    // TODO make configurable
+    return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT));
+  }
+
+  public static String getProxyHostAddress() {
+    return TOR_PROXY_ADDRESS;
+  }
+
+  public static int getSocksProxyPort() {
+    return TOR_SOCKS_PROXY_PORT;
+  }
+
+  public static int getHttpProxyPort() {
+    return TOR_HTTP_PROXY_PORT;
   }
 
   public ProxySelector() {}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.