Changeset 31865

Timestamp:

2017-08-09T21:10:54+12:00 (6 years ago)

Author:

ak19

Message:

1. Helpful messages appended to the Download log directing the user to turn on the No Certificate Checking option in Prefs' Connection tab, in case downloading over https fails because the site's certificate is invalid. 2. Must not forget to turn off no_check_certificate in Greenstone's wgetrc template wget config file in gs2build/build-src/packages/wget folder

Location:

main/trunk

Files:

• gli/classes/dictionary.properties (modified) (1 diff)
• gli/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (3 diffs)
• greenstone2/build-src/packages/wget/wgetrc-gs.in (modified) (1 diff)

main/trunk/gli/classes/dictionary.properties

@@ -867 +867 @@
 Mirroring.DownloadJob.Resume_Tooltip:Resume this download
 Mirroring.DownloadJob.Status:Downloaded {0} of {1} files ({2} warnings, {3} errors)
+Mirroring.DownloadJob.Warning_No_Valid_Certificate:WARNING: Can't download from a site that doesn\'t have a (valid) security certificate.
+Mirroring.DownloadJob.Enable_NoCheckCertificate:Enable 'No certificate checking' in Preferences > Connection to download insecurely from https URLs. 
 Mirroring.DownloadJob.Waiting:Waiting to start
 Mirroring.DownloadJob.Waiting_User:Waiting for user action

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -1081 +1081 @@
         AppendLineOnlyFileDocument download_log = DownloadJob.this.download_log;
 
+        boolean noCheckCertificate_needed = false; // determine whether this flag needs to be set for wget (under Preferences > Connection)
+        
         while (!Thread.currentThread().isInterrupted() && (line = br.readLine()) != null
                && !line.trim().equals("<<Finished>>") /*&& !isStopped()*/) {
@@ -1100 +1102 @@
                 DebugStream.println("***** Requesting robot.txt");
                 ignore_for_robots = true;
+            }
+            else if(line.indexOf("--no-check-certificate") != -1) {
+                downloadWarning();
+                noCheckCertificate_needed = true;
             }
             // If line contains "=> `" display text as the 
@@ -1180 +1186 @@
             }
         }
+        if(noCheckCertificate_needed) { // can't download from (some nested) URL as its
+            // certificate can't be verified. User must turn on --no-check-certificate
+            // if they want to download from there anyway, but it will do so insecurely
+            download_log.appendLine("************");
+            download_log.appendLine(Dictionary.get("Mirroring.DownloadJob.Warning_No_Valid_Certificate"));
+            download_log.appendLine(Dictionary.get("Mirroring.DownloadJob.Enable_NoCheckCertificate"));
+            download_log.appendLine("************");
+        }
         
         } catch (IOException ioe) {

main/trunk/greenstone2/build-src/packages/wget/wgetrc-gs.in

@@ -4 +4 @@
 
 # for versions with openssl support, don't want to be forced to run wget
-# with --no-check-certificate each time
-check_certificate = off
+# with --no-check-certificate each time. Now this is controlled in GLI's
+# File > Preferences > Connection tab by ticking "No certificate checking"
+#check_certificate = off
 
 ## You can use this file to change the default behaviour of wget or to