Changeset 17551 for gli/trunk/src/org/greenstone/gatherer/GAuthenticator.java

Timestamp:

2008-10-16T17:23:22+13:00 (16 years ago)

Author:

ak19

Message:

Authenticator now only prompts for proxy details for WGet and no longer pops up a second dialog requesting the same proxy authentication information for the general proxy.

File:

• gli/trunk/src/org/greenstone/gatherer/GAuthenticator.java (modified) (1 diff)

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

@@ -79 +79 @@
      */
     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);
+        }
+        return new PasswordAuthentication(username_str, password_str.toCharArray());
+    }
+    
     // Component definition.
     dialog = new JDialog (Gatherer.g_man, Dictionary.get("GAuthenticator.Title"), true);