Changeset 18363 for gli/branches/rtl-gli/src/org/greenstone/gatherer/GAuthenticator.java

Timestamp:

2009-01-12T11:19:54+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/GAuthenticator.java (modified) (6 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/GAuthenticator.java

@@ -42 +42 @@
 import java.util.*;
 import javax.swing.*;
+
+
 import org.greenstone.gatherer.gui.GLIButton;
+
 
 /** Provides a graphic authenticator for network password requests.
@@ -65 +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() {
@@ -75 +89 @@
      * @see org.greenstone.gatherer.GAuthenticator.RequestFocusListener
      */
-    protected PasswordAuthentication getPasswordAuthentication() {
+    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
+        // 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);
+        }
+        operationMode = REGULAR; // reset the state of the Authenticator to normal mode
+        return new PasswordAuthentication(username_str, password_str.toCharArray());
+        }
+    }
+    
     // Component definition.
     dialog = new JDialog (Gatherer.g_man, Dictionary.get("GAuthenticator.Title"), true);
@@ -82 +118 @@
     JPanel content_pane = (JPanel) dialog.getContentPane();
     JLabel title_label = new JLabel(getMessageString());
+
     JPanel user_panel = new JPanel();
     JLabel username_label = new JLabel(Dictionary.get("GAuthenticator.Username"));
     JTextField username = new JTextField();
     username.setToolTipText(Dictionary.get("GAuthenticator.Username_Tooltip"));
+    if (username_str != null) {
+        username.setText(username_str);
+    }
+
     JPanel password_panel = new JPanel();
     JLabel password_label = new JLabel(Dictionary.get("GAuthenticator.Password"));
@@ -91 +132 @@
     password.setEchoChar('*');
     password.setToolTipText(Dictionary.get("GAuthenticator.Password_Tooltip"));
+    if (password_str != null) {
+        password.setText(password_str);
+    }
+
     JPanel button_panel = new JPanel();
     ok_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
@@ -134 +179 @@
     }
 
+    protected PasswordAuthentication getPasswordAuthentication() {
+    return getPasswordAuthentication(null,null);
+    }
 
     /** This is defined so it can be overridden by subclasses (getRequestingPrompt is final). */