Changeset 31860 for main/trunk/greenstone2/perllib/downloaders

Timestamp:

2017-08-09T16:48:21+12:00 (7 years ago)

Author:

ak19

Message:

The changes necessary for getting the new no_check_certificate checkbox to appear and work in GLI and get propagated to the perl code that launches wget. This checkbox controls whether wget is launched with the no-check-certificate flag to retrieve Https URLs despite lack of (valid) certificates.

Location:

main/trunk/greenstone2/perllib/downloaders

Files:

• WebDownload.pm (modified) (3 diffs)
• WgetDownload.pm (modified) (2 diffs)

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

@@ -40 +40 @@
 use strict; # every perl program should have this!
 no strict 'refs'; # make an exception so we can use variables as filehandles
+no strict 'subs';
+use gsprintf 'gsprintf';
 
 my $arguments = 
@@ -117 +119 @@
     my $cmdWget = "-N -k -x --tries=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'};
 
-    #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n";
+    #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n";
     
     # Download the web pages
@@ -194 +196 @@
     
     if (!defined $strIdentifyText or $strIdentifyText eq ""  ){
-        print STDERR "Server information is unavailable.\n";            
-        if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong
-            print STDERR "Current proxy settings are:\n";
-            print STDERR "- host=$self->{'proxy_host'}\n";
-            print STDERR "- port=$self->{'proxy_port'}\n";
-        } else { # else no proxy set, the user may need proxy settings
-            print STDERR "The external server might not be responding, or you might need to switch on proxy settings.\n";
-        }
-        print STDERR "<<Finished>>\n";
-         return;  
+    
+    print STDERR "Server information is unavailable.\n";
+
+    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n", $self->{'proxy_host'}, $self->{'proxy_port'});
+    } else { # else no proxy set, the user may need proxy settings
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxyless_connect_failed_info}\n");
+    }
+    
+    # with or without proxying set, getting server info may have failed if the URL was Https
+    # but the site had no valid certificate and no_check_certificate wasn't turned on
+    # suggest to the user to try turning it on
+    &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.connect_failed_info}\n");
+    
+    print STDERR "<<Finished>>\n";
+    return;  
     }
 

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

@@ -70 +70 @@
     'type' => "string",
     'reqd' => "no",
-    'hiddengli' => "yes"}];
+    'hiddengli' => "yes"},
+      { 'name' => "no_check_certificate", 
+    'desc' => "{WgetDownload.no_check_certificate}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes"}
+     ];
 
 my $options = { 'name'     => "WgetDownload",
@@ -183 +189 @@
     }
 
-    if($self->{'no_check_certificate'} && $self->{'url'} =~ m/^https\:/) {
-        $strOptions .= " --no-check-certificate ";
-    }
+    if($self->{'no_check_certificate'}) { #&& $self->{'url'} =~ m/^https\:/) { # URL may be http that gets redirected to https
+    
+    $strOptions .= " --no-check-certificate ";
+    }
     
     return $strOptions;