Changeset 31860 for main/trunk/greenstone2/perllib

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

Files:

• downloaders/WebDownload.pm (modified) (3 diffs)
• downloaders/WgetDownload.pm (modified) (2 diffs)
• gsprintf.pm (modified) (2 diffs)
• strings.properties (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;

main/trunk/greenstone2/perllib/gsprintf.pm

@@ -71 +71 @@
 sub gsprintf
 {
+    my ($handle, $text_string, @text_arguments) = @_;    
+    _gsprintf($handle, $text_string, 0, @text_arguments);
+}
+
+sub gsprintf_multiline
+{
     my ($handle, $text_string, @text_arguments) = @_;
+    _gsprintf($handle, $text_string, 1, @text_arguments);
+}
+
+sub _gsprintf
+{
+    my ($handle, $text_string, $multiline, @text_arguments) = @_;
 
     # Return unless the required arguments were supplied
@@ -82 +94 @@
     my $text_string_resolved = sprintf($text_string, @text_arguments);
 
+    if($multiline) { # replace newlines
+    $text_string_resolved =~ s@\\n@\n@g;
+    }
+    
     if ($freetext_xml_mode) {
     $text_string_resolved = make_freetext_xml_safe($text_string_resolved);
     }
-
+    
     print $handle $text_string_resolved;
 }
 
-    
+
 
 sub lookup_string

main/trunk/greenstone2/perllib/strings.properties

@@ -1336 +1336 @@
 WebDownload.html_only:Download only HTML files, and ignore associated files e.g images and stylesheets
 WebDownload.html_only_disp:Only HTML files
+WebDownload.proxied_connect_failed_info:Current proxy settings are:\n- host=%s\n- port=%s
+WebDownload.proxyless_connect_failed_info:- The external server might not be responding\n- or you might need to switch on proxy settings
+WebDownload.connect_failed_info:- or try ticking No Certificate Checking for Https\nin File > Preferences > Connection
 
 WgetDownload.desc: Base class that handles calls to wget
@@ -1343 +1346 @@
 WgetDownload.user_name:User name
 WgetDownload.user_password:User password
+WgetDownload.no_check_certificate:No check certificate
 
 Z3950Download.desc:A module for downloading from Z3950 repositories