Changeset 31880 for main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

Timestamp:

2017-08-14T22:23:04+12:00 (7 years ago)

Author:

ak19

Message:

All the changes that were required to set up multiple proxy servers, one for HTTP, one for HTTPS, one for FTP. Still need to test on Windows

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -107 +107 @@
     private final String mode;
    
-    private String proxy_url; // only the main thread (where DownloadJob runs) modifies this, so no synching needed
+    private Properties proxy_urls; // only the main thread (where DownloadJob runs) modifies this, so no synching needed
     
     /**
      */
-    public DownloadJob(Download download, String proxy_pass, String proxy_user, DownloadScrollPane mummy, String mode, String proxy_url) {
+    public DownloadJob(Download download, String proxy_pass, String proxy_user, DownloadScrollPane mummy, String mode, Properties proxy_urls) {
     URL url = null;
     int folder_hash;
 
-        this.proxy_url =  proxy_url;
+        this.proxy_urls =  proxy_urls;
     
         download_option = downloadToHashMap(download);
@@ -310 +310 @@
         Process prcs = null; 
 
-        if (proxy_url != null && !proxy_url.equals("")) {           
+        if (proxy_urls.size() != 0) {
         // Specify proxies as environment variables
         // Need to manually specify GSDLHOME and GSDLOS also
+        env = new String[4+proxy_urls.size()];
         
-        proxy_url = proxy_url.replaceAll("http://","");
-        
-        env = new String[7];
-        
-        env[0] = "http_proxy=http://"+proxy_url;
-        env[1] = "https_proxy=http://"+proxy_url; // yes, HTTP protocol for https:// too
-        // see also https://wiki.archlinux.org/index.php/proxy_settings
-        env[2] = "ftp_proxy=ftp://"+proxy_url;
-        env[3] = "GSDLHOME=" + Configuration.gsdl_path;
-        env[4] = "GSDLOS=" + Gatherer.client_operating_system;
+        env[0] = "GSDLHOME=" + Configuration.gsdl_path;
+        env[1] = "GSDLOS=" + Gatherer.client_operating_system;
         // teach it where the wgetrc file lives, in gs2build/bin/<os>:
-        env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
+        env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
         // Issue discovered on Windows: If PATH is not made available to perl, so that wget or something else needed by
         // WgetDownload.pm's open3()  call is not on the PATH, then the perl open() call to run wget fails.
         // So make PATH available to get open3() working:
-        env[6] = "PATH="+System.getenv("PATH");     
+        env[3] = "PATH="+System.getenv("PATH");
+
+        int next_index = 4;
+        String proxy_url = proxy_urls.getProperty("HTTP");
+        if(proxy_url != null) {
+            env[next_index] = "http_proxy="+proxy_url;
+            next_index++;
+        }
+        proxy_url = proxy_urls.getProperty("HTTPS");
+        if(proxy_url != null) {
+            env[next_index] = "https_proxy="+proxy_url;
+            next_index++;
+        }
+        proxy_url = proxy_urls.getProperty("FTP");
+        if(proxy_url != null) {
+            env[next_index] = "ftp_proxy="+proxy_url;
+            next_index++;
+        }               
         
         prcs = rt.exec(cmd, env);
@@ -623 +633 @@
         String [] env = null;
 
-        if (proxy_url != null && !proxy_url.equals("")) {           
+        if (proxy_urls.size() != 0) {
         // Specify proxies as environment variables
         // Need to manually specify GSDLHOME and GSDLOS also
+        env = new String[4+proxy_urls.size()];
         
-        proxy_url = proxy_url.replaceAll("http://","");
-        
-        env = new String[7];
-        
-        env[0] = "http_proxy=http://"+proxy_url;
-        env[1] = "https_proxy=http://"+proxy_url; // yes, HTTP protocol for https:// too
-        // see also https://wiki.archlinux.org/index.php/proxy_settings
-        env[2] = "ftp_proxy=ftp://"+proxy_url;
-        env[3] = "GSDLHOME=" + Configuration.gsdl_path;
-        env[4] = "GSDLOS=" + Gatherer.client_operating_system;
+        env[0] = "GSDLHOME=" + Configuration.gsdl_path;
+        env[1] = "GSDLOS=" + Gatherer.client_operating_system;
         // teach it where the wgetrc file lives, in gs2build/bin/<os>:
-        env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
+        env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
         // Issue discovered on Windows: If PATH is not made available to perl, so that wget or something else needed by
         // WgetDownload.pm's open3()  call is not on the PATH, then the perl open() call to run wget fails.
         // So make PATH available to get open3() working:
-        env[6] = "PATH="+System.getenv("PATH");     
+        env[3] = "PATH="+System.getenv("PATH");
+
+        int next_index = 4;
+        String proxy_url = proxy_urls.getProperty("HTTP");
+        if(proxy_url != null) {
+            env[next_index] = "http_proxy="+proxy_url;          
+            next_index++;
+        }
+        proxy_url = proxy_urls.getProperty("HTTPS");
+        if(proxy_url != null) {
+            env[next_index] = "https_proxy="+proxy_url;
+            next_index++;
+        }
+        proxy_url = proxy_urls.getProperty("FTP");
+        if(proxy_url != null) {
+            env[next_index] = "ftp_proxy="+proxy_url;
+            next_index++;
+        }               
         
         prcs = new SafeProcess(cmd, env, null);
-        } 
+        }
         else if(Gatherer.isGsdlRemote && Gatherer.isDownloadEnabled && !Utility.isWindows()) {
         // Not Windows, but running client with download panel