Changeset 31860 for main/trunk/gli

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/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/download/ServerInfoDialog.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (4 diffs)
• src/org/greenstone/gatherer/gui/Preferences.java (modified) (7 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -1000 +1000 @@
 Preferences.Connection.ProgramCommand:Preview Command:
 Preferences.Connection.ProgramCommand_Tooltip:The launch command for the program used to view the collection preview. Remember to use %1 as the placeholder for the collection address, and to use speechmarks where necessary.
+Preferences.Connection.No_Check_Certificate: No certificate checking for Https URLs # Disable Https security certificate checking?
+Preferences.Connection.No_Check_Certificate_Tooltip:Tick to download from Https URLs even if they don't have a (valid) security certificate.
 Preferences.Connection.Proxy_Host:Proxy Host:
 Preferences.Connection.Proxy_Host_Tooltip:The address of your proxy server

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

@@ -106 +106 @@
     try {
         String [] env = null;
-        SafeProcess prcs = null; 
-      
+        SafeProcess prcs = null;
+        
         if (Utility.isWindows()) {
         prcs = new SafeProcess(command);

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -571 +571 @@
         // redirect url (we do this step in order to avoid some unintuitive behaviour from wget)
         Download current_download = (Download)download_map.get(mode);
+        
+        boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);       
+        Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
+        if(noCheckCertificate) {
+            no_check_cert_arg.setValue("true");
+            no_check_cert_arg.setAssigned(true);
+        } else {
+            no_check_cert_arg.setValue("false");
+            no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        }
+
         Argument arg_url = current_download.getArgument("url");
         
@@ -576 +587 @@
             String url_str = arg_url.getValue();    
             
-            // No longer following URL redirects, since some of this has been taken care of by wget
-            // For the rest, assume the user will get the URL right that they want to download from
-            /*
-            String redirect_url_str = getRedirectURL(url_str);
-            
-            // only update the Argument and its GUI ArgumentControl if the URL
-            // has in fact changed
-            if(!url_str.equals(redirect_url_str)) {
-            arg_url.setValue(redirect_url_str);
-            updateArgument(arg_url, redirect_url_str);
-            }
-            */
+            // No longer following URL redirects, since some of this has been taken care of by wget
+            // For the rest, assume the user will get the URL right that they want to download from
+            /*
+              String redirect_url_str = getRedirectURL(url_str);
+              
+              // only update the Argument and its GUI ArgumentControl if the URL
+              // has in fact changed
+              if(!url_str.equals(redirect_url_str)) {
+              arg_url.setValue(redirect_url_str);
+              updateArgument(arg_url, redirect_url_str);
+              }
+            */
         }
         
@@ -758 +769 @@
         // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
         if (Utility.isWindows()) {
-             
-           arg.setValue("true");
+           
+           arg.setValue("true"); // proxy_on argument
            arg.setAssigned(true);
-
+           
            arg = current_download.getArgument("proxy_host");
            arg.setValue(proxy_host);
            arg.setAssigned(true);
-
+           
            arg = current_download.getArgument("proxy_port");
            arg.setValue(proxy_port);
            arg.setAssigned(true);
-
+        
            arg = current_download.getArgument("user_name");
            arg.setValue(user_pass.substring(0, user_pass.indexOf("@")));
@@ -822 +833 @@
         }
 
+        boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);
+        Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
+        if(noCheckCertificate) {        
+        no_check_cert_arg.setValue("true");
+        no_check_cert_arg.setAssigned(true);
+        } else {
+        no_check_cert_arg.setValue("false");
+        no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        }
+        
+        
         //str_url = getRedirectURL(str_url); // work out the real URL
 

main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -71 +71 @@
     private JButton ok_button;
     private JCheckBox show_file_size_checkbox;
+    private JCheckBox no_check_certificate_checkbox; // Set no_check_certificate when retrieving Https URLs that have no (valid) certificate
     private JCheckBox use_proxy_checkbox;
     private JCheckBox view_extracted_metadata_checkbox;
@@ -318 +319 @@
         chdir_button.setEnabled(false);
     }
+
+    boolean no_check_cert_enabled = Configuration.get("general.no_check_certificate", true); // pass true to look in general rather than collection specific config file
     
     boolean currently_enabled = Configuration.get("general.use_proxy", true);
@@ -323 +326 @@
     JPanel connection_pane = new JPanel();
         connection_pane.setComponentOrientation(Dictionary.getOrientation());
+    no_check_certificate_checkbox = new JCheckBox(Dictionary.get("Preferences.Connection.No_Check_Certificate"));
+    no_check_certificate_checkbox.setToolTipText(Dictionary.get("Preferences.Connection.No_Check_Certificate_Tooltip"));
+    no_check_certificate_checkbox.setSelected(no_check_cert_enabled);
+    no_check_certificate_checkbox.setComponentOrientation(Dictionary.getOrientation());        
+    no_check_certificate_checkbox.setPreferredSize(ROW_SIZE);
+    
     use_proxy_checkbox = new JCheckBox(Dictionary.get("Preferences.Connection.Use_Proxy"));
     use_proxy_checkbox.setSelected(currently_enabled);
@@ -360 +369 @@
     
     // Connection
+    no_check_certificate_checkbox.addActionListener(new NoCheckCertificateListener());
     use_proxy_checkbox.addActionListener(new UseProxyListener());
     if (Gatherer.GS3) {
@@ -404 +414 @@
 
     connection_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    connection_pane.setLayout(new GridLayout(8,1,0,2));
+    connection_pane.setLayout(new GridLayout(9,1,0,2));
     connection_pane.add(program_pane);
     connection_pane.add(library_path_pane);
@@ -416 +426 @@
     connection_pane.add(collect_dir_pane);
 
+    connection_pane.add(no_check_certificate_checkbox);
     connection_pane.add(use_proxy_checkbox);
     connection_pane.add(proxy_host_pane);
@@ -1119 +1130 @@
     }
 
+    private class NoCheckCertificateListener implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        boolean isEnabled = no_check_certificate_checkbox.isSelected();
+        Configuration.set("general.no_check_certificate", true, isEnabled);
+        boolean no_check_cert_enabled = Configuration.get("general.no_check_certificate", true);
+    }
+    }
+    
     private class UseProxyListener
     implements ActionListener {