[prev in list] [next in list] [prev in thread] [next in thread]
List: openjdk-distro-pkg-dev
Subject: /hg/icedtea-web: Use Firefox's preferences to determine proxy se...
From: omajid () icedtea ! classpath ! org (omajid at icedtea ! classpath ! org)
Date: 2011-01-27 17:58:06
Message-ID: hg.712dd97dc800.1296151086.8643924302249223276 () icedtea ! classpath ! org
[Download RAW message or body]
changeset 712dd97dc800 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=712dd97dc800
author: Omair Majid <omajid at redhat.com>
date: Thu Jan 27 12:56:40 2011 -0500
Use Firefox's preferences to determine proxy settings for javaws
This patch adds support for finding, parsing and using basic
information from Firefox's preferences to determine the correct
proxy to use for javaws. Only the preferences from Firefox's default
profile are used.
Support for PAC, System or Automatic settings is not yet
implemented.
2011-01-27 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
RPRoxyPacNotImplemented, RProxyFirefoxNotFound, and
RProxyFirefoxOptionNotImplemented.
* netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java: Make
abstract. (getFromBrowser): Remove implementation; make
abstract.
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
Set BrowserAwareProxySelector as the proxy selector.
* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java:
New file. This class extends JNLPProxySelector and searches the
browser's configuration to load additional proxy settings from.
* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java: New
file. This class looks into the browser configration to find the
preferences file for the default firefox profile.
* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesParser.java: New
file. Parses the browser's preferences and makes it available
through a simpler interface.
diffstat:
8 files changed, 579 insertions(+), 12 deletions(-)
ChangeLog | 19
NEWS | 4
netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java | 255 ++++++++++
netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java | 137 +++++
netx/net/sourceforge/jnlp/browser/FirefoxPreferencesParser.java | 155 ++++++
netx/net/sourceforge/jnlp/resources/Messages.properties | 3
netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java | 15
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 3
diffs (truncated from 678 to 500 lines):
diff -r ffb35fab7eff -r 712dd97dc800 ChangeLog
--- a/ChangeLog Thu Jan 27 10:02:05 2011 -0500
+++ b/ChangeLog Thu Jan 27 12:56:40 2011 -0500
@@ -1,3 +1,22 @@ 2011-01-27 Omair Majid <omajid at redhat.
+2011-01-27 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+ RPRoxyPacNotImplemented, RProxyFirefoxNotFound, and
+ RProxyFirefoxOptionNotImplemented.
+ * netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java: Make abstract.
+ (getFromBrowser): Remove implementation; make abstract.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+ (initialize): Set BrowserAwareProxySelector as the proxy selector.
+ * netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java: New
+ file. This class extends JNLPProxySelector and searches the browser's
+ configuration to load additional proxy settings from.
+ * netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java: New
+ file. This class looks into the browser configration to find the
+ preferences file for the default firefox profile.
+ * netx/net/sourceforge/jnlp/browser/FirefoxPreferencesParser.java: New
+ file. Parses the browser's preferences and makes it available through a
+ simpler interface.
+
2011-01-27 Omair Majid <omajid at redhat.com>
* AUTHORS: Update to include Jon A Maxwell.
diff -r ffb35fab7eff -r 712dd97dc800 NEWS
--- a/NEWS Thu Jan 27 10:02:05 2011 -0500
+++ b/NEWS Thu Jan 27 12:56:40 2011 -0500
@@ -7,6 +7,10 @@ GX - http://bugs.gentoo.org/show_bug.cg
GX - http://bugs.gentoo.org/show_bug.cgi?id=X
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+
+New in release 1.1 (2011-XX-XX):
+* NetX
+ - Use Firefox's proxy settings if possible
New in release 1.0 (2010-XX-XX):
diff -r ffb35fab7eff -r 712dd97dc800 \
netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java Thu Jan 27 \
12:56:40 2011 -0500 @@ -0,0 +1,255 @@
+/* BrowserAwareProxySelector.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+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, version 2.
+
+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 net.sourceforge.jnlp.browser;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.net.Proxy.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.jnlp.runtime.JNLPProxySelector;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+/**
+ * A ProxySelector which can read proxy settings from a browser's
+ * configuration and use that.
+ *
+ * @see JNLPProxySelector
+ */
+public class BrowserAwareProxySelector extends JNLPProxySelector {
+
+ /* firefox's constants */
+ public static final int BROWSER_PROXY_TYPE_NONE = 0;
+ public static final int BROWSER_PROXY_TYPE_MANUAL = 1;
+ public static final int BROWSER_PROXY_TYPE_PAC = 2;
+ public static final int BROWSER_PROXY_TYPE_NONE2 = 3;
+ /** use gconf, WPAD and then env (and possibly others)*/
+ public static final int BROWSER_PROXY_TYPE_AUTO = 4;
+ /** use env variables */
+ public static final int BROWSER_PROXY_TYPE_SYSTEM = 5;
+
+ private int browserProxyType = BROWSER_PROXY_TYPE_NONE;
+ private URL browserAutoConfigUrl;
+ private Boolean browserUseSameProxy;
+ private String browserHttpProxyHost;
+ private int browserHttpProxyPort;
+ private String browserHttpsProxyHost;
+ private int browserHttpsProxyPort;
+ private String browserFtpProxyHost;
+ private int browserFtpProxyPort;
+ private String browserSocks4ProxyHost;
+ private int browserSocks4ProxyPort;
+
+ /**
+ * Create a new instance of this class, reading configuration fropm the browser
+ */
+ public BrowserAwareProxySelector() {
+ super();
+ try {
+ initFromBrowserConfig();
+ } catch (IOException e) {
+ if (JNLPRuntime.isDebug()) {
+ e.printStackTrace();
+ }
+ System.err.println(R("RProxyFirefoxNotFound"));
+ browserProxyType = PROXY_TYPE_NONE;
+ }
+ }
+
+ /**
+ * Initialize configuration by reading preferences from the browser (firefox)
+ */
+ private void initFromBrowserConfig() throws IOException {
+
+ File preferencesFile = FirefoxPreferencesFinder.find();
+
+ FirefoxPreferencesParser parser = new \
FirefoxPreferencesParser(preferencesFile); + parser.parse();
+ Map<String, String> prefs = parser.getPreferences();
+
+ String type = prefs.get("network.proxy.type");
+ if (type != null) {
+ browserProxyType = Integer.valueOf(type);
+ } else {
+ browserProxyType = BROWSER_PROXY_TYPE_AUTO;
+ }
+
+ try {
+ browserAutoConfigUrl = new \
URL(prefs.get("network.proxy.autoconfig_url")); + } catch \
(MalformedURLException e) { + e.printStackTrace();
+ }
+
+ browserUseSameProxy = \
Boolean.valueOf(prefs.get("network.proxy.share_proxy_settings")); +
+ browserHttpProxyHost = prefs.get("network.proxy.http");
+ browserHttpProxyPort = stringToPort(prefs.get("network.proxy.http_port"));
+ browserHttpsProxyHost = prefs.get("network.proxy.ssl");
+ browserHttpsProxyPort = stringToPort(prefs.get("network.proxy.ssl_port"));
+ browserFtpProxyHost = prefs.get("network.proxy.ftp");
+ browserFtpProxyPort = stringToPort(prefs.get("network.proxy.ftp_port"));
+ browserSocks4ProxyHost = prefs.get("networking.proxy.socks");
+ browserSocks4ProxyPort = \
stringToPort(prefs.get("network.proxy.socks_port")); + }
+
+ /**
+ * Returns port inside a string. Unlike {@link Integer#valueOf(String)},
+ * it will not throw exceptions.
+ *
+ * @param string the string containing the integer to parse
+ * @return the port inside the string, or Integer.MIN_VALUE
+ */
+ private int stringToPort(String string) {
+ try {
+ return Integer.valueOf(string);
+ } catch (NumberFormatException nfe) {
+ return Integer.MIN_VALUE;
+ }
+ }
+
+ /**
+ * The main entry point for {@link BrowserAwareProxySelector}. Based on
+ * the browser settings, determines proxy information for a given URI.
+ * <p>
+ * The appropriate proxy may be determined by reading static information
+ * from the browser's preferences file, or it may be computed dynamically,
+ * by, for example, running javascript code.
+ */
+ @Override
+ protected List<Proxy> getFromBrowser(URI uri) {
+ List<Proxy> proxies = new ArrayList<Proxy>();
+
+ String optionDescription = null;
+
+ switch (browserProxyType) {
+ case BROWSER_PROXY_TYPE_PAC:
+ proxies.addAll(getFromBrowserPAC(uri));
+ break;
+ case BROWSER_PROXY_TYPE_MANUAL:
+ proxies.addAll(getFromBrowserConfiguration(uri));
+ break;
+ case BROWSER_PROXY_TYPE_NONE:
+ proxies.add(Proxy.NO_PROXY);
+ break;
+ case BROWSER_PROXY_TYPE_AUTO:
+ // firefox will do a whole lot of stuff to automagically
+ // figure out the right settings. gconf, WPAD, and ENV are used.
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=66057#c32
+ // TODO this is probably not easy/quick to do. using libproxy might \
be + // the simpler workaround
+ if (optionDescription == null) {
+ optionDescription = "Automatic";
+ }
+ case BROWSER_PROXY_TYPE_SYSTEM:
+ // means use $http_proxy, $ftp_proxy etc.
+ // TODO implement env vars if possible
+ if (optionDescription == null) {
+ optionDescription = "System";
+ }
+ default:
+ if (optionDescription == null) {
+ optionDescription = "Unknown";
+ }
+ System.err.println(R("RProxyFirefoxOptionNotImplemented", \
browserProxyType, optionDescription)); + proxies.add(Proxy.NO_PROXY);
+ }
+
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Browser selected proxies: " + proxies.toString());
+ }
+
+ return proxies;
+ }
+
+ /**
+ * Get an appropriate proxy for a given URI using a PAC specified in the
+ * browser.
+ */
+ private List<Proxy> getFromBrowserPAC(URI uri) {
+ System.err.println(R("RPRoxyPacNotImplemented"));
+ return Arrays.asList(new Proxy[] { Proxy.NO_PROXY });
+ }
+
+ /**
+ * Get an appropriate proxy for the given URI using static information from
+ * the browser's preferences file.
+ */
+ private List<Proxy> getFromBrowserConfiguration(URI uri) {
+ List<Proxy> proxies = new ArrayList<Proxy>();
+
+ String scheme = uri.getScheme();
+
+ if (browserUseSameProxy) {
+ SocketAddress sa = new InetSocketAddress(browserHttpProxyHost, \
browserHttpProxyPort); + Proxy proxy;
+ if (scheme.equals("socket")) {
+ proxy = new Proxy(Type.SOCKS, sa);
+ } else {
+ proxy = new Proxy(Type.HTTP, sa);
+ }
+ proxies.add(proxy);
+ } else if (scheme.equals("http")) {
+ SocketAddress sa = new InetSocketAddress(browserHttpProxyHost, \
browserHttpProxyPort); + proxies.add(new Proxy(Type.HTTP, sa));
+ } else if (scheme.equals("https")) {
+ SocketAddress sa = new InetSocketAddress(browserHttpsProxyHost, \
browserHttpsProxyPort); + proxies.add(new Proxy(Type.HTTP, sa));
+ } else if (scheme.equals("ftp")) {
+ SocketAddress sa = new InetSocketAddress(browserFtpProxyHost, \
browserFtpProxyPort); + proxies.add(new Proxy(Type.HTTP, sa));
+ } else if (scheme.equals("socket")) {
+ SocketAddress sa = new InetSocketAddress(browserSocks4ProxyHost, \
browserSocks4ProxyPort); + proxies.add(new Proxy(Type.SOCKS, sa));
+ } else {
+ proxies.add(Proxy.NO_PROXY);
+ }
+
+ return proxies;
+ }
+
+}
diff -r ffb35fab7eff -r 712dd97dc800 \
netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java Thu Jan 27 \
12:56:40 2011 -0500 @@ -0,0 +1,137 @@
+/* FirefoxPreferencesFinder.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+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, version 2.
+
+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 net.sourceforge.jnlp.browser;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+/**
+ * Finds the file corresponding to firefox's (default) preferences file
+ */
+public class FirefoxPreferencesFinder {
+
+ /**
+ * Returns a file object representing firefox's preferences file
+ *
+ * @return a File object representing the preferences file.
+ * @throws FileNotFoundException if the preferences file could not be found
+ * @throws IOException if an exception occurs while trying to identify the
+ * location of the preferences file.
+ */
+ public static File find() throws IOException {
+
+ String configPath = System.getProperty("user.home") + File.separator + \
".mozilla" + + File.separator + "firefox" + File.separator;
+
+ String profilesPath = configPath + "profiles.ini";
+
+ if (!(new File(profilesPath).isFile())) {
+ throw new FileNotFoundException(profilesPath);
+ }
+
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Using firefox's profiles file: " + profilesPath);
+ }
+ BufferedReader reader = new BufferedReader(new FileReader(profilesPath));
+
+ List<String> linesInSection = new ArrayList<String>();
+ boolean foundDefaultSection = false;
+
+ /*
+ * The profiles.ini file is an ini file. This is a quick hack to read
+ * it. It is very likely to break given anything strange.
+ */
+
+ // find the section with an entry Default=1
+ while (true) {
+ String line = reader.readLine();
+ if (line == null) {
+ break;
+ }
+
+ line = line.trim();
+ if (line.startsWith("[") && line.endsWith("]")) {
+ if (foundDefaultSection) {
+ break;
+ }
+ // new section
+ linesInSection = new ArrayList<String>();
+ } else {
+ linesInSection.add(line);
+ int equalSignPos = line.indexOf('=');
+ if (equalSignPos > 0) {
+ String key = line.substring(0, equalSignPos).trim();
+ String value = line.substring(equalSignPos+1).trim();
+ if (key.toLowerCase().equals("default") && value.equals("1")) {
+ foundDefaultSection = true;
+ }
+ }
+ }
+
+ }
+
+ if (!foundDefaultSection) {
+ throw new FileNotFoundException("preferences file");
+ }
+
+ String path = null;
+ for (String line : linesInSection) {
+ if (line.startsWith("Path=")) {
+ path = line.substring("Path=".length());
+ }
+ }
+
+ if (path == null) {
+ throw new FileNotFoundException("preferences file");
+ } else {
+ String fullPath = configPath + path + File.separator + "prefs.js";
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Found preferences file: " + fullPath);
+ }
+ return new File(fullPath);
+ }
+ }
+
+}
diff -r ffb35fab7eff -r 712dd97dc800 \
netx/net/sourceforge/jnlp/browser/FirefoxPreferencesParser.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesParser.java Thu Jan 27 \
12:56:40 2011 -0500 @@ -0,0 +1,155 @@
+/* FirefoxPreferencesParser.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+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, version 2.
+
+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 net.sourceforge.jnlp.browser;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+/**
+ * A parser for Firefox's preferences file. It can 'parse' Firefox's
+ * preferences file and expose the prefrences in a simple to use format.
+ * <p>
+ * Sample usage:
+ * <pre>
+ * FirefoxPreferencesParser p = new FirefoxPreferencesParser(prefsFile);
+ * p.parse();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic