Show
Ignore:
Timestamp:
09.08.2017 16:48:21 (2 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:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

    r31857 r31860  
    4040use strict; # every perl program should have this! 
    4141no strict 'refs'; # make an exception so we can use variables as filehandles 
     42no strict 'subs'; 
     43use gsprintf 'gsprintf'; 
    4244 
    4345my $arguments =  
     
    117119    my $cmdWget = "-N -k -x --tries=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'}; 
    118120 
    119     #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n"; 
     121    #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n"; 
    120122     
    121123    # Download the web pages 
     
    194196     
    195197    if (!defined $strIdentifyText or $strIdentifyText eq ""  ){ 
    196         print STDERR "Server information is unavailable.\n";             
    197         if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong 
    198             print STDERR "Current proxy settings are:\n"; 
    199             print STDERR "- host=$self->{'proxy_host'}\n"; 
    200             print STDERR "- port=$self->{'proxy_port'}\n"; 
    201         } else { # else no proxy set, the user may need proxy settings 
    202             print STDERR "The external server might not be responding, or you might need to switch on proxy settings.\n"; 
    203         } 
    204         print STDERR "<<Finished>>\n"; 
    205          return;   
     198     
     199    print STDERR "Server information is unavailable.\n"; 
     200 
     201    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong 
     202        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n", $self->{'proxy_host'}, $self->{'proxy_port'}); 
     203    } else { # else no proxy set, the user may need proxy settings 
     204        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxyless_connect_failed_info}\n"); 
     205    } 
     206     
     207    # with or without proxying set, getting server info may have failed if the URL was Https 
     208    # but the site had no valid certificate and no_check_certificate wasn't turned on 
     209    # suggest to the user to try turning it on 
     210    &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.connect_failed_info}\n"); 
     211     
     212    print STDERR "<<Finished>>\n"; 
     213    return;   
    206214    } 
    207215 
  • main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

    r31856 r31860  
    7070    'type' => "string", 
    7171    'reqd' => "no", 
    72     'hiddengli' => "yes"}]; 
     72    'hiddengli' => "yes"}, 
     73      { 'name' => "no_check_certificate",  
     74    'desc' => "{WgetDownload.no_check_certificate}", 
     75    'type' => "flag", 
     76    'reqd' => "no", 
     77    'hiddengli' => "yes"} 
     78     ]; 
    7379 
    7480my $options = { 'name'     => "WgetDownload", 
     
    183189    } 
    184190 
    185     if($self->{'no_check_certificate'} && $self->{'url'} =~ m/^https\:/) { 
    186         $strOptions .= " --no-check-certificate "; 
    187     } 
     191    if($self->{'no_check_certificate'}) { #&& $self->{'url'} =~ m/^https\:/) { # URL may be http that gets redirected to https 
     192     
     193    $strOptions .= " --no-check-certificate "; 
     194    } 
    188195     
    189196    return $strOptions; 
  • main/trunk/greenstone2/perllib/gsprintf.pm

    r31419 r31860  
    7171sub gsprintf 
    7272{ 
     73    my ($handle, $text_string, @text_arguments) = @_;     
     74    _gsprintf($handle, $text_string, 0, @text_arguments); 
     75} 
     76 
     77sub gsprintf_multiline 
     78{ 
    7379    my ($handle, $text_string, @text_arguments) = @_; 
     80    _gsprintf($handle, $text_string, 1, @text_arguments); 
     81} 
     82 
     83sub _gsprintf 
     84{ 
     85    my ($handle, $text_string, $multiline, @text_arguments) = @_; 
    7486 
    7587    # Return unless the required arguments were supplied 
     
    8294    my $text_string_resolved = sprintf($text_string, @text_arguments); 
    8395 
     96    if($multiline) { # replace newlines 
     97    $text_string_resolved =~ s@\\n@\n@g; 
     98    } 
     99     
    84100    if ($freetext_xml_mode) { 
    85101    $text_string_resolved = make_freetext_xml_safe($text_string_resolved); 
    86102    } 
    87  
     103     
    88104    print $handle $text_string_resolved; 
    89105} 
    90106 
    91      
     107 
    92108 
    93109sub lookup_string 
  • main/trunk/greenstone2/perllib/strings.properties

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