Changeset 17651 for gli

Timestamp:

2008-10-31T14:23:48+13:00 (15 years ago)

Author:

ak19

Message:

Corrected my mistake: fixed authentication to work with both wget Downloads and GLI applet

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

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

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

@@ -91 +91 @@
     protected PasswordAuthentication getPasswordAuthentication(String username_str, String password_str) {
     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
@@ -107 +107 @@
             password_str = value.substring(value.indexOf("@") + 1);
         }
+        operationMode = REGULAR; // reset the state of the Authenticator to normal mode
         return new PasswordAuthentication(username_str, password_str.toCharArray());
         }

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

@@ -636 +636 @@
         // 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)
+        // Once the authentication has been reused, it will set the GAuthenticator state back to REGULAR
         GAuthenticator.setMode(GAuthenticator.DOWNLOAD);
         while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) {
@@ -641 +642 @@
         count++;
         }
-        GAuthenticator.setMode(GAuthenticator.REGULAR); // reset the state to default (of how the authentication popup functions)
         if(count >= 3) {
         return false;
@@ -648 +648 @@
         if(user_pass.indexOf("@") != -1) {
             
-        // 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 follwoing can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
+        // 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()) {
              
@@ -676 +676 @@
            
            }
-
+        
            return true;
         }
@@ -684 +684 @@
 
     }
-
+    
     return true;
     }