Changeset 31843

Timestamp:

2017-08-02T20:17:30+12:00 (6 years ago)

Author:

ak19

Message:

1. Adding new Java class URLConnectionManager to get an (Http)URLConnection depending on whether you're using a proxy or not, whether the URL is over Http or Https, and whether to set the no_check_certificate setting for Https URLs. Additional methods to set or unset this flag globally on all subsequent URL connections. 2. DownloadPane.getRedirectURL() now calls this and avoids the SSLHandShakeException discovered on Toro yesterday: not just wget but also Java code that makes a URL connection to an Https site that does not have a valid certificate will need to have no_check_certificate turned on if we want to download from there. Even if getRedirectURL() is found to no longer be useful, the new class URLConnectionManager is reusable. 4. Adding GS copyright header to SafeProcess.java.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• download/URLConnectionManager.java (added)
• gui/DownloadPane.java (modified) (3 diffs)
• util/SafeProcess.java (modified) (1 diff)

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

@@ -55 +55 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.download.URLConnectionManager;
 import org.greenstone.gatherer.download.Download;
 import org.greenstone.gatherer.download.DownloadScrollPane;
@@ -616 +617 @@
     if(url_str.startsWith("http:") || url_str.startsWith("https:")) { // only test http urls
         try {
-        URL url = new URL(url_str);
-        if(this.proxyObject == null) {
-            connection = (HttpURLConnection)url.openConnection(); //new HttpURLConnection(url);
-        } else {
-            connection = (HttpURLConnection)url.openConnection(proxyObject);
-        }
+        // URLConnectionManager class has special handling for https URLs,
+        // so you can control whether you want it to check an HTTPS site's security certificates for you or not
+        boolean noCheckCertificates = true;
+        connection = (HttpURLConnection)URLConnectionManager.getConnection(url_str, this.proxyObject, noCheckCertificates);
+        
         // don't let it automatically follow redirects, since we want to
         // find out whether we are dealing with redirects in the first place
@@ -700 +700 @@
     }
 
-    
+    // TODO: Still need to read up on and test how to set wget proxy on windows
+    // Need to be on a windows machine that requires proxy, and get wget to work on cmdline
+    // If that works, then need to check https URLS also work.
+    // See https://superuser.com/questions/526710/how-to-set-http-proxy-address-for-wget-under-windows
     private boolean checkProxy(){
      

main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

@@ +1 @@
+/**
+ *#########################################################################
+ *
+ * A component of the Gatherer application, part of the Greenstone digital
+ * library suite from the New Zealand Digital Library Project at the
+ * University of Waikato, New Zealand.
+ *
+ * Author: Greenstone Digital Library, University of Waikato, except where indicated
+ *
+ * Copyright (C) 1999 New Zealand Digital Library Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *########################################################################
+ */
 package org.greenstone.gatherer.util;