From e4c326279b438c8eb84003c55997dd3557da5d54 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 30 Jul 2004 22:37:15 +0000
Subject: [PATCH] Finished up the proxy jockeying. Now we peek into the
 registry to see if they've already got a proxy configuration. Oh how we love
 to go native.

---
 etc/getdown.dop                               |   9 ++
 lib/jRegistryKey.jar                          | Bin 0 -> 9980 bytes
 .../threerings/getdown/launcher/Getdown.java  |  86 ++++++++----
 .../threerings/getdown/util/ProxyUtil.java    | 129 ------------------
 4 files changed, 71 insertions(+), 153 deletions(-)
 create mode 100644 lib/jRegistryKey.jar
 delete mode 100644 src/java/com/threerings/getdown/util/ProxyUtil.java

diff --git a/etc/getdown.dop b/etc/getdown.dop
index 1f226ab..46c2add 100644
--- a/etc/getdown.dop
+++ b/etc/getdown.dop
@@ -14,6 +14,7 @@
 -ClassPath:
 /usr/local/jdk1.4/jre/lib/rt.jar
 dist/classes
+lib/jRegistryKey.jar
 ../../projects/samskivert/dist/samskivert.jar
 ../../lib/commons-io.jar
 ../../lib/javaws.jar
@@ -37,6 +38,14 @@ com.sun.*
 
 -ExcludeMethods:
 
+-IncludeClassesUnconditional:
+ca.beq.util.win32.registry.RegistryException
+ca.beq.util.win32.registry.RegistryKey
+ca.beq.util.win32.registry.RegistryValue
+ca.beq.util.win32.registry.RootKey
+ca.beq.util.win32.registry.ValueIterator
+ca.beq.util.win32.registry.ValueType
+
 -General:
 nomakepublic
 fornamedetection
diff --git a/lib/jRegistryKey.jar b/lib/jRegistryKey.jar
new file mode 100644
index 0000000000000000000000000000000000000000..51007958af832bbcf6ce290c25fc75fce3a37837
GIT binary patch
literal 9980
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
EAE%9wZ2$lO

literal 0
HcmV?d00001

diff --git a/src/java/com/threerings/getdown/launcher/Getdown.java b/src/java/com/threerings/getdown/launcher/Getdown.java
index 16e6029..28721a8 100644
--- a/src/java/com/threerings/getdown/launcher/Getdown.java
+++ b/src/java/com/threerings/getdown/launcher/Getdown.java
@@ -1,5 +1,5 @@
 //
-// $Id: Getdown.java,v 1.28 2004/07/30 21:45:28 mdb Exp $
+// $Id: Getdown.java,v 1.29 2004/07/30 22:37:15 mdb Exp $
 
 package com.threerings.getdown.launcher;
 
@@ -27,10 +27,13 @@ import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 
-// import org.apache.commons.io.TeeOutputStream;
+import ca.beq.util.win32.registry.RegistryKey;
+import ca.beq.util.win32.registry.RegistryValue;
+import ca.beq.util.win32.registry.RootKey;
 
 import com.samskivert.swing.util.SwingUtil;
 import com.samskivert.text.MessageUtil;
@@ -42,7 +45,6 @@ import com.threerings.getdown.data.Resource;
 import com.threerings.getdown.tools.Patcher;
 import com.threerings.getdown.util.ConfigUtil;
 import com.threerings.getdown.util.ProgressObserver;
-import com.threerings.getdown.util.ProxyUtil;
 
 /**
  * Manages the main control for the Getdown application updater and
@@ -142,10 +144,7 @@ public class Getdown extends Thread
             }
 
             // also configure them in the JVM
-            System.setProperty("http.proxyHost", host);
-            if (!StringUtil.blank(port)) {
-                System.setProperty("http.proxyPort", port);
-            }
+            setProxyProperties(host, port);
         }
 
         // clear out our UI
@@ -170,25 +169,48 @@ public class Getdown extends Thread
             return true;
         }
 
-        // TODO: look in the Vinders registry
+        // look in the Vinders registry
+        try {
+            String host = null, port = null;
+            boolean enabled = false;
+            RegistryKey.initialize();
+            RegistryKey r = new RegistryKey(
+                RootKey.HKEY_CURRENT_USER, PROXY_REGISTRY);
+            for (Iterator iter = r.values(); iter.hasNext(); ) {
+                RegistryValue value = (RegistryValue)iter.next();
+                if (value.getName().equals("ProxyEnable")) {
+                    enabled = value.getStringValue().equals("1");
+                }
+                if (value.getName().equals("ProxyServer")) {
+                    String strval = value.getStringValue();
+                    int cidx = strval.indexOf(":");
+                    if (cidx != -1) {
+                        port = strval.substring(cidx+1);
+                        strval = strval.substring(0, cidx);
+                    }
+                    host = strval;
+                }
+            }
+
+            if (enabled) {
+                setProxyProperties(host, port);
+                return true;
+            } else {
+                Log.info("Detected no proxy settings in the registry.");
+            }
+
+        } catch (Throwable t) {
+            Log.info("Failed to find proxy settings in Windows registry " +
+                     "[error=" + t + "].");
+        }
 
         // otherwise look for and read our proxy.txt file
         File pfile = _app.getLocalPath("proxy.txt");
         if (pfile.exists()) {
             try {
                 HashMap pconf = ConfigUtil.parseConfig(pfile, false);
-                String proxyHost = (String)pconf.get("host");
-                String proxyPort = (String)pconf.get("port");
-                if (!StringUtil.blank(proxyHost)) {
-                    System.setProperty("http.proxyHost", proxyHost);
-                    if (!StringUtil.blank(proxyPort)) {
-                        System.setProperty("http.proxyPort", proxyPort);
-                    }
-                    Log.info("Using proxy [host=" + proxyHost +
-                             ", port=" + proxyPort + "].");
-                }
-
-                // now we can get on with getting down
+                setProxyProperties((String)pconf.get("host"),
+                                   (String)pconf.get("port"));
                 return true;
 
             } catch (IOException ioe) {
@@ -196,10 +218,10 @@ public class Getdown extends Thread
             }
         }
 
-        // otherwise we'll need to try to detect our proxy settings; first
-        // we have to initialize our application to get some sort of
-        // interface configuration and the appbase URL
-        Log.info("Attempting to detect proxy settings...");
+        // otherwise see if we actually need a proxy; first we have to
+        // initialize our application to get some sort of interface
+        // configuration and the appbase URL
+        Log.info("Checking whether we need to use a proxy...");
         try {
             _ifc = _app.init(true);
         } catch (IOException ioe) {
@@ -242,6 +264,20 @@ public class Getdown extends Thread
         return false;
     }
 
+    /**
+     * Configures the JVM proxy system properties.
+     */
+    protected void setProxyProperties (String host, String port)
+    {
+        if (!StringUtil.blank(host)) {
+            System.setProperty("http.proxyHost", host);
+            if (!StringUtil.blank(port)) {
+                System.setProperty("http.proxyPort", port);
+            }
+            Log.info("Using proxy [host=" + host + ", port=" + port + "].");
+        }
+    }
+
     /**
      * Does the actual application validation, update and launching
      * business.
@@ -598,4 +634,6 @@ public class Getdown extends Thread
 
     protected static final int MAX_LOOPS = 5;
     protected static final long MIN_EXIST_TIME = 5000L;
+    protected static final String PROXY_REGISTRY =
+        "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
 }
diff --git a/src/java/com/threerings/getdown/util/ProxyUtil.java b/src/java/com/threerings/getdown/util/ProxyUtil.java
deleted file mode 100644
index dc55610..0000000
--- a/src/java/com/threerings/getdown/util/ProxyUtil.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// $Id: ProxyUtil.java,v 1.2 2004/07/29 18:46:57 mdb Exp $
-
-package com.threerings.getdown.util;
-
-import java.net.URL;
-
-import com.threerings.getdown.Log;
-
-/**
- * Code to detect a user's proxy settings.
- */
-public class ProxyUtil
-{
-    /**
-     * Detects whether or not there are proxy settings that should be used
-     * by this JVM.
-     *
-     * @return true if there are such settings, false if not.
-     */
-    public static boolean detectProxy (URL sampleURL)
-    {
-        // first look for a proxy that's already set
-        if ((_proxyIP = System.getProperty("proxyHost")) != null) {
-            _proxyPort = System.getProperty("proxyPort");
-            return true;
-        }
-        if ((_proxyIP = System.getProperty("http.proxyHost")) != null) {
-            _proxyPort = System.getProperty("http.proxyPort");
-            return true;
-        }
-
-        try {
-            //  Look around for the 1.4.X plugin proxy detection
-            //  class... Without it, cannot autodetect...
-            Class t = Class.forName("com.sun.java.browser.net.ProxyService");
-            com.sun.java.browser.net.ProxyInfo[] pi =
-                com.sun.java.browser.net.ProxyService.getProxyInfo(sampleURL);
-            if (pi == null || pi.length == 0) {
-                Log.info("1.4.X reported NULL proxy (no proxy assumed).");
-                return false;
-
-            } else {
-                Log.info("1.4.X Proxy info getProxy: " + pi[0].getHost() +
-                         " getPort: " + pi[0].getPort() +
-                         " isSocks: " + pi[0].isSocks());
-                _proxyIP = pi[0].getHost();
-                _proxyPort = "" + pi[0].getPort();
-                Log.info("Detected proxy " + _proxyIP + " port " + _proxyPort);
-                return true;
-            }
-
-        } catch (Exception ee) {
-            Log.info("Sun Plugin 1.4.X proxy detection class not " +
-                     "found: " + ee + ". Trying failover detection...");
-        }
-
-        try {
-            String key = "javaplugin.proxy.config.list";
-            String proxyList = (String)
-                System.getProperties().getProperty(key);
-            proxyList = proxyList.toUpperCase();
-            Log.info("Plugin proxy config list: " + proxyList);
-
-            //  Using HTTP proxy as proxy for HTTP proxy tunnelled SSL
-            //  socket (should be listed FIRST)....
-            if (proxyList != null) {
-                // 6.0.0 1/14/03 1.3.1_06 appears to omit HTTP portion of
-                // 6.0.reported proxy list... Mod to accomodate this...
-
-                // Expecting proxyList of "HTTP=XXX.XXX.XXX.XXX:Port"
-                // OR "XXX.XXX.XXX.XXX:Port" & assuming HTTP...
-                if (proxyList.indexOf("HTTP=") > -1) {
-                    _proxyIP = proxyList.substring(
-                        proxyList.indexOf("HTTP=") + 5,
-                        proxyList.indexOf(":"));
-                } else {
-                    _proxyIP = proxyList.substring(
-                        0, proxyList.indexOf(":"));
-                }
-                int endOfPort = proxyList.indexOf(",");
-                if (endOfPort < 1) {
-                    endOfPort = proxyList.length();
-                }
-                _proxyPort = proxyList.substring(proxyList.indexOf(":") + 1,
-                                                 endOfPort);
-                Log.info("Detected proxy " + _proxyIP + " port " + _proxyPort);
-                return true;
-            }
-
-        } catch (Exception e) {
-            Log.warning("Exception during failover auto proxy detect: " + e);
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the IP of the detected proxy. This is only valid after a
-     * call to {@link #detectProxy} that returns true.
-     */
-    public static String getProxyIP ()
-    {
-        return _proxyIP;
-    }
-
-    /**
-     * Returns the port of the detected proxy. This is only valid after a
-     * call to {@link #detectProxy} that returns true.
-     */
-    public static String getProxyPort ()
-    {
-        return _proxyPort;
-    }
-
-    /**
-     * Sets the necessary system properties to enact the use of this proxy
-     * host and port.
-     */
-    public static void configureProxy (String host, String port)
-    { 
-        System.setProperty("http.proxyHost", host);
-        System.setProperty("http.proxyPort", port);
-   }
-
-    protected static String _proxyIP;
-    protected static String _proxyPort = "80";
-    protected static boolean _useProxy = false;
-}