Changeset 31880 for main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.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/gui/DownloadPane.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -91 +91 @@
     private String mode = null;
     private TreePath previous_path;
-    private String proxy_url = "";
+    private Properties proxy_urls = new Properties(); // proxy_urls for each of HTTP, HTTPS, FTP
     private Proxy proxyObject = null;
         
@@ -601 +601 @@
         }
         
-        getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
+        getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_urls);
         }
     }
@@ -723 +723 @@
     }
 
-    // TODO: Still need to read up on and test how to set wget proxy on windows
-    // Need to be on a windows machine that requires proxy, and get wget to work on cmdline
-    // If that works, then need to check https URLS also work.
-    // See https://superuser.com/questions/526710/how-to-set-http-proxy-address-for-wget-under-windows
-    private boolean checkProxy(){
+    
+    // SOME READING:
+    // https://superuser.com/questions/526710/how-to-set-http-proxy-address-for-wget-under-windows
+    // https://arstechnica.com/civis/viewtopic.php?f=10&t=1281165
+    // "http or https to an https proxy?"
+    // About "CONNECT": https://daniel.haxx.se/docs/sshproxy.html
+    // "You need an SSH client that can issue CONNECT requests through the company HTTP proxy." Seems to imply http? Also uses it for ftp.
+    // https://forum.ivorde.com/set-up-ftp-proxy-via-command-line-in-linux-freebsd-t19733.html sets ftp_proxy to a http url.
+    // So it's seems to be just whatever protocol the proxy server has. When the proxy supports all three protocols
+    // (apparently the common case as per page below describing firefox prefs), then wiki.archlinux sets all three ftp_proxy/http_proxy/https_proxy to the same.
+    // See https://forums.freebsd.org/threads/57378/
+    // "I believe that ftp(1) only uses HTTP-type proxies for fetching URLs. I.e. you can't do traditional open->cd->get interactive style of FTP with it via a HTTP proxy. If you do something like ftp ftp://ftp.example.com/path/file, it should work with your proxy setup. For traditional interactive FTP, you need to be directly talking to the remote server or using the less common FTP proxy/gate functionality."    
+    // https://wiki.archlinux.org/index.php/Proxy_settings
+    // This does https_proxy = http_proxy, and explicitly prefixes "https://" to http_proxy.
+    // https://www.howtogeek.com/293213/how-to-configure-a-proxy-server-in-firefox/
+    /* You’ll usually want to click the “Use the proxy server for all protocols” option. Firefox will also use your HTTP proxy server for SSL-encrypted HTTPS connections and File Transfer Protocol (FTP) connections.
+Uncheck this box if you want to enter separate proxy servers for HTTP, HTTPS, and FTP connections. This isn’t common.
+If you’re configuring a SOCKS proxy, leave the HTTP Proxy, SSL Proxy, and FTP Proxy boxes empty. Enter the address of the SOCKS proxy into the “SOCKS Host” and its port into the “Port” box.
+    */    
+    private boolean checkProxy(){    
+    
+    proxy_urls.clear();
+    
+    Download current_download = (Download)download_map.get(mode);
+    
+        Argument arg = current_download.getArgument("proxy_on");
+  
+    if (arg == null) return true;
+    
+    // Determine if we have to use a proxy.
+    if(Configuration.get("general.use_proxy", true)) {
+        
+        boolean http_proxy_set = setProxyURLFor("HTTP");
+        boolean https_proxy_set = setProxyURLFor("HTTPS");
+        boolean ftp_proxy_set = setProxyURLFor("FTP");
+        
+        if(proxy_urls.size() == 0 ||
+           (!http_proxy_set && !https_proxy_set && !ftp_proxy_set)) {
+        
+        // if checkProxy() failed for all protocols
+        // OR if none of the proxies were setup by user, then turn off proxying
+        arg = current_download.getArgument("proxy_on");
+        arg.setValue("false"); 
+        arg.setAssigned(false);
+        proxy_urls.clear();
+        return false;
+        } else { // proxy details have been successfully set for at least one proxy protocol
+        return true;
+        }   
+
+    } else { // if proxy_on was off
+        // unset proxy_on argument too
+        arg = current_download.getArgument("proxy_on");
+        arg.setValue("false"); 
+        arg.setAssigned(false);
+    }
+    
+    return true;
+    }
+
+    private boolean setProxyURLFor(String protocol) {
+    String proxy_host = Configuration.getString("general."+protocol+"_proxy_host", true);
+    if(proxy_host.equals("")) { // no proxy details for this protocol
+        ///System.err.println("### general."+protocol+"proxy_host was empty");
+        return true;
+    }
+    
+    String proxy_port = Configuration.getString("general."+protocol+"_proxy_port", true);
+    // Find out whether the user has already authenticated themselves
+    
+    // remove the protocol prefix from proxy_host, and store it
+    String proxy_protocol = "";
+    int proxy_protocol_index = proxy_host.indexOf("://");
+    if(proxy_protocol_index != -1) {
+        proxy_protocol_index += "://".length();
+        proxy_protocol = proxy_host.substring(0, proxy_protocol_index);
+        proxy_host = proxy_host.substring(proxy_protocol_index);
+    } else { // no explicit protocol for proxy host specified,
+        // then set explicit protocol to be the same as the protocol param: http|https|ftp
+        proxy_protocol = protocol.toLowerCase()+"://";
+    }
+    
+    String user_pass = "";
+    String address = proxy_host + ":" + proxy_port;
+    
+    int count = 0;
+    // Only for wget, need to avoid a second automatic authentication popup (first asks
+    // the proxy authentication for wget, and the second will ask the same for the realm)
+    // Once the authentication has been reused, it will set the GAuthenticator state back to REGULAR
+    GAuthenticator.setMode(GAuthenticator.DOWNLOAD);
+    while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) {
+        Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.get("WGet.Prompt"), "HTTP");
+        count++;
+    }
+    if(count >= 3) {
+        return false;
+    }
+    
+    // https://askubuntu.com/questions/664777/systemwide-proxy-settings-in-ubuntu
+    // http://www.rgagnon.com/javadetails/java-0085.html
+    // how-do-i-make-httpurlconnection-use-a-proxy
+    // https://stackoverflow.com/questions/8030908/how-to-check-if-proxy-is-working-in-java
+    
+    //proxyObject = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxy_host, Integer.parseInt(proxy_port))); // proxyObject only used by getRedirectURL(), which we're no longer calling
+    
+    Download current_download = (Download)download_map.get(mode);
+    Argument arg = current_download.getArgument("proxy_on");
+    
+    if(user_pass.indexOf("@") != -1) {
+        
+        arg.setValue("true"); // proxy_on argument
+        arg.setAssigned(true);
+        
+        arg = current_download.getArgument(protocol.toLowerCase()+"_proxy_host");
+        arg.setValue(proxy_host);
+        arg.setAssigned(true);
+        
+        arg = current_download.getArgument(protocol.toLowerCase()+"_proxy_port");
+        arg.setValue(proxy_port);
+        arg.setAssigned(true);
+
+        // Write the use proxy command - we don't do this anymore, instead we set environment
+        // variables as these do work for windows after all (Aug 2017). Hopefully these can't
+        // be spied on like the following can (using ps/task manager. If going back to the
+        // following, be aware: can't add protocol+user_name and protocol+user_password as
+        // accepted parameters in WgetDownload.pm for HTTP, HTTPS and FTP protocols. Only
+        // one set of username and password can be set for wget's --proxy-user and
+        // --proxy-password flags. No separate flags for each protocol.
+        /*if (Utility.isWindows()) {
+          
+          arg = current_download.getArgument("user_name");
+          arg.setValue(user_pass.substring(0, user_pass.indexOf("@")));
+          arg.setAssigned(true);
+          
+          arg = current_download.getArgument("user_password");
+          arg.setValue(user_pass.substring(user_pass.indexOf("@") + 1));
+          arg.setAssigned(true);
+          }
+          
+          else{*/
+        String user_name = user_pass.substring(0, user_pass.indexOf("@"));
+        String user_pwd = user_pass.substring(user_pass.indexOf("@") + 1);
+        /*}*/
+        
+        // construct proxy_url and prefix the stored proxy protocol to it
+        String proxy_url = proxy_protocol+user_name+":"+user_pwd+"@"+proxy_host+":"+proxy_port+"/";     
+        proxy_urls.setProperty(protocol, proxy_url);
+        return true;
+    }
+    else{
+        return false;
+    }   
+    }
+    
+    
+    private boolean old_checkProxy(){
      
-    proxy_url = null;
-
+    String proxy_url = null; // ORIGINALLY A MEMBER VAR
+    
     Download current_download = (Download)download_map.get(mode);
     
@@ -860 +1011 @@
         }
 
-        server_info = new ServerInfoDialog(str_url ,proxy_url, mode,(Download)download_map.get(mode));
+        server_info = new ServerInfoDialog(str_url ,proxy_urls, mode,(Download)download_map.get(mode));
         
     }