/hg/icedtea-web: Add Proxy Auto Config (PAC) support
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Mar 7 08:10:59 PST 2011
changeset 8e0b13ec3309 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8e0b13ec3309
author: Omair Majid <omajid at redhat.com>
date: Mon Mar 07 11:10:42 2011 -0500
Add Proxy Auto Config (PAC) support
This patch adds support for reading, parsing and evaluating PAC
files using rhino.
2011-03-07 Omair Majid <omajid at redhat.com>
* NEWS: Update.
* Makefile.am (RHINO_RUNTIME): Define to point to rhino jars, or
empty. (RUNTIME, LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH):
Include RHINO_RUNTIME. (PHONY): Add check-pac-functions,
clean-jrunscript and clean-tests. (check-local): New target.
Depends on check-pac-functions. (check-pac-functions): New
target. (jrunscript): New target. (clean-tests): New target.
(clean-jrunscript): New target. (netx-source-files.txt): Remove
rhino related files if not building with rhino.
(build.properties): New target. (stamps/netx.stamp): Depend on
build.properties and copy new files to build location.
(clean-netx): Remove build.properties. (stamps/bootstrap-
directory.stamp): Add java to bootstrap programs.
* acinclude.m4 (IT_FIND_RHINO_JAR): New macro.
* configure.ac: Invoke IT_FIND_RHINO_JAR.
* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java:
Add browserProxyAutoConfig. (initFromBrowserConfig):
Initialize browserProxyAutoConfig if needed.
(getFromBrowserPAC): Use browserProxyAutoConfig to find proxies.
* netx/net/sourceforge/jnlp/resources/Messages.properties: Replace
RPRoxyPacNotImplemented with RPRoxyPacNotSupported.
* netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java: Add
pacEvaluator. (parseConfiguration): Initialize pacEvaluator if
needed. (getFromPAC): Use pacEvaulator to find proxies.
(getProxiesFromPacResult): New method. Converts a proxy string to a
list or proxies.
* netx/net/sourceforge/jnlp/runtime/PacEvaluator.java: New file.
Defines a Java interface for a PAC evaluator.
* netx/net/sourceforge/jnlp/runtime/FakePacEvaluator.java: New file.
Dummy implementation of a PAC evaluator.
* netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: New
file. A rhino-based PAC evaluator.
* netx/net/sourceforge/jnlp/runtime/PacEvaluatorFactory.java: New
file. A factory for creating the right PAC evaulator.
* netx/net/sourceforge/jnlp/runtime/pac-funcs.js: New file. Defines
helper functions needed while evaluating PAC files.
* tests/netx/pac/pac-funcs-test.js: New file. Tests the PAC helper
functions.
diffstat:
ChangeLog | 47 +
Makefile.am | 61 +-
NEWS | 1 +
acinclude.m4 | 50 +
configure.ac | 1 +
netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java | 27 +-
netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +-
netx/net/sourceforge/jnlp/runtime/FakePacEvaluator.java | 54 +
netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java | 79 +-
netx/net/sourceforge/jnlp/runtime/PacEvaluator.java | 56 +
netx/net/sourceforge/jnlp/runtime/PacEvaluatorFactory.java | 107 +
netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java | 255 +++
netx/net/sourceforge/jnlp/runtime/pac-funcs.js | 830 ++++++++++
tests/netx/pac/pac-funcs-test.js | 446 +++++
14 files changed, 1999 insertions(+), 17 deletions(-)
diffs (truncated from 2231 to 500 lines):
diff -r ff839fa28451 -r 8e0b13ec3309 ChangeLog
--- a/ChangeLog Mon Mar 07 10:45:38 2011 -0500
+++ b/ChangeLog Mon Mar 07 11:10:42 2011 -0500
@@ -1,3 +1,50 @@
+2011-03-07 Omair Majid <omajid at redhat.com>
+
+ * NEWS: Update.
+ * Makefile.am
+ (RHINO_RUNTIME): Define to point to rhino jars, or empty.
+ (RUNTIME, LAUNCHER_BOOTCLASSPATH, PLUGIN_BOOTCLASSPATH): Include
+ RHINO_RUNTIME.
+ (PHONY): Add check-pac-functions, clean-jrunscript and clean-tests.
+ (check-local): New target. Depends on check-pac-functions.
+ (check-pac-functions): New target.
+ (jrunscript): New target.
+ (clean-tests): New target.
+ (clean-jrunscript): New target.
+ (netx-source-files.txt): Remove rhino related files if not building with
+ rhino.
+ (build.properties): New target.
+ (stamps/netx.stamp): Depend on build.properties and copy new files to
+ build location.
+ (clean-netx): Remove build.properties.
+ (stamps/bootstrap-directory.stamp): Add java to bootstrap programs.
+ * acinclude.m4 (IT_FIND_RHINO_JAR): New macro.
+ * configure.ac: Invoke IT_FIND_RHINO_JAR.
+ * netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java: Add
+ browserProxyAutoConfig.
+ (initFromBrowserConfig): Initialize browserProxyAutoConfig if needed.
+ (getFromBrowserPAC): Use browserProxyAutoConfig to find proxies.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Replace
+ RPRoxyPacNotImplemented with RPRoxyPacNotSupported.
+ * netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java: Add
+ pacEvaluator.
+ (parseConfiguration): Initialize pacEvaluator if needed.
+ (getFromPAC): Use pacEvaulator to find proxies.
+ (getProxiesFromPacResult): New method. Converts a proxy string to a list
+ or proxies.
+ * netx/net/sourceforge/jnlp/runtime/PacEvaluator.java: New file. Defines a
+ Java interface for a PAC evaluator.
+ * netx/net/sourceforge/jnlp/runtime/FakePacEvaluator.java: New file. Dummy
+ implementation of a PAC evaluator.
+ * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java: New file.
+ A rhino-based PAC evaluator.
+ * netx/net/sourceforge/jnlp/runtime/PacEvaluatorFactory.java: New file. A
+ factory for creating the right PAC evaulator.
+ * netx/net/sourceforge/jnlp/runtime/pac-funcs.js: New file. Defines helper
+ functions needed while evaluating PAC files.
+ * tests/netx/pac/pac-funcs-test.js: New file. Tests the PAC helper
+ functions.
+
2011-03-07 Denis Lila <dlila at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java:
diff -r ff839fa28451 -r 8e0b13ec3309 Makefile.am
--- a/Makefile.am Mon Mar 07 10:45:38 2011 -0500
+++ b/Makefile.am Mon Mar 07 11:10:42 2011 -0500
@@ -8,7 +8,14 @@
# Build directories
BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
-RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar
+
+if WITH_RHINO
+ RHINO_RUNTIME=:$(RHINO_JAR)
+else
+ RHINO_RUNTIME=
+endif
+
+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME)
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -18,8 +25,8 @@
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
JRE='"$(SYSTEM_JDK_DIR)/jre"'
-LAUNCHER_BOOTCLASSPATH="-J-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar"
-PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar"'
+LAUNCHER_BOOTCLASSPATH="-J-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
+PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar:$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
# Fake update version to shut up the plugin detector hosted by Oracle.
# If Oracle ever release a JDK update greater than 50, this needs to be increased.
@@ -88,14 +95,17 @@
all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \
javaws.desktop stamps/docs.stamp $(NETX_DIR)/launcher/controlpanel/itweb-settings itweb-settings.desktop
+check-local: check-pac-functions
+
clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
- clean-native-ecj clean-desktop-files clean-docs
+ clean-native-ecj clean-desktop-files clean-docs clean-tests
if [ -e stamps ] ; then \
rmdir stamps ; \
fi
.PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
- clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs
+ clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
+ clean-tests clean-jrunscript check-local
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
@@ -241,8 +251,20 @@
netx-source-files.txt:
find $(NETX_SRCDIR) -name '*.java' | sort > $@
+if !WITH_RHINO
+ sed -i '/RhinoBasedPacEvaluator/ d' $@
+endif
-stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
+build.properties:
+ echo "# This contains build-time settings " > $@
+if WITH_RHINO
+ echo "rhino.available=true" >> $@
+else
+ echo "rhino.available=false" >> $@
+endif
+
+stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp \
+ build.properties
mkdir -p $(NETX_DIR)
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_DIR) \
@@ -255,6 +277,9 @@
${INSTALL_DATA} -D $${files} \
$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
done)
+ cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
+ $(NETX_DIR)/net/sourceforge/jnlp/runtime
+ cp -a build.properties $(NETX_DIR)/net/sourceforge/jnlp/
mkdir -p stamps
touch $@
@@ -272,6 +297,7 @@
clean-netx:
rm -rf $(NETX_DIR)
+ rm -f build.properties
rm -f stamps/netx-dist.stamp
rm -f netx-source-files.txt
rm -f stamps/netx.stamp
@@ -376,6 +402,28 @@
rm -rf ${abs_top_builddir}/docs/plugin
rm -f stamps/plugin-docs.stamp
+
+# check
+# ==========================
+
+jrunscript:
+if WITH_RHINO
+ echo '$(BOOT_DIR)/bin/java -cp $(RHINO_JAR) org.mozilla.javascript.tools.shell.Main $$@' > jrunscript
+ chmod u+x jrunscript
+else
+ echo "jrunscript requires rhino support"
+ exit 1
+endif
+
+check-pac-functions: stamps/bootstrap-directory.stamp jrunscript
+ ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
+ $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
+
+clean-tests: clean-jrunscript
+
+clean-jrunscript:
+ rm -f jrunscript
+
# plugin tests
if ENABLE_PLUGIN
@@ -412,6 +460,7 @@
# bootstrap
stamps/bootstrap-directory.stamp: stamps/native-ecj.stamp
mkdir -p $(BOOT_DIR)/bin stamps/
+ ln -sf $(JAVA) $(BOOT_DIR)/bin/java
ln -sf $(JAR) $(BOOT_DIR)/bin/jar
ln -sf $(abs_top_builddir)/javac $(BOOT_DIR)/bin/javac
ln -sf $(JAVADOC) $(BOOT_DIR)/bin/javadoc
diff -r ff839fa28451 -r 8e0b13ec3309 NEWS
--- a/NEWS Mon Mar 07 10:45:38 2011 -0500
+++ b/NEWS Mon Mar 07 11:10:42 2011 -0500
@@ -14,6 +14,7 @@
- RH677332, CVE-2011-0706: IcedTea multiple signers privilege escalation
* New Features
- IcedTea-Web now installs to a FHS-compliant location
+ - IcedTea-Web can now handle Proxy Auto Config files
* Common Fixes and Improvements
- PR638: JNLPClassLoader.loadClass(String name) can return null
- RH677772: NoSuchAlgorithmException using SSL/TLS in javaws
diff -r ff839fa28451 -r 8e0b13ec3309 acinclude.m4
--- a/acinclude.m4 Mon Mar 07 10:45:38 2011 -0500
+++ b/acinclude.m4 Mon Mar 07 11:10:42 2011 -0500
@@ -250,6 +250,56 @@
AC_SUBST(ECJ_JAR)
])
+AC_DEFUN([IT_FIND_RHINO_JAR],
+[
+ AC_MSG_CHECKING([whether to include Javascript support via Rhino])
+ AC_ARG_WITH([rhino],
+ [AS_HELP_STRING(--with-rhino,specify location of the rhino jar)],
+ [
+ case "${withval}" in
+ yes)
+ RHINO_JAR=yes
+ ;;
+ no)
+ RHINO_JAR=no
+ ;;
+ *)
+ if test -f "${withval}"; then
+ RHINO_JAR="${withval}"
+ elif test -z "${withval}"; then
+ RHINO_JAR=yes
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR("The rhino jar ${withval} was not found.")
+ fi
+ ;;
+ esac
+ ],
+ [
+ RHINO_JAR=yes
+ ])
+ if test x"${RHINO_JAR}" = "xyes"; then
+ if test -e "/usr/share/java/rhino.jar"; then
+ RHINO_JAR=/usr/share/java/rhino.jar
+ elif test -e "/usr/share/java/js.jar"; then
+ RHINO_JAR=/usr/share/java/js.jar
+ elif test -e "/usr/share/rhino-1.6/lib/js.jar"; then
+ RHINO_JAR=/usr/share/rhino-1.6/lib/js.jar
+ fi
+ if test x"${RHINO_JAR}" = "xyes"; then
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR("A rhino jar was not found in /usr/share/java as either rhino.jar or js.jar.")
+ fi
+ fi
+ AC_MSG_RESULT(${RHINO_JAR})
+ AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
+dnl Clear RHINO_JAR if it doesn't contain a valid filename
+ if test x"${RHINO_JAR}" = "xno"; then
+ RHINO_JAR=
+ fi
+ AC_SUBST(RHINO_JAR)
+])
+
AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
[
AC_MSG_CHECKING([whether to build the browser plugin])
diff -r ff839fa28451 -r 8e0b13ec3309 configure.ac
--- a/configure.ac Mon Mar 07 10:45:38 2011 -0500
+++ b/configure.ac Mon Mar 07 11:10:42 2011 -0500
@@ -33,6 +33,7 @@
FIND_JAR
FIND_ECJ_JAR
IT_FIND_JAVADOC
+IT_FIND_RHINO_JAR
AC_CONFIG_FILES([javac], [chmod +x javac])
IT_SET_VERSION
diff -r ff839fa28451 -r 8e0b13ec3309 netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
--- a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java Mon Mar 07 10:45:38 2011 -0500
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java Mon Mar 07 11:10:42 2011 -0500
@@ -54,6 +54,8 @@
import net.sourceforge.jnlp.runtime.JNLPProxySelector;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.runtime.PacEvaluator;
+import net.sourceforge.jnlp.runtime.PacEvaluatorFactory;
/**
* A ProxySelector which can read proxy settings from a browser's
@@ -85,6 +87,8 @@
private String browserSocks4ProxyHost;
private int browserSocks4ProxyPort;
+ private PacEvaluator browserProxyAutoConfig = null;
+
/**
* Create a new instance of this class, reading configuration fropm the browser
*/
@@ -128,6 +132,12 @@
e.printStackTrace();
}
+ if (browserProxyType == BROWSER_PROXY_TYPE_PAC) {
+ if (browserAutoConfigUrl != null) {
+ browserProxyAutoConfig = PacEvaluatorFactory.getPacEvaluator(browserAutoConfigUrl);
+ }
+ }
+
browserUseSameProxy = Boolean.valueOf(prefs.get("network.proxy.share_proxy_settings"));
browserHttpProxyHost = prefs.get("network.proxy.http");
@@ -216,8 +226,21 @@
* browser.
*/
private List<Proxy> getFromBrowserPAC(URI uri) {
- System.err.println(R("RPRoxyPacNotImplemented"));
- return Arrays.asList(new Proxy[] { Proxy.NO_PROXY });
+ if (browserAutoConfigUrl == null || uri.getScheme().equals("socket")) {
+ return Arrays.asList(new Proxy[] { Proxy.NO_PROXY });
+ }
+
+ List<Proxy> proxies = new ArrayList<Proxy>();
+
+ try {
+ String proxiesString = browserProxyAutoConfig.getProxies(uri.toURL());
+ proxies.addAll(getProxiesFromPacResult(proxiesString));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ proxies.add(Proxy.NO_PROXY);
+ }
+
+ return proxies;
}
/**
diff -r ff839fa28451 -r 8e0b13ec3309 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Mar 07 10:45:38 2011 -0500
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Mar 07 11:10:42 2011 -0500
@@ -144,7 +144,7 @@
RUnexpected=Unexpected {0} at {1}
RConfigurationError=Fatal error while reading the configuration
RConfigurationFatal=ERROR: a fatal error has occurred while loading configuration. Perhaps a global configuration was required but could not be found
-RPRoxyPacNotImplemented=Using Proxy Auto Config (PAC) files is not supported yet.
+RPRoxyPacNotSupported=Using Proxy Auto Config (PAC) files is not supported.
RProxyFirefoxNotFound=Unable to use Firefox's proxy settings. Using "DIRECT" as proxy type.
RProxyFirefoxOptionNotImplemented=Browser proxy option "{0}" ({1}) not supported yet.
diff -r ff839fa28451 -r 8e0b13ec3309 netx/net/sourceforge/jnlp/runtime/FakePacEvaluator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/FakePacEvaluator.java Mon Mar 07 11:10:42 2011 -0500
@@ -0,0 +1,54 @@
+/* FakePacEvaluator.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.runtime;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+import java.net.URL;
+
+/**
+ * A dummy PacEvaluator that always returns "DIRECT"
+ */
+public class FakePacEvaluator implements PacEvaluator {
+ @Override
+ public String getProxies(URL url) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println(R("RPRoxyPacNotSupported"));
+ }
+ return "DIRECT";
+ }
+}
diff -r ff839fa28451 -r 8e0b13ec3309 netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java Mon Mar 07 10:45:38 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java Mon Mar 07 11:10:42 2011 -0500
@@ -16,7 +16,6 @@
package net.sourceforge.jnlp.runtime;
-import static net.sourceforge.jnlp.runtime.Translator.R;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -52,6 +51,8 @@
/** The default port to use as a fallback. Currently squid's default port */
public static final int FALLBACK_PROXY_PORT = 3128;
+ private PacEvaluator pacEvaluator = null;
+
/** The proxy type. See PROXY_TYPE_* constants */
private int proxyType = PROXY_TYPE_UNKNOWN;
@@ -96,8 +97,7 @@
proxyType = Integer.valueOf(config.getProperty(DeploymentConfiguration.KEY_PROXY_TYPE));
- String autoConfigString = config
- .getProperty(DeploymentConfiguration.KEY_PROXY_AUTO_CONFIG_URL);
+ String autoConfigString = config.getProperty(DeploymentConfiguration.KEY_PROXY_AUTO_CONFIG_URL);
if (autoConfigString != null) {
try {
autoConfigUrl = new URL(autoConfigString);
@@ -106,6 +106,10 @@
}
}
+ if (autoConfigUrl != null) {
+ pacEvaluator = PacEvaluatorFactory.getPacEvaluator(autoConfigUrl);
+ }
+
bypassList = new ArrayList<String>();
String proxyBypass = config.getProperty(DeploymentConfiguration.KEY_PROXY_BYPASS_LIST);
if (proxyBypass != null) {
@@ -333,14 +337,22 @@
*
* @return a List of valid Proxy objects
*/
- private List<Proxy> getFromPAC(URI uri) {
- if (autoConfigUrl == null) {
+ protected List<Proxy> getFromPAC(URI uri) {
+ if (autoConfigUrl == null || uri.getScheme().equals("socket")) {
return Arrays.asList(new Proxy[] { Proxy.NO_PROXY });
}
- // TODO implement this by reading and using the PAC file
- System.err.println(R("RPRoxyPacNotImplemented"));
- return Arrays.asList(new Proxy[] { Proxy.NO_PROXY });
+ List<Proxy> proxies = new ArrayList<Proxy>();
+
+ try {
+ String proxiesString = pacEvaluator.getProxies(uri.toURL());
+ proxies.addAll(getProxiesFromPacResult(proxiesString));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ proxies.add(Proxy.NO_PROXY);
+ }
+
+ return proxies;
}
/**
@@ -351,5 +363,56 @@
*/
protected abstract List<Proxy> getFromBrowser(URI uri);
+ /**
+ * Converts a proxy string from a browser into a List of Proxy objects
+ * suitable for java.
+ * @param pacString a string indicating proxies. For example
+ * "PROXY foo.bar:3128; DIRECT"
+ * @return a list of Proxy objects represeting the parsed string.
+ */
+ public static List<Proxy> getProxiesFromPacResult(String pacString) {
+ List<Proxy> proxies = new ArrayList<Proxy>();
+
+ String[] tokens = pacString.split(";");
+ for (String token: tokens) {
+ if (token.startsWith("PROXY")) {
+ String hostPortPair = token.substring("PROXY".length()).trim();
+ if (!hostPortPair.contains(":")) {
+ continue;
+ }
+ String host = hostPortPair.split(":")[0];
+ int port;
+ try {
+ port = Integer.valueOf(hostPortPair.split(":")[1]);
+ } catch (NumberFormatException nfe) {
+ continue;
+ }
+ SocketAddress sa = new InetSocketAddress(host, port);
+ proxies.add(new Proxy(Type.HTTP, sa));
+ } else if (token.startsWith("SOCKS")) {
+ String hostPortPair = token.substring("SOCKS".length()).trim();
+ if (!hostPortPair.contains(":")) {
+ continue;
+ }
+ String host = hostPortPair.split(":")[0];
+ int port;
+ try {
+ port = Integer.valueOf(hostPortPair.split(":")[1]);
+ } catch (NumberFormatException nfe) {
More information about the distro-pkg-dev
mailing list