/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 23 02:06:12 PDT 2010
changeset a69cd17ab8c8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a69cd17ab8c8
author: Omair Majid <omajid at redhat.com>
date: Tue Jul 20 13:30:49 2010 -0400
netx: error out when unsigned jnlp applications request permissions
2010-07-20 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/resources/Messages.properties:
Add LUnsignedJarWithSecurity LUnsignedJarWithSecurityInfo.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
(setSecurity): Can now throw a LaunchException if the JNLP file
requests permissions but the jars are unsigned.
changeset 5729e7fdd3f2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5729e7fdd3f2
author: Omair Majid <omajid at redhat.com>
date: Tue Jul 20 13:39:49 2010 -0400
PR icedtea/491 pass java_{code,codebase,archive} paramters to java
side
2010-07-20 Omair Majid <omajid at redhat.com>
PR icedtea/491
* plugin/icedteanp/IcedTeaNPPlugin.cc
(plugin_create_applet_tag): Accept and pass on
java_{code,codebase,archive} tags to the java side of the plugin.
changeset cff4f67eb5e2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cff4f67eb5e2
author: Mark Wielaard <mark at klomp.org>
date: Tue Jul 20 20:26:03 2010 +0200
Get configure and make BUILD_DIR in sync.
2010-07-20 Mark Wielaard <mjw at redhat.com>
* configure.ac (OPENJDK_BUILD_DIR): New AC_SUBST variable.
(with-abs-install-dir): Based on OPENJDK_BUILD_DIR when not given.
* Makefile.am (BUILD_DIR): Set to @OPENJDK_BUILD_DIR at .
changeset 3c4600357f38 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c4600357f38
author: Man Lung Wong <mwong at redhat.com>
date: Tue Jul 20 16:31:28 2010 -0400
Adds javawebstart.version property and give user permission to read
that proerty during sandbox permission.
changeset 9b832c4c78fd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9b832c4c78fd
author: Man Lung Wong <mwong at redhat.com>
date: Tue Jul 20 16:38:54 2010 -0400
Minor formatting error and forgot to mention related bug in
Changelog.
changeset 66cd8b27fe54 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=66cd8b27fe54
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Jul 21 16:29:05 2010 -0400
Undo changes from 98c88b32cdb4 to Parser.java, since they could
cause potential regressions.
diffstat:
9 files changed, 100 insertions(+), 23 deletions(-)
ChangeLog | 36 +++++++++++++++
Makefile.am | 2
configure.ac | 6 +-
netx/net/sourceforge/jnlp/Parser.java | 25 +++++-----
netx/net/sourceforge/jnlp/SecurityDesc.java | 1
netx/net/sourceforge/jnlp/resources/Messages.properties | 2
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 25 ++++++----
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 5 ++
plugin/icedteanp/IcedTeaNPPlugin.cc | 21 ++++++++
diffs (303 lines):
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 ChangeLog
--- a/ChangeLog Tue Jul 20 09:35:12 2010 -0400
+++ b/ChangeLog Wed Jul 21 16:29:05 2010 -0400
@@ -1,3 +1,39 @@ 2010-07-19 Omair Majid <omajid at redhat.
+2010-07-21 Deepak Bhole <dbhole at redhat.com>
+
+ * netx/net/sourceforge/jnlp/Parser.java: Undo changes from 98c88b32cdb4 to
+ Parser.java, since they could cause potential regressions.
+
+2010-07-20 Man Lung Wong <mwong at redhat.com>
+
+ * netx/net/sourceforge/jnlp/SecurityDesc.java:
+ Add permission to read javawebstart.version
+ property as part of sandbox permission.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
+ Set the javawebstart.version property as part of System property
+ whenever a jnlp file is being launched (note: this now allows
+ the jnlp file in bug 486 to launch).
+
+2010-07-20 Mark Wielaard <mjw at redhat.com>
+
+ * configure.ac (OPENJDK_BUILD_DIR): New AC_SUBST variable.
+ (with-abs-install-dir): Based on OPENJDK_BUILD_DIR when not given.
+ * Makefile.am (BUILD_DIR): Set to @OPENJDK_BUILD_DIR at .
+
+2010-07-20 Omair Majid <omajid at redhat.com>
+
+ PR icedtea/491
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (plugin_create_applet_tag): Accept and pass on
+ java_{code,codebase,archive} tags to the java side of the plugin.
+
+2010-07-20 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/resources/Messages.properties:
+ Add LUnsignedJarWithSecurity LUnsignedJarWithSecurityInfo.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (setSecurity): Can now throw a LaunchException if the JNLP file requests
+ permissions but the jars are unsigned.
+
2010-07-19 Omair Majid <omajid at redhat.com>
PR icedtea/372
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 Makefile.am
--- a/Makefile.am Tue Jul 20 09:35:12 2010 -0400
+++ b/Makefile.am Wed Jul 21 16:29:05 2010 -0400
@@ -51,7 +51,7 @@ HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
# Build directories
-BUILD_DIR = openjdk.build
+BUILD_DIR = @OPENJDK_BUILD_DIR@
BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 configure.ac
--- a/configure.ac Tue Jul 20 09:35:12 2010 -0400
+++ b/configure.ac Wed Jul 21 16:29:05 2010 -0400
@@ -115,6 +115,8 @@ IT_GET_LSB_DATA
IT_SET_ARCH_SETTINGS
SET_OS_DIRS
+OPENJDK_BUILD_DIR=openjdk.build
+AC_SUBST(OPENJDK_BUILD_DIR)
IT_CHECK_NUMBER_OF_PARALLEL_JOBS
IT_CHECK_IF_BOOTSTRAPPING
@@ -305,10 +307,10 @@ public:
[AS_HELP_STRING([--with-abs-install-dir],
[The absolute path where the j2sdk-image dir will be installed])],
[if test "x${withval}" = x; then
- ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"
+ ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
else
ABS_JAVA_HOME_DIR="${withval}"
- fi], [ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"])
+ fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Tue Jul 20 09:35:12 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java Wed Jul 21 16:29:05 2010 -0400
@@ -86,6 +86,9 @@ class Parser {
/** the specification version */
private Version spec;
+
+ /** the base URL that all hrefs are relative to */
+ private URL base;
/** the codebase URL */
private URL codebase;
@@ -129,8 +132,8 @@ class Parser {
// JNLP tag information
this.spec = getVersion(root, "spec", "1.0+");
this.codebase = addSlash(getURL(root, "codebase", base));
-
- fileLocation = getURL(root, "href", codebase);
+ this.base = (codebase!=null) ? codebase : base; // if codebase not specified use default codebase
+ fileLocation = getURL(root, "href", this.base);
// ensure version is supported
if (!supportedVersions.matchesAny(spec))
@@ -276,7 +279,7 @@ class Parser {
*/
public JREDesc getJRE(Node node) throws ParseException {
Version version = getVersion(node, "version", null);
- URL location = getURL(node, "href", codebase);
+ URL location = getURL(node, "href", base);
String vmArgs = getAttribute(node, "java-vm-args",null);
try {
checkVMArgs(vmArgs);
@@ -303,7 +306,7 @@ class Parser {
*/
public JARDesc getJAR(Node node) throws ParseException {
boolean nativeJar = "nativelib".equals(node.getNodeName());
- URL location = getRequiredURL(node, "href", codebase);
+ URL location = getRequiredURL(node, "href", base);
Version version = getVersion(node, "version", null);
String part = getAttribute(node, "part", null);
boolean main = "true".equals(getAttribute(node, "main", "false"));
@@ -327,7 +330,7 @@ class Parser {
public ExtensionDesc getExtension(Node node) throws ParseException {
String name = getAttribute(node, "name", null);
Version version = getVersion(node, "version", null);
- URL location = getRequiredURL(node, "href", codebase);
+ URL location = getRequiredURL(node, "href", base);
ExtensionDesc ext = new ExtensionDesc(name, version, location);
@@ -430,7 +433,7 @@ class Parser {
addInfo(info, child, kind, getSpanText(child));
}
if ("homepage".equals(name))
- addInfo(info, child, null, getRequiredURL(child, "href", codebase));
+ addInfo(info, child, null, getRequiredURL(child, "href", base));
if ("icon".equals(name))
addInfo(info, child, getAttribute(child, "kind", "default"), getIcon(child));
if ("offline-allowed".equals(name))
@@ -484,7 +487,7 @@ class Parser {
int height = Integer.parseInt(getAttribute(node, "height", "-1"));
int size = Integer.parseInt(getAttribute(node, "size", "-1"));
int depth = Integer.parseInt(getAttribute(node, "depth", "-1"));
- URL location = getRequiredURL(node, "href", codebase);
+ URL location = getRequiredURL(node, "href", base);
Object kind = getAttribute(node, "kind", "default");
return new IconDesc(location, kind, width, height, depth, size);
@@ -521,8 +524,8 @@ class Parser {
else if (strict)
throw new ParseException(R("PEmptySecurity"));
- if (codebase != null)
- return new SecurityDesc(file, type, codebase.getHost());
+ if (base != null)
+ return new SecurityDesc(file, type, base.getHost());
else
return new SecurityDesc(file, type, null);
}
@@ -589,7 +592,7 @@ class Parser {
public AppletDesc getApplet(Node node) throws ParseException {
String name = getRequiredAttribute(node, "name", R("PUnknownApplet"));
String main = getRequiredAttribute(node, "main-class", null);
- URL docbase = getURL(node, "documentbase", codebase);
+ URL docbase = getURL(node, "documentbase", base);
Map paramMap = new HashMap();
int width = 0;
int height = 0;
@@ -721,7 +724,7 @@ class Parser {
public RelatedContentDesc getRelatedContent(Node node) throws ParseException {
getRequiredAttribute(node, "href", null);
- URL location = getURL(node, "href", codebase);
+ URL location = getURL(node, "href", base);
String title = null;
String description = null;
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java Tue Jul 20 09:35:12 2010 -0400
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Jul 21 16:29:05 2010 -0400
@@ -94,6 +94,7 @@ public class SecurityDesc {
new PropertyPermission("java.vm.version", "read"),
new PropertyPermission("java.vm.vendor", "read"),
new PropertyPermission("java.vm.name", "read"),
+ new PropertyPermission("javawebstart.version", "read"),
new RuntimePermission("exitVM"),
new RuntimePermission("stopThread"),
new AWTPermission("showWindowWithoutWarningBanner"),
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jul 20 09:35:12 2010 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Jul 21 16:29:05 2010 -0400
@@ -50,6 +50,8 @@ LNotLaunchableInfo=File must be a JNLP a
LNotLaunchableInfo=File must be a JNLP application, applet, or installer type.
LCantDetermineMainClass=Unknown Main-Class.
LCantDetermineMainClassInfo=Could not determine the main class for this application.
+LUnsignedJarWithSecurity=Cannot grant permissions to unsigned jars.
+LUnsignedJarWithSecurityInfo=Application requested security permissions, but jars are not signed.
JNotApplet=File is not an applet.
JNotApplication=File is not an application.
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jul 20 09:35:12 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jul 21 16:29:05 2010 -0400
@@ -167,7 +167,7 @@ public class JNLPClassLoader extends URL
}
- private void setSecurity() {
+ private void setSecurity() throws LaunchException {
URL codebase = null;
@@ -196,15 +196,22 @@ public class JNLPClassLoader extends URL
}
} else { //regular jnlp file
- /**
- * If the application is signed, then we set the SecurityDesc to the
- * <security> tag in the jnlp file. Note that if an application is
- * signed, but there is no <security> tag in the jnlp file, the
- * application will get sandbox permissions.
- * If the application is unsigned, we ignore the <security> tag and
- * use a sandbox instead.
+ /*
+ * Various combinations of the jars being signed and <security> tags being
+ * present are possible. They are treated as follows
+ *
+ * Jars JNLP File Result
+ *
+ * Signed <security> Appropriate Permissions
+ * Signed no <security> Sandbox
+ * Unsigned <security> Error
+ * Unsigned no <security> Sandbox
+ *
*/
- if (signing == true) {
+ if (!file.getSecurity().getSecurityType().equals(SecurityDesc.SANDBOX_PERMISSIONS) && !signing) {
+ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LUnsignedJarWithSecurity"), R("LUnsignedJarWithSecurityInfo"));
+ }
+ else if (signing == true) {
this.security = file.getSecurity();
} else {
this.security = new SecurityDesc(file,
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jul 20 09:35:12 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jul 21 16:29:05 2010 -0400
@@ -167,6 +167,11 @@ public class JNLPRuntime {
checkInitialized();
isWebstartApplication = isApplication;
+
+ //Setting the system property for javawebstart's version.
+ //The version stored will be the same as java's version.
+ System.setProperty("javawebstart.version", "javaws-" +
+ System.getProperty("java.version"));
if (headless == false)
checkHeadless();
diff -r 0b272cf7e4a3 -r 66cd8b27fe54 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jul 20 09:35:12 2010 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jul 21 16:29:05 2010 -0400
@@ -1625,12 +1625,26 @@ plugin_create_applet_tag (int16_t argc,
g_free (code);
code = NULL;
}
+ else if (!g_ascii_strcasecmp (argn[i], "java_code"))
+ {
+ gchar* java_code = g_strdup_printf ("JAVA_CODE=\"%s\" ", argv[i]);
+ applet_tag = g_strconcat (applet_tag, java_code, NULL);
+ g_free (java_code);
+ java_code = NULL;
+ }
else if (!g_ascii_strcasecmp (argn[i], "codebase"))
{
gchar* codebase = g_strdup_printf ("CODEBASE=\"%s\" ", argv[i]);
applet_tag = g_strconcat (applet_tag, codebase, NULL);
g_free (codebase);
codebase = NULL;
+ }
+ else if (!g_ascii_strcasecmp (argn[i], "java_codebase"))
+ {
+ gchar* java_codebase = g_strdup_printf ("JAVA_CODEBASE=\"%s\" ", argv[i]);
+ applet_tag = g_strconcat (applet_tag, java_codebase, NULL);
+ g_free (java_codebase);
+ java_codebase = NULL;
}
else if (!g_ascii_strcasecmp (argn[i], "classid"))
{
@@ -1645,6 +1659,13 @@ plugin_create_applet_tag (int16_t argc,
applet_tag = g_strconcat (applet_tag, archive, NULL);
g_free (archive);
archive = NULL;
+ }
+ else if (!g_ascii_strcasecmp (argn[i], "java_archive"))
+ {
+ gchar* java_archive = g_strdup_printf ("JAVA_ARCHIVE=\"%s\" ", argv[i]);
+ applet_tag = g_strconcat (applet_tag, java_archive, NULL);
+ g_free (java_archive);
+ java_archive = NULL;
}
else if (!g_ascii_strcasecmp (argn[i], "width"))
{
More information about the distro-pkg-dev
mailing list