Changeset 31877 for main/trunk/greenstone2/perllib

Timestamp:

2017-08-11T17:07:44+12:00 (7 years ago)

Author:

ak19

Message:

Getting Windows wget to use proxy settings in environment. They didn't need to be in CAPS, as Windows has the side effect of setting env vars in both the original case of the letters of the env variable name as well as in all caps, and unsetting either version unsets both. On Windows however, I noticed that Perl was not on the PATH after open3() in WgetDownload.pm::useWget() failed with an unclear error message. So now the PATH is also propagated from Java to the perl code for downloading using wget.

Location:

main/trunk/greenstone2/perllib/downloaders

Files:

• WebDownload.pm (modified) (1 diff)
• WgetDownload.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

@@ -193 +193 @@
     my $strBaseCMD = $strOptions." --tries=2 -q -O - \"$self->{'url'}\"";
 
+    #&util::print_env(STDERR, "https_proxy", "http_proxy", "HTTPS_PROXY", "HTTP_PROXY", "ftp_proxy", "FTP_PROXY");
+    #&util::print_env(STDERR);  
+    
     my $strIdentifyText = $self->useWget($strBaseCMD);
     

main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

@@ -165 +165 @@
 }
 
-sub getWgetOptions
-{
-    my ($self) = @_;
-    my $strOptions = "";
-
-    # If http_proxy ENV VARS are not set, but proxy Perl vars are set, then we're on Windows
-    # and need to use the proxy vars as flags to wget
-    # If http_proxy Env Vars are set, then we're on Linux, wget will use the http(s) proxy
-    # env vars and we shouldn't be passing any proxy perl vars as flags
-    
-    # Truth in Perl: https://home.ubalt.edu/abento/452/perl/perltruth.html
-    # http://www.perlmonks.org/?node=what%20is%20true%20and%20false%20in%20Perl%3F
-    
-    if (!$ENV{'http_proxy'} && !$ENV{'https_proxy'}) {
+# Not using this. On Windows, we used to pass proxying settings as flags to wget. But, as that can be
+# seen with Task Manager, we now have the proxy settings set in the environment and are no longer passing it
+sub addProxySettingsAsWgetFlags
+{
+    my ($self) = @_;
+    my $strOptions = "";
+    
     if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'})
     {
@@ -193 +186 @@
         $strOptions .= " --proxy ";
     }
-    }
-
-    if($self->{'no_check_certificate'}) { #&& $self->{'url'} =~ m/^https\:/) { # URL may be http that gets redirected to https, so if no_check_certificate is on, turn it on even if URL is http
+    
+    return $strOptions;
+}
+
+sub getWgetOptions
+{
+    my ($self) = @_;
+    my $strOptions = "";
+    
+    # If proxy settings are set up in the environment, wget is ready to use them. More secure.
+    # But if proxy settings are not set up in the environment, pass them as flags to wget
+    # This is less secure, as pwd etc visible in task manager, but it was the original way in
+    # which wget was run on windows.
+    # Truth in Perl: https://home.ubalt.edu/abento/452/perl/perltruth.html
+    # http://www.perlmonks.org/?node=what%20is%20true%20and%20false%20in%20Perl%3F
+
+    if (!$ENV{'http_proxy'} && !$ENV{'https_proxy'}) {
+        $strOptions .= $self->addProxySettingsAsWgetFlags();
+    } # else wget will use proxy settings in environment, assume enough settings have been provided
+    
+    if($self->{'no_check_certificate'}) { # URL may be http that gets redirected to https, so if no_check_certificate is on, turn it on even if URL is http
 
     $strOptions .= " --no-check-certificate ";