changeset in /hg/icedtea6: Proxy support for the icedtea plugin
Deepak Bhole
dbhole at redhat.com
Thu Apr 2 11:54:54 PDT 2009
changeset 300bff72109a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=300bff72109a
description:
Proxy support for the icedtea plugin
diffstat:
11 files changed, 808 insertions(+), 25 deletions(-)
ChangeLog | 23 +
IcedTeaPlugin.cc | 158 ++++++-
plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java | 241 +++++++++++
plugin/icedtea/sun/applet/PluginAppletViewer.java | 54 ++
plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 4
plugin/icedtea/sun/applet/PluginMain.java | 36 +
plugin/icedtea/sun/applet/PluginProxyInfoRequest.java | 85 +++
plugin/icedtea/sun/applet/PluginProxySelector.java | 195 ++++++++
plugin/icedtea/sun/applet/PluginStreamHandler.java | 26 -
rt/net/sourceforge/jnlp/JNLPFile.java | 2
rt/net/sourceforge/jnlp/NetxPanel.java | 9
diffs (truncated from 1097 to 500 lines):
diff -r 5e6be75f137c -r 300bff72109a ChangeLog
--- a/ChangeLog Thu Apr 02 11:19:02 2009 -0400
+++ b/ChangeLog Thu Apr 02 14:55:59 2009 -0400
@@ -1,3 +1,26 @@ 2009-04-02 Lillian Angel <langel at redha
+2009-04-02 Deepak Bhole <dbhole at 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.
+ * rt/net/sourceforge/jnlp/NetxPanel.java: Add support for improved
+ initialization failure detection.
+
2009-04-02 Lillian Angel <langel at redhat.com>
* patches/icedtea-lcms.patch: Updated with most recent security fixes.
diff -r 5e6be75f137c -r 300bff72109a IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Thu Apr 02 11:19:02 2009 -0400
+++ b/IcedTeaPlugin.cc Thu Apr 02 14:55:59 2009 -0400
@@ -85,7 +85,7 @@ PRThread* current_thread ();
// #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641
// timeout (in seconds) for various calls to java side
-#define TIMEOUT 20
+#define TIMEOUT 180
#define NOT_IMPLEMENTED() \
PLUGIN_DEBUG_1ARG ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__)
@@ -1007,6 +1007,7 @@ private:
nsresult StartAppletviewer ();
void ProcessMessage();
void ConsumeMsgFromJVM();
+ nsresult GetProxyInfo(const char* siteAddr, char** proxyScheme, char** proxyHost, char** proxyPort);
nsCOMPtr<IcedTeaEventSink> sink;
nsCOMPtr<nsISocketTransport> transport;
nsCOMPtr<nsIProcess> applet_viewer_process;
@@ -1792,7 +1793,7 @@ NS_IMETHODIMP
NS_IMETHODIMP
IcedTeaPluginFactory::Show (void)
{
- nsCString msg("showconsole");
+ nsCString msg("plugin showconsole");
this->SendMessageToAppletViewer(msg);
return NS_OK;
}
@@ -1800,7 +1801,7 @@ NS_IMETHODIMP
NS_IMETHODIMP
IcedTeaPluginFactory::Hide (void)
{
- nsCString msg("hideconsole");
+ nsCString msg("plugin hideconsole");
this->SendMessageToAppletViewer(msg);
return NS_OK;
}
@@ -2658,6 +2659,96 @@ IcedTeaPluginInstance::GetJavaObject (jo
return factory->GetJavaObject (instance_identifier, object);
}
+#include <nsIDNSRecord.h>
+#include <nsIDNSService.h>
+#include <nsIHttpAuthManager.h>
+#include <nsIProxyInfo.h>
+#include <nsIProtocolProxyService.h>
+#include <nsILoginManager.h>
+#include <nsILoginInfo.h>
+
+/**
+ *
+ * Returns the proxy information for the given url
+ *
+ * The proxy query part of this function can be made much smaller by using
+ * nsIPluginManager2::FindProxyForURL() .. however, because we need to parse
+ * the return components in various ways, it is easier to query
+ * nsIProtocolProxyService directly
+ *
+ * @param siteAddr The URL to check
+ * @param proxyScheme Return parameter containing the proxy URI scheme (http/socks/etc.)
+ * @param proxyHost Return parameter containing the proxy host
+ * @param proxyPort Return parameter containing the proxy port
+ */
+
+NS_IMETHODIMP
+IcedTeaPluginFactory::GetProxyInfo(const char* siteAddr, char** proxyScheme, char** proxyHost, char** proxyPort)
+{
+ nsresult rv;
+
+ // Initialize service variables
+ nsCOMPtr<nsIProtocolProxyService> proxy_svc = do_GetService(NS_PROTOCOLPROXYSERVICE_CONTRACTID, &rv);
+
+ if (!proxy_svc) {
+ printf("Cannot initialize proxy service\n");
+ return rv;
+ }
+
+ nsCOMPtr<nsIIOService> io_svc = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+
+ if (NS_FAILED(rv) || !io_svc) {
+ printf("Cannot initialize io service\n");
+ return NS_ERROR_FAILURE;
+ }
+
+ // uri which needs to be accessed
+ nsCOMPtr<nsIURI> uri;
+ io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri));
+
+ // find the proxy address if any
+ nsCOMPtr<nsIProxyInfo> info;
+ proxy_svc->Resolve(uri, 0, getter_AddRefs(info));
+
+ // if there is no proxy found, return immediately
+ if (!info) {
+ PLUGIN_DEBUG_1ARG("%s does not need a proxy\n", siteAddr);
+ return NS_ERROR_FAILURE;
+ }
+
+ // if proxy info is available, extract it
+ nsCString phost;
+ PRInt32 pport;
+ nsCString ptype;
+
+ info->GetHost(phost);
+ info->GetPort(&pport);
+ info->GetType(ptype);
+
+ // resolve the proxy address to an IP
+ nsCOMPtr<nsIDNSService> dns_svc = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv);
+
+ if (!dns_svc) {
+ printf("Cannot initialize DNS service\n");
+ return rv;
+ }
+
+ nsCOMPtr<nsIDNSRecord> record;
+ dns_svc->Resolve(phost, 0U, getter_AddRefs(record));
+
+ // TODO: Add support for multiple ips
+ nsDependentCString ipAddr;
+ record->GetNextAddrAsString(ipAddr);
+
+ // pack information in return variables
+ snprintf(*proxyScheme, sizeof(char)*32, "%s", ptype.get());
+ snprintf(*proxyHost, sizeof(char)*64, "%s", ipAddr.get());
+ snprintf(*proxyPort, sizeof(char)*8, "%d", pport);
+
+ PLUGIN_DEBUG_4ARG("Proxy info for %s: %s %s %s\n", siteAddr, *proxyScheme, *proxyHost, *proxyPort);
+
+ return NS_OK;
+}
NS_IMETHODIMP
IcedTeaPluginInstance::GetCookie(const char* siteAddr, char** cookieString)
@@ -2677,8 +2768,8 @@ IcedTeaPluginInstance::GetCookie(const c
return NS_ERROR_FAILURE;
}
- nsIURI *uri;
- io_svc->NewURI(nsCString(siteAddr), NULL, NULL, &uri);
+ nsCOMPtr<nsIURI> uri;
+ io_svc->NewURI(nsCString(siteAddr), NULL, NULL, getter_AddRefs(uri));
nsCOMPtr<nsICookieService> cookie_svc = do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv);
@@ -2902,6 +2993,13 @@ IcedTeaPluginFactory::HandleMessage (nsC
nsDependentCSubstring prefix(pch, strlen(pch));
pch = strtok (NULL, " ");
PRUint32 identifier = nsDependentCSubstring(pch, strlen(pch)).ToInteger (&conversionResult);
+
+ /* Certain prefixes may not have an identifier. if they don't. we have a command here */
+ nsDependentCSubstring command;
+ if (NS_FAILED(conversionResult)) {
+ command.Rebind(pch, strlen(pch));
+ }
+
PRUint32 reference = -1;
if (strstr(message.get(), "reference") != NULL) {
@@ -2910,8 +3008,11 @@ IcedTeaPluginFactory::HandleMessage (nsC
reference = nsDependentCSubstring(pch, strlen(pch)).ToInteger (&conversionResult);
}
- pch = strtok (NULL, " ");
- nsDependentCSubstring command(pch, strlen(pch));
+ if (command.Length() == 0) {
+ pch = strtok (NULL, " ");
+ command.Rebind(pch, strlen(pch));
+ }
+
pch = strtok (NULL, " ");
nsDependentCSubstring rest("", 0);
@@ -3344,6 +3445,49 @@ IcedTeaPluginFactory::HandleMessage (nsC
// Do nothing for: SetStaticField, SetField, ExceptionClear,
// DeleteGlobalRef, DeleteLocalRef
}
+ else if (prefix == "plugin")
+ {
+
+ if (command == "PluginProxyInfo") {
+
+ nsresult rv;
+ nsCOMPtr<nsINetUtil> net_util = do_GetService(NS_NETUTIL_CONTRACTID, &rv);
+
+ if (!net_util)
+ printf("Error instantiating NetUtil service.\n");
+
+ // decode the url
+ nsDependentCSubstring url;
+ net_util->UnescapeString(rest, 0, url);
+
+ char* proxyScheme = (char*) malloc(sizeof(char)*32);
+ char* proxyHost = (char*) malloc(sizeof(char)*64);
+ char* proxyPort = (char*) malloc(sizeof(char)*8);
+
+ nsCString proxyInfo("plugin PluginProxyInfo ");
+
+ // get proxy info
+ if (GetProxyInfo(((nsCString) url).get(), &proxyScheme, &proxyHost, &proxyPort) == NS_OK)
+ {
+ proxyInfo += proxyScheme;
+ proxyInfo += " ";
+ proxyInfo += proxyHost;
+ proxyInfo += " ";
+ proxyInfo += proxyPort;
+
+ PLUGIN_DEBUG_4ARG("Proxy for %s is %s %s %s\n", ((nsCString) url).get(), proxyScheme, proxyHost, proxyPort);
+ } else {
+ PLUGIN_DEBUG_1ARG("No suitable proxy found for %s\n", ((nsCString) url).get());
+ }
+
+ // send back what we found
+ SendMessageToAppletViewer (proxyInfo);
+
+ // free allocated memory
+ delete proxyScheme, proxyHost, proxyPort;
+
+ }
+ }
}
void IcedTeaPluginFactory::ProcessMessage ()
diff -r 5e6be75f137c -r 300bff72109a plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java Thu Apr 02 14:55:59 2009 -0400
@@ -0,0 +1,241 @@
+/* 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);
+ }
+}
diff -r 5e6be75f137c -r 300bff72109a plugin/icedtea/sun/applet/PluginAppletViewer.java
More information about the distro-pkg-dev
mailing list