aboutsummaryrefslogtreecommitdiffstats
path: root/netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java
diff options
context:
space:
mode:
authorOmair Majid <[email protected]>2011-02-28 14:30:39 -0500
committerOmair Majid <[email protected]>2011-02-28 14:30:39 -0500
commit5df1503c77c6c1b6104baa22354bd1cd215f9cbc (patch)
tree3eee8ad62ede221369452fba3dd2423113e0df38 /netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java
parent05dd25bd43df11fc874d857ced49bbe3c6e72a74 (diff)
Integrate JNLPAuthenticator into the rest of the security subsystem
This patch integrates the password authentication pane into the rest of the security dialog system. The password authentication dialog is now shown using the secure thread, rather than the thread of the JNLP application. 2011-02-28 Omair Majid <[email protected]> * netx/net/sourceforge/jnlp/resources/Messages.properties: Add Password, Username and SAuthenticationPrompt. * netx/net/sourceforge/jnlp/security/JNLPAuthenticator.java (getPasswordAuthentication): Show password prompt using the secure thread. * netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java (PasswordAuthenticationPane): Initialize variables. (initialize): For consistency, rename to.. (addComponents): New method. Set the appropriate return value when user takes an action. (askUser): Remove. (main): Remove. * netx/net/sourceforge/jnlp/security/SecurityDialog.java (initDialog): Add extra case for AUTHENTICATION dialog type. (installPanel): Likewise. * netx/net/sourceforge/jnlp/security/SecurityDialogs.java (DialogType): Add AUTHENTICATION. (showAuthenicationPrompt): New method. Shows a password authentication prompt.
Diffstat (limited to 'netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java')
-rw-r--r--netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java157
1 files changed, 46 insertions, 111 deletions
diff --git a/netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java b/netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java
index 7a0411e..d449211 100644
--- a/netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java
+++ b/netx/net/sourceforge/jnlp/security/PasswordAuthenticationPane.java
@@ -37,52 +37,59 @@ exception statement from your version. */
package net.sourceforge.jnlp.security;
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.net.PasswordAuthentication;
import javax.swing.JButton;
-import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPasswordField;
import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import net.sourceforge.jnlp.runtime.JNLPRuntime;
/**
* Modal non-minimizable dialog to request http authentication credentials
*/
-public class PasswordAuthenticationPane extends JDialog {
+public class PasswordAuthenticationPane extends SecurityDialogPanel {
- private final JLabel jlInfo = new JLabel("");
private final JTextField jtfUserName = new JTextField();
private final JPasswordField jpfPassword = new JPasswordField();
- private boolean userCancelled;
- public PasswordAuthenticationPane() {
- initialize();
- }
+ private final String host;
+ private final int port;
+ private final String prompt;
+ private final String type;
+
+ public PasswordAuthenticationPane(SecurityDialog parent, Object[] extras) {
+ super(parent);
+ host = (String) extras[0];
+ port = (Integer) extras[1];
+ prompt = (String) extras[2];
+ type = (String) extras[3];
+
+ addComponents();
+ }
/**
* Initialized the dialog components
*/
- public void initialize() {
+ public void addComponents() {
- setTitle("IcedTea Java Plugin - Authorization needed to proceed");
+ JLabel jlInfo = new JLabel("");
+ jlInfo.setText("<html>" + R("SAuthenticationPrompt", type, host, prompt) + "</html>");
setLayout(new GridBagLayout());
- JLabel jlUserName = new JLabel("Username: ");
- JLabel jlPassword = new JLabel("Password: ");
- JButton jbOK = new JButton("OK");
- JButton jbCancel = new JButton("Cancel");
+ JLabel jlUserName = new JLabel(R("Username"));
+ JLabel jlPassword = new JLabel(R("Password"));
+ JButton jbOK = new JButton(R("ButOk"));
+ JButton jbCancel = new JButton(R("ButCancel"));
jtfUserName.setSize(20, 10);
jpfPassword.setSize(20, 10);
@@ -90,7 +97,7 @@ public class PasswordAuthenticationPane extends JDialog {
GridBagConstraints c;
c = new GridBagConstraints();
- c.fill = c.HORIZONTAL;
+ c.fill = GridBagConstraints.HORIZONTAL;
c.gridx = 0;
c.gridy = 0;
c.gridwidth = 2;
@@ -104,7 +111,7 @@ public class PasswordAuthenticationPane extends JDialog {
add(jlUserName, c);
c = new GridBagConstraints();
- c.fill = c.HORIZONTAL;
+ c.fill = GridBagConstraints.HORIZONTAL;
c.gridx = 1;
c.gridy = 1;
c.insets = new Insets(10, 5, 3, 3);
@@ -118,7 +125,7 @@ public class PasswordAuthenticationPane extends JDialog {
add(jlPassword, c);
c = new GridBagConstraints();
- c.fill = c.HORIZONTAL;
+ c.fill = GridBagConstraints.HORIZONTAL;
c.gridx = 1;
c.gridy = 2;
c.insets = new Insets(5, 5, 3, 3);
@@ -126,7 +133,7 @@ public class PasswordAuthenticationPane extends JDialog {
add(jpfPassword, c);
c = new GridBagConstraints();
- c.anchor = c.SOUTHEAST;
+ c.anchor = GridBagConstraints.SOUTHEAST;
c.gridx = 1;
c.gridy = 3;
c.insets = new Insets(5, 5, 3, 70);
@@ -134,7 +141,7 @@ public class PasswordAuthenticationPane extends JDialog {
add(jbCancel, c);
c = new GridBagConstraints();
- c.anchor = c.SOUTHEAST;
+ c.anchor = GridBagConstraints.SOUTHEAST;
c.gridx = 1;
c.gridy = 3;
c.insets = new Insets(5, 5, 3, 3);
@@ -143,105 +150,33 @@ public class PasswordAuthenticationPane extends JDialog {
setMinimumSize(new Dimension(400, 150));
setMaximumSize(new Dimension(1024, 150));
- setAlwaysOnTop(true);
setSize(400, 150);
- setLocationRelativeTo(null);
-
- // OK => read supplied info and pass it on
- jbOK.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- userCancelled = false;
- dispose();
- }
- });
-
- // Cancel => discard supplied info and pass on an empty auth
- jbCancel.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- userCancelled = true;
- dispose();
- }
- });
-
- // "return" key in either user or password field => OK
+ parent.setLocationRelativeTo(null);
+ initialFocusComponent = jtfUserName;
- jtfUserName.addActionListener(new ActionListener() {
+ ActionListener acceptActionListener = new ActionListener() {
public void actionPerformed(ActionEvent e) {
- userCancelled = false;
- dispose();
+ parent.setValue(new Object[] { jtfUserName.getText(), jpfPassword.getPassword() });
+ parent.dispose();
}
- });
+ };
- jpfPassword.addActionListener(new ActionListener() {
+ ActionListener cancelActionListener = new ActionListener() {
public void actionPerformed(ActionEvent e) {
- userCancelled = false;
- dispose();
- }
- });
- }
-
- /**
- * Present a dialog to the user asking them for authentication information
- *
- * @param host The host for with authentication is needed
- * @param port The port being accessed
- * @param prompt The prompt (realm) as presented by the server
- * @param type The type of server (proxy/web)
- * @return PasswordAuthentication containing the credentials (empty credentials if user cancelled)
- */
- protected PasswordAuthentication askUser(String host, int port, String prompt, String type) {
- PasswordAuthentication auth = null;
-
- host += port != -1 ? ":" + port : "";
-
- // This frame is reusable. So reset everything first.
- userCancelled = true;
- jlInfo.setText("<html>The " + type + " server at " + host +
- " is requesting authentication. It says \"" + prompt + "\"</html>");
-
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- // show dialog to user
- setVisible(true);
- }
- });
-
- if (JNLPRuntime.isDebug()) {
- System.out.println("password dialog shown");
- }
-
- // wait until dialog is gone
- while (this.isShowing()) {
- try {
- Thread.sleep(200);
- } catch (InterruptedException ie) {
- }
- }
-
- if (JNLPRuntime.isDebug()) {
- System.out.println("password dialog closed");
+ parent.setValue(null);
+ parent.dispose();
}
+ };
- if (!userCancelled) {
- auth = new PasswordAuthentication(jtfUserName.getText(), jpfPassword.getPassword());
- }
- } catch (Exception e) {
- e.printStackTrace();
-
- // Nothing else we can do. Empty auth will be returned
- }
-
- return auth;
- }
-
- public static void main(String[] args) {
- PasswordAuthenticationPane frame = new PasswordAuthenticationPane();
+ // OK => read supplied info and pass it on
+ jbOK.addActionListener(acceptActionListener);
- PasswordAuthentication auth = frame.askUser("127.0.0.1", 3128, "Password for local proxy", "proxy");
+ // Cancel => discard supplied info and pass on an empty auth
+ jbCancel.addActionListener(cancelActionListener);
- System.err.println("Auth info: " + auth.getUserName() + ":" + new String(auth.getPassword()));
- System.exit(0);
+ // "return" key in either user or password field => OK
+ jtfUserName.addActionListener(acceptActionListener);
+ jpfPassword.addActionListener(acceptActionListener);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-19 08:58:42 +0000