Mercurial > hg > release > icedtea-1.10
view plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java @ 1805:8dc304404e01
Update plugin and javaws.
2009-05-13 Omair Majid <omajid@redhat.com>
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java: New file. This new class
is responsible for displaying the splash screen.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java (launchApplication): Show a splash
screen if specified in the JNLP file while loading the remote jars.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java (getListener):
Reposition the frame at the bottom right corner of the screen.
2009-05-13 Lillian Angel <langel@redhat.com>
* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
(PluginAppletSecurityContext): Added comment.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
(checkPermission): Fixed style.
2009-05-11 Lillian Angel <langel@redhat.com>
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java
(getDefaultBaseDir): Added check for home dir. Return null if homeDir
not found in system properties.
2009-05-11 Lillian Angel <langel@redhat.com>
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java
(getDefaultBaseDir): Added null check.
2009-05-11 Lillian Angel <langel@redhat.com>
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java
(getDefaultBaseDir): Set basedir for netx applications to ~/.netx,
rather than asking. Now consistant with the plugin.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed.
2009-05-06 Lillian Angel <langel@redhat.com>
Fixes bz#498108
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java
(runLoader): Pass false to JNLPRuntime.initialize, since this is an
applet.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
(PluginAppletSecurityContext): Likewise.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java
(run): Pass true to JNLPRuntime.initialize, since this
is a webstart app.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java
(initialize): Added new parameter isApplication, which is used to set
global static variable isWebstartApplication.
(isWebstartApplication): New accessor function.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
(checkPermission): Added call to JNLPRuntime.isWebstartApplication so
the check is bypassed if the permissions are to be checked for
a webstart application.
2009-04-30 Deepak Bhole <dbhole@redhat.com>
* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo
permission check if JS source is [System] (i.e. Mozilla
extension/chrome).
2009-04-23 Deepak Bhole <dbhole@redhat.com>
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Handle nested
jars.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Use site address when
checking for policy against CodeSource.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java: Handle nested
jars.
2009-04-10 Deepak Bhole <dbhole@redhat.com>
* IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from
Java side).
* plugin/icedtea/sun/applet/PluginMessageConsumer.java: Bump max workers
from 3 to 20, limiting initial to 3, and growing if/when needed.
2009-04-02 Deepak Bhole <dbhole@redhat.com>
* IcedTeaPlugin.cc: Incremented timeout to 3 minutes. Added functions to
process proxy and auth info requests (the latter is unused).
* plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java: New file.
Displays a username/password input dialog to users for sites and proxies
requiring http auth.
* plugin/icedtea/sun/applet/PluginAppletViewer.java: Fix wait mechanism to
detect applet initialization failures correctly. Add support for
requesting proxy information from the browser.
* plugin/icedtea/sun/applet/PluginCallRequestFactory.java: Add support for
PluginProxyInfoRequest objects.
* plugin/icedtea/sun/applet/PluginMain.java: Wire in custom authenticator
and proxy selector.
* plugin/icedtea/sun/applet/PluginProxyInfoRequest.java: New file. Object
representing proxy information request from browser.
* plugin/icedtea/sun/applet/PluginProxySelector.java: Custom proxy
selector that requests information from browser and uses it.
* plugin/icedtea/sun/applet/PluginStreamHandler.java: Improve handling
code for "plugin specific" messages on the wire.
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java: Add support for improved
initialization failure detection.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 20 May 2009 21:17:02 +0100 |
parents | |
children |
line wrap: on
line source
/* PasswordAuthenticationDialog -- requests authentication information from users Copyright (C) 2009 Red Hat This file is part of IcedTea. IcedTea is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. IcedTea is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with IcedTea; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ package sun.applet; 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; /** * Modal non-minimizable dialog to request http authentication credentials */ public class PasswordAuthenticationDialog extends JDialog { private JLabel jlInfo = new JLabel(""); private JTextField jtfUserName = new JTextField(); private JPasswordField jpfPassword = new JPasswordField(); private boolean userCancelled; public PasswordAuthenticationDialog() { initialize(); } /** * Initialized the dialog components */ public void initialize() { setTitle("IcedTea Java Plugin - Authorization needed to proceed"); setLayout(new GridBagLayout()); JLabel jlUserName = new JLabel("Username: "); JLabel jlPassword = new JLabel("Password: "); JButton jbOK = new JButton("OK"); JButton jbCancel = new JButton("Cancel"); jtfUserName.setSize(20, 10); jpfPassword.setSize(20, 10); GridBagConstraints c; c = new GridBagConstraints(); c.fill = c.HORIZONTAL; c.gridx = 0; c.gridy = 0; c.gridwidth = 2; c.insets = new Insets(10, 5, 3, 3); add(jlInfo, c); c = new GridBagConstraints(); c.gridx = 0; c.gridy = 1; c.insets = new Insets(10, 5, 3, 3); add(jlUserName, c); c = new GridBagConstraints(); c.fill = c.HORIZONTAL; c.gridx = 1; c.gridy = 1; c.insets = new Insets(10, 5, 3, 3); c.weightx = 1.0; add(jtfUserName, c); c = new GridBagConstraints(); c.gridx = 0; c.gridy = 2; c.insets = new Insets(5, 5, 3, 3); add(jlPassword, c); c = new GridBagConstraints(); c.fill = c.HORIZONTAL; c.gridx = 1; c.gridy = 2; c.insets = new Insets(5, 5, 3, 3); c.weightx = 1.0; add(jpfPassword, c); c = new GridBagConstraints(); c.anchor = c.SOUTHEAST; c.gridx = 1; c.gridy = 3; c.insets = new Insets(5, 5, 3, 70); c.weightx = 0.0; add(jbCancel, c); c = new GridBagConstraints(); c.anchor = c.SOUTHEAST; c.gridx = 1; c.gridy = 3; c.insets = new Insets(5, 5, 3, 3); c.weightx = 0.0; add(jbOK, c); 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 jtfUserName.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { userCancelled = false; dispose(); } }); jpfPassword.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { userCancelled = false; dispose(); } }); } /** * Present a dialog to the user asking them for authentication information * * @param hostThe 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); } }); PluginDebug.debug("password dialog shown"); // wait until dialog is gone while (this.isShowing()) { try { Thread.sleep(200); } catch (InterruptedException ie) { } } PluginDebug.debug("password dialog closed"); if (!userCancelled) { auth = new PasswordAuthentication(jtfUserName.getText(), jpfPassword.getText().toCharArray()); } } catch (Exception e) { e.printStackTrace(); // Nothing else we can do. Empty auth will be returned } return auth; } public static void main(String[] args) { PasswordAuthenticationDialog frame = new PasswordAuthenticationDialog(); PasswordAuthentication auth = frame.askUser("127.0.0.1", 3128, "Password for local proxy", "proxy"); System.err.println("Auth info: " + auth.getUserName() + ":" + new String(auth.getPassword())); System.exit(0); } }