Changeset 7687

Timestamp:

2004-07-01T14:55:18+12:00 (20 years ago)

Author:

kjdon

Message:

proxy host, port, user and password are now set in an envornment variable rather than as args to the wget command - hopefully can't be spied on?

File:

• trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

@@ -223 +223 @@
     }
 
+    String proxy_url = "";
     // Determine if we have to use a proxy.
     if(Gatherer.config.get("general.use_proxy", true)) {
@@ -240 +241 @@
         }
         if(user_pass.indexOf("@") != -1) {
-        // Write the use proxy command
-        command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
-
+        String user_name = user_pass.substring(0, user_pass.indexOf("@"));
+        String user_pwd = user_pass.substring(user_pass.indexOf("@") + 1);
+        proxy_url = user_name+":"+user_pwd+"@"+proxy_host+":"+proxy_port+"/";
+        // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the follwoing can (using ps)
+        //command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
+        
         }
         else {
@@ -249 +253 @@
     }
         
-    // The user can either choose to mirror all of the page requisites...
+    // The user can choose to mirror all of the page requisites...
     if(page_requisites) {
         command = command + "-p ";
     }
 
+    // Download files from other hosts
     if(other_hosts) {
         command = command + "-H ";
@@ -276 +281 @@
         Gatherer.println("Cmd: " + command);
         Runtime rt = Runtime.getRuntime();
-        Process prcs = rt.exec(command, null, dest_file);
+        String [] env = null;
+        if (!proxy_url.equals("")) {
+        env = new String[2];
+        env[0] = "http_proxy=http://"+proxy_url;
+        env[1] = "ftp_proxy=ftp://"+proxy_url;
+        }
+        Process prcs = rt.exec(command, env, dest_file);
         InputStreamReader isr = new InputStreamReader(prcs.getErrorStream());
         BufferedReader br = new BufferedReader(isr);
@@ -367 +378 @@
     Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.DOWNLOADED_FILES_CHANGED);
     }
-
+    
+    
     /** The most important part of the DownloadJob class, this method is
      * responsible for calling the WGet native methods used to