Changeset 17621

Timestamp:

2008-10-28T19:04:39+13:00 (15 years ago)

Author:

ak19

Message:

Correction to previous changes I made to GAuthenticator: it now only uses any previously stored values for username and password when the GAuthenticator operates in the new DOWNLOAD mode, which is set (and soon thereafter restored to the default REGULAR mode) in DownloadPane.java for (wget) downloads.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• GAuthenticator.java (modified) (2 diffs)
• gui/DownloadPane.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/GAuthenticator.java

@@ -68 +68 @@
     /** The default size of this dialog. */
     static final private Dimension SIZE = new Dimension(470,160);
-
+    
+    /** For Wget downloads, we want to avoid the second automatic request for proxy authentication
+     * But the settings for that specific case will otherwise interfere with how this GAuthenticator 
+     * is to function in the usual situation. For this reason, we use two modes.*/
+    static final public int REGULAR = 0;
+    static final public int DOWNLOAD = 1;
+    static private int operationMode = REGULAR; 
+
+    public static void setMode(int mode) {
+    operationMode = mode;
+    }
+    
     /** Constructor. */
     public GAuthenticator() {
@@ -79 +90 @@
      */
     protected PasswordAuthentication getPasswordAuthentication(String username_str, String password_str) {
-
-    // Don't prompt if the details were already saved for the same host and port. This is necessary
-    // when running wget because wget requires proxy authentication. And without the following, the
-    // regular proxy authentication would also popup a dialog requesting the same information.
-
-    String key = getRequestingHost() + ":" + getRequestingPort();
-    String value = (String)authentications.get(key);
-
-    if(value != null) { // authentication for this host and port was already stored
-        // Arguments may be null. If so, retrieve them from the stored value
-        if(username_str == null) {
-        username_str = value.substring(0, value.indexOf("@"));
-        } 
-        if(password_str == null) {
-        password_str = value.substring(value.indexOf("@") + 1);
+    if(operationMode == DOWNLOAD) { // special handling of proxy authentication popup for Wget downloads
+
+        // Don't prompt if the details were already saved for the same host and port. This is necessary
+        // when running wget because wget requires proxy authentication. And without the following, the
+        // regular proxy authentication would also popup a dialog requesting the same information.
+        
+        String key = getRequestingHost() + ":" + getRequestingPort();
+        String value = (String)authentications.get(key);
+        
+        if(value != null) { // authentication for this host and port was already stored
+        // Arguments may be null. If so, retrieve them from the stored value
+        if(username_str == null) {
+            username_str = value.substring(0, value.indexOf("@"));
+        } 
+        if(password_str == null) {
+            password_str = value.substring(value.indexOf("@") + 1);
+        }
+        return new PasswordAuthentication(username_str, password_str.toCharArray());
         }
-        return new PasswordAuthentication(username_str, password_str.toCharArray());
     }
     

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

@@ -634 +634 @@
         
             int count = 0;
+        // Only for wget, need to avoid a second automatic authentication popup (first asks
+        // the proxy authentication for wget, and the second will ask the same for the realm)
+        GAuthenticator.setMode(GAuthenticator.DOWNLOAD);
         while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) {
         Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.get("WGet.Prompt"), "HTTP");
         count++;
         }
-
+        GAuthenticator.setMode(GAuthenticator.REGULAR); // reset the state to default (of how the authentication popup functions)
         if(count >= 3) {
         return false;