TinyBrain - a brain for your computer

"); } List sortedList; synchronized (dataProvider.getData()) { if (start == 0) { sortedList = preSort(dataProvider.getData(), sortByLocal); } else { sortedList = preSort(Collections.synchronizedList(dataProvider.getData().subList(start, dataProvider.getData().size())), sortByLocal); } } .... -------------- next part -------------- A non-text attachment was scrubbed... Name: removePotentialDeadlock.patch Type: text/x-patch Size: 628 bytes Desc: not available URL: From ptisnovs at icedtea.classpath.org Thu Mar 13 08:49:58 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Mar 2014 08:49:58 +0000 Subject: /hg/rhino-tests: Enhancements of various tests in ScriptEngineFa... Message-ID: changeset 7a653bbdeeec in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7a653bbdeeec author: Pavel Tisnovsky date: Thu Mar 13 09:50:36 2014 +0100 Enhancements of various tests in ScriptEngineFactoryClassTest. diffstat: ChangeLog | 5 + src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 72 ++++++++++++++++++++ 2 files changed, 77 insertions(+), 0 deletions(-) diffs (129 lines): diff -r bdfcaa390fb9 -r 7a653bbdeeec ChangeLog --- a/ChangeLog Wed Mar 12 12:42:16 2014 +0100 +++ b/ChangeLog Thu Mar 13 09:50:36 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-13 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Enhancements of various tests in ScriptEngineFactoryClassTest. + 2014-03-12 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r bdfcaa390fb9 -r 7a653bbdeeec src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Wed Mar 12 12:42:16 2014 +0100 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Thu Mar 13 09:50:36 2014 +0100 @@ -1624,6 +1624,14 @@ } try { + this.scriptEngineFactoryClass.cast(Character.valueOf('a')); + throw new AssertionError("Class.cast(Character.valueOf('a')) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(Byte.valueOf((byte)42)); throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception"); } @@ -1680,6 +1688,14 @@ } try { + this.scriptEngineFactoryClass.cast(new Throwable("xyzzy")); + throw new AssertionError("Class.cast(new Throwable(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(new RuntimeException()); throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception"); } @@ -1688,6 +1704,14 @@ } try { + this.scriptEngineFactoryClass.cast(new RuntimeException("xyzzy")); + throw new AssertionError("Class.cast(new RuntimeException(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(new Error()); throw new AssertionError("Class.cast(new Error()) does not throw any exception"); } @@ -1696,6 +1720,22 @@ } try { + this.scriptEngineFactoryClass.cast(new Error("xyzzy")); + throw new AssertionError("Class.cast(new Error(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.scriptEngineFactoryClass.cast(new java.io.File("xyzzy")); + throw new AssertionError("Class.cast(new java.io.File(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(new java.lang.String()); throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception"); } @@ -1744,6 +1784,30 @@ } try { + this.scriptEngineFactoryClass.cast(new java.awt.Label()); + throw new AssertionError("Class.cast(new java.awt.Label()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.scriptEngineFactoryClass.cast(new java.awt.Label(new String())); + throw new AssertionError("Class.cast(new java.awt.Label(new String())) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.scriptEngineFactoryClass.cast(new java.awt.Label("xyzzy")); + throw new AssertionError("Class.cast(new java.awt.Label(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(new javax.swing.JLabel()); throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception"); } @@ -1760,6 +1824,14 @@ } try { + this.scriptEngineFactoryClass.cast(new javax.swing.JLabel("xyzzy")); + throw new AssertionError("Class.cast(new javax.swing.JLabel(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptEngineFactoryClass.cast(new javax.swing.JPanel()); throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception"); } From ptisnovs at icedtea.classpath.org Thu Mar 13 08:52:12 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Mar 2014 08:52:12 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltAffineQuadrantRotat... Message-ID: changeset 402bff2be904 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=402bff2be904 author: Pavel Tisnovsky date: Thu Mar 13 09:52:52 2014 +0100 Ten new tests added into BitBltAffineQuadrantRotateTransformOp.java. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 112 ++++++++++ 2 files changed, 117 insertions(+), 0 deletions(-) diffs (134 lines): diff -r 3db247628ff9 -r 402bff2be904 ChangeLog --- a/ChangeLog Wed Mar 12 12:37:42 2014 +0100 +++ b/ChangeLog Thu Mar 13 09:52:52 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + Ten new tests added into BitBltAffineQuadrantRotateTransformOp.java. + 2014-03-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java: diff -r 3db247628ff9 -r 402bff2be904 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Wed Mar 12 12:37:42 2014 +0100 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Thu Mar 13 09:52:52 2014 +0100 @@ -781,6 +781,118 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[0]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[1]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[2]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[3]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[4]); + } + + /** + Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGBPreRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[5]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntRGBRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, RotateTransformationNearest1Op[0]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntRGBRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntRGB(image, graphics2d, RotateTransformationNearest1Op[1]); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From aazores at redhat.com Thu Mar 13 13:49:19 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 09:49:19 -0400 Subject: [rfc][icedtea-web] Runtime refresh of JNLPPolicy In-Reply-To: <53215E43.80703@redhat.com> References: <53207D43.8030806@redhat.com> <53215E43.80703@redhat.com> Message-ID: <5321B75F.4090002@redhat.com> On 03/13/2014 03:29 AM, Jiri Vanek wrote: > On 03/12/2014 04:29 PM, Andrew Azores wrote: > > The idea and code looks ok, but I have an fault in mind: > > When some applet is already running - and have some permissions > already. You visit new applet, set different permissions for it and > you reload the permissions, will not the running applet be affected by > those new too? > > When they do not share match in codebases, that probably do not hurt, > but if they do? > > The possible fix may be permissions per classloader. It would be > probably right thing, but it scares me. This doesn't sound so bad to me. The next time you restart your already running applet it will have those permissions anyway, unless you're trying to be tricky and set the permissions for the second applet only while it runs, and want to leave the long-running one alone. But this sounds like the user is just asking for trouble at that point. Besides, the JNLPPolicy also does work with applet JAR URLs, so if you really are in this situation for some reason, you can use that mechanism to provide control over the second shorter lived applet as well. You just can't use PolicyEditor to do it. > >> >> Manual testing: >> >> (with patch applied) >> 1) Ensure your policy file is either empty or at least does not >> contain an entry to match the test >> applet >> 2) Visit http://caff.de/applettest/Signed.html and run the applet >> sandboxed >> 3) Verify that the applet may not print nor save. Close the applet >> but do not exit the browser. >> 4) Add the following to your policy file: >> >> grant codeBase "http://caff.de/applettest/" { >> permission java.lang.RuntimePermission "queuePrintJob"; >> permission java.util.PropertyPermission "*", "read"; >> }; >> >> 5) Without closing your browser, restart the applet (refresh the >> page, or open a new tab and visit >> again) >> 6) Verify that the applet may now cause a print dialog to appear, but >> still cannot save files >> Also forgot to mention here - you need extended security set to Low. Forcing Sandbox sets the classloader security to Sandbox, but the applet is correctly requesting All-permissions. Any security level above Low will create a LaunchException because of this, due to checkPermissionsAttribute(). IMO this seems like fairly reasonable behaviour, although maybe there could also be a check in checkPermissionsAttribute() for this - if classloader's security level is Sandbox, it's only fatal if the SecurityDelegate does not say that we are running in sandbox on purpose? Need your input since permissions attribute is your work. This is only tangentially related though, perhaps it deserves its own new discussion thread. Thanks, -- Andrew A From aazores at redhat.com Thu Mar 13 13:52:16 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 09:52:16 -0400 Subject: [rfc][icedtea-web] fixing downlaod inidcator In-Reply-To: <532159CC.8080406@redhat.com> References: <5320A147.1070505@redhat.com> <1223303078.2815204.1394649277744.JavaMail.zimbra@redhat.com> <532159CC.8080406@redhat.com> Message-ID: <5321B810.8050801@redhat.com> On 03/13/2014 03:10 AM, Jiri Vanek wrote: > On 03/12/2014 07:34 PM, Andrew Azores wrote: >> What is "a lot" being affected by the second patch? Anyway, patches >> look fine I think. >> > > Bad wording. It mean that all calls to get manifests' attributes > before the resources are initialised will return "undefined". > > But thats probably the right thing anyway. > > That sounds correct to me. OK to push then. Thanks, -- Andrew A From aazores at redhat.com Thu Mar 13 13:58:54 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 09:58:54 -0400 Subject: [rfc][icedtea-web][policyeditor] NPE in filechanged check In-Reply-To: <53215A38.5080801@redhat.com> References: <53207F19.7000903@redhat.com> <53215A38.5080801@redhat.com> Message-ID: <5321B99E.6000405@redhat.com> On 03/13/2014 03:11 AM, Jiri Vanek wrote: > On 03/12/2014 04:36 PM, Andrew Azores wrote: >> Hi, >> >> Just noticed that there are conditions where an NPE will occur due to >> the new filechanged check. >> Steps to reproduce: >> 1) launch policyeditor with no arguments >> 2) create some set of permissions, eg Print Documents only, doesn't >> really matter so long as you >> make at least one change >> 3) press Apply >> 4) attempt to save the policy file to any location eg $HOME/test.policy >> 5) NPE will occur because there is no MD5SumWatcher reference, since >> no policy file was ever opened >> first >> 5b) file fails to save >> >> With the patch applied, 5/5b does not occur, and instead the flow >> completes as expected with a >> "Changes saved" message, and the file can be verified as written to >> disk. >> >> Thanks, > > I'm missing the creation of fileWatcher *after* the file is saved now. > > > J. > Thanks for catching that. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-filechanged-npe-2.patch Type: text/x-patch Size: 1307 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Thu Mar 13 14:08:45 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 13 Mar 2014 14:08:45 +0000 Subject: [Bug 1498] Allow Root to attach to all VMs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1498 Severin Gehwolf changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|1460 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aazores at redhat.com Thu Mar 13 14:54:09 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 10:54:09 -0400 Subject: [rfc][icedtea-web] remove rare deadlock in logging console In-Reply-To: <53216A84.4090701@redhat.com> References: <53216A84.4090701@redhat.com> Message-ID: <5321C691.7010004@redhat.com> On 03/13/2014 04:21 AM, Jiri Vanek wrote: > I think this synchronisation is redundant. > If not, then maybe invokeLater should become invokeAndWait? But it is > locking too... > Also, the importList is synchronized in only model-touching block[1]. > > So this really should be ok to go. > > > Only case where I have seen the deadlock occur is in elluminate with > CONSOLE ON and VISIBLE, It appeared in aprox 1/3 of cases. > It did not appeared after the fix. Anyway - anybody who is running > head - may you try to run apps (and elluminat wit/without fix) with > cosnole on and visibele for a while? > > J > Makes sense to me, and using elluminate as a test case seems to show that this does fix the deadlock. OK to push. Thanks, -- Andrew A From jvanek at icedtea.classpath.org Thu Mar 13 15:44:11 2014 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 13 Mar 2014 15:44:11 +0000 Subject: /hg/icedtea-web: 3 new changesets Message-ID: changeset c20c689ba9ff in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c20c689ba9ff author: Jiri Vanek date: Thu Mar 13 16:34:01 2014 +0100 JNLPClassLoader.java: (init) attributes are alowed to access jars only once all resources are downloaded changeset fdcb91be0d58 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fdcb91be0d58 author: Jiri Vanek date: Thu Mar 13 16:39:04 2014 +0100 Fixing rear deadlock issue ConsoleOutputPane.java: removed (probably) unnecessary synchronization of (refreshPaneBody). changeset 71a87178ff7e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=71a87178ff7e author: Jiri Vanek date: Thu Mar 13 16:43:45 2014 +0100 JNLPClassLoaderTest.java: adapted to permissions attribute diffstat: ChangeLog | 17 +++++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 4 +- netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java | 2 +- tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java | 29 ++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) diffs (105 lines): diff -r e53adc254895 -r 71a87178ff7e ChangeLog --- a/ChangeLog Wed Mar 12 17:34:10 2014 +0100 +++ b/ChangeLog Thu Mar 13 16:43:45 2014 +0100 @@ -1,3 +1,20 @@ +2014-03-13 Jiri Vanek + + * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: adapted + to permissions attribute + +2014-03-13 Jiri Vanek + + Fixing rear deadlock issue + * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: removed + (probably) unnecessary synchronization of (refreshPaneBody). + +2014-03-13 Jiri Vanek + + Fixed appearance of download indicator + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (init) attributes + are allowed to access jars only once all resources are downloaded + 2014-03-12 Jiri Vanek * configure.ac: added check for /bin/bash diff -r e53adc254895 -r 71a87178ff7e netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Mar 12 17:34:10 2014 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 13 16:43:45 2014 +0100 @@ -258,8 +258,6 @@ this.enableCodeBase = enableCodeBase; - //as it is harmless, we can set is as soon as possible. - file.getManifestsAttributes().setLoader(this); AppVerifier verifier; @@ -282,6 +280,8 @@ initializeResources(); + //loading mainfests before resources are initialised may cause waiting for resources + file.getManifestsAttributes().setLoader(this); // initialize permissions initializePermissions(); diff -r e53adc254895 -r 71a87178ff7e netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java --- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Wed Mar 12 17:34:10 2014 +0100 +++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Thu Mar 13 16:43:45 2014 +0100 @@ -217,7 +217,7 @@ }); } - private synchronized void refreshPaneBody(final boolean reset) throws BadLocationException, IOException { + private void refreshPaneBody(final boolean reset) throws BadLocationException, IOException { if (reset) { jEditorPane1.setText(model.importList(0)); } else { diff -r e53adc254895 -r 71a87178ff7e tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Wed Mar 12 17:34:10 2014 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Thu Mar 13 16:43:45 2014 +0100 @@ -48,15 +48,44 @@ import net.sourceforge.jnlp.LaunchException; import net.sourceforge.jnlp.cache.UpdatePolicy; +import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar; +import net.sourceforge.jnlp.security.appletextendedsecurity.AppletSecurityLevel; +import net.sourceforge.jnlp.security.appletextendedsecurity.AppletStartupSecuritySettings; import net.sourceforge.jnlp.util.FileTestUtils; import net.sourceforge.jnlp.util.logging.NoStdOutErrTest; +import org.junit.AfterClass; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; public class JNLPClassLoaderTest extends NoStdOutErrTest{ + private static AppletSecurityLevel level; + public static String askUser; + + + @BeforeClass + public static void setPermissions() { + level = AppletStartupSecuritySettings.getInstance().getSecurityLevel(); + JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_LEVEL, AppletSecurityLevel.ALLOW_UNSIGNED.toChars()); + } + + @AfterClass + public static void resetPermissions() { + JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_LEVEL, level.toChars()); + } + @BeforeClass + public static void noDialogs(){ + askUser = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER); + JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER, Boolean.toString(false)); + } + + @AfterClass + public static void restoreDialogs(){ + JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER, askUser); + } /* Note: Only does file leak testing for now. */ @Test public void constructorFileLeakTest() throws Exception { From jvanek at redhat.com Thu Mar 13 15:46:17 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 13 Mar 2014 16:46:17 +0100 Subject: [rfc][icedtea-web][policyeditor] NPE in filechanged check In-Reply-To: <5321B99E.6000405@redhat.com> References: <53207F19.7000903@redhat.com> <53215A38.5080801@redhat.com> <5321B99E.6000405@redhat.com> Message-ID: <5321D2C9.6020602@redhat.com> Ok. then. J. On 03/13/2014 02:58 PM, Andrew Azores wrote: > On 03/13/2014 03:11 AM, Jiri Vanek wrote: >> On 03/12/2014 04:36 PM, Andrew Azores wrote: >>> Hi, >>> >>> Just noticed that there are conditions where an NPE will occur due to the new filechanged check. >>> Steps to reproduce: >>> 1) launch policyeditor with no arguments >>> 2) create some set of permissions, eg Print Documents only, doesn't really matter so long as you >>> make at least one change >>> 3) press Apply >>> 4) attempt to save the policy file to any location eg $HOME/test.policy >>> 5) NPE will occur because there is no MD5SumWatcher reference, since no policy file was ever opened >>> first >>> 5b) file fails to save >>> >>> With the patch applied, 5/5b does not occur, and instead the flow completes as expected with a >>> "Changes saved" message, and the file can be verified as written to disk. >>> >>> Thanks, >> >> I'm missing the creation of fileWatcher *after* the file is saved now. >> >> >> J. >> > > Thanks for catching that. > > Thanks, > From aazores at icedtea.classpath.org Thu Mar 13 15:52:22 2014 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Thu, 13 Mar 2014 15:52:22 +0000 Subject: /hg/icedtea-web: PolicyEditor: avoid NPE when saving to a new file Message-ID: changeset abec2ce76cdb in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=abec2ce76cdb author: Andrew Azores date: Thu Mar 13 11:52:14 2014 -0400 PolicyEditor: avoid NPE when saving to a new file * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (savePolicyFile, updateMd5WithDialog) avoid NPE when saving to a new file diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 9 +++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diffs (38 lines): diff -r 71a87178ff7e -r abec2ce76cdb ChangeLog --- a/ChangeLog Thu Mar 13 16:43:45 2014 +0100 +++ b/ChangeLog Thu Mar 13 11:52:14 2014 -0400 @@ -1,3 +1,8 @@ +2014-03-13 Andrew Azores + + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: + (savePolicyFile, updateMd5WithDialog) avoid NPE when saving to a new file + 2014-03-13 Jiri Vanek * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: adapted diff -r 71a87178ff7e -r abec2ce76cdb netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Thu Mar 13 16:43:45 2014 +0100 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Thu Mar 13 11:52:14 2014 -0400 @@ -984,6 +984,9 @@ try { FileUtils.saveFile(sb.toString(), file); + if (fileWatcher == null) { + fileWatcher = new MD5SumWatcher(file); + } fileWatcher.update(); changesMade = false; showChangesSavedDialog(); @@ -1026,6 +1029,12 @@ * @throws IOException if the file cannot be read */ public int updateMd5WithDialog() throws FileNotFoundException, IOException { + if (fileWatcher == null) { + if (file != null) { + fileWatcher = new MD5SumWatcher(file); + } + return JOptionPane.NO_OPTION; + } final boolean changed = fileWatcher.update(); if (changed) { return JOptionPane.showConfirmDialog(weakThis.get(), R("PEFileModifiedDetail", file.getCanonicalPath()), From jvanek at redhat.com Thu Mar 13 16:26:36 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 13 Mar 2014 17:26:36 +0100 Subject: [rfc][icedtea-web] Runtime refresh of JNLPPolicy In-Reply-To: <53207D43.8030806@redhat.com> References: <53207D43.8030806@redhat.com> Message-ID: <5321DC3C.8080507@redhat.com> On 03/12/2014 04:29 PM, Andrew Azores wrote: > Hi, > > This patch adds a method to JNLPRuntime to allow the Policy object to be refreshed, and adds logic > to the JNLPPolicy class (of which the runtime's Policy reference is an instance) to: > 1) be able to refresh its permissions from the user's policy file > 2) read from the policy file on a per-codebase basis, not only per applet JAR location > > It also adds logic to JNLPClassLoader.SecurityDelegate to call the new JNLPRuntime method when the > applet is to be run sandboxed, to ensure that this is done with the current policy, not an older > cached copy in case there have been changes since the JVM was started. > > These changes are in support of later patches which will add a way to launch PolicyEditor from the > fully and partially signed applet warning dialogs. Without the ability to refresh, the JVM needs to > be restarted before those changes can take effect, which is not good for usability (users have to > restart their browser). Without the ability to actually check by codebase rather than full JAR url, > the user policy files will be much more complex than planned, and for users to set custom permission > levels per-applet will be much more difficult to use. > > Manual testing: > > (with patch applied) > 1) Ensure your policy file is either empty or at least does not contain an entry to match the test > applet > 2) Visit http://caff.de/applettest/Signed.html and run the applet sandboxed > 3) Verify that the applet may not print nor save. Close the applet but do not exit the browser. > 4) Add the following to your policy file: > > grant codeBase "http://caff.de/applettest/" { > permission java.lang.RuntimePermission "queuePrintJob"; > permission java.util.PropertyPermission "*", "read"; > }; > > 5) Without closing your browser, restart the applet (refresh the page, or open a new tab and visit > again) > 6) Verify that the applet may now cause a print dialog to appear, but still cannot save files > > With patch not applied, granting the applet codebase these permissions does not work, so grant the > same permissions but to all applets. Check that making this change to the policy file without > restarting the JVM does not actually grant the permissions to the applet, and restarting the JVM > does grant them. > > Automated testing: > Working on it, but not sure if it's actually doable. I need a way to keep the JVM running between > runs of an applet, which I don't know if we can do. Any ideas? > > Thanks, > based on IRC discussion - ok to go. J. From aazores at icedtea.classpath.org Thu Mar 13 17:48:08 2014 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Thu, 13 Mar 2014 17:48:08 +0000 Subject: /hg/icedtea-web: Runtime policies refresh and per-codebase polic... Message-ID: changeset dfc27d4d55d5 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dfc27d4d55d5 author: Andrew Azores date: Thu Mar 13 13:48:00 2014 -0400 Runtime policies refresh and per-codebase policy entries Added ability to reload user level policy file contents without restarting the JVM. Also allow per-codebase policy entries. * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (SecurityDelegate#setRunInSandbox) call JNLPRuntime.reloadPolicy * netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java: (refresh) refresh user policy file. (getPermissions) check for per-codebase entries in user policy file * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (reloadPolicy) new method. diffstat: netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 1 + netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 19 ++++++++++++++--- netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 4 +++ 3 files changed, 20 insertions(+), 4 deletions(-) diffs (73 lines): diff -r abec2ce76cdb -r dfc27d4d55d5 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 13 11:52:14 2014 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 13 13:48:00 2014 -0400 @@ -2432,6 +2432,7 @@ throw new LaunchException(classLoader.file, null, R("LSFatal"), R("LCInit"), R("LRunInSandboxError"), R("LRunInSandboxErrorInfo")); } + JNLPRuntime.reloadPolicy(); // ensure that we have the most up-to-date custom policy loaded this.promptedForSandbox = true; this.runInSandbox = true; } diff -r abec2ce76cdb -r dfc27d4d55d5 netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java Thu Mar 13 11:52:14 2014 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java Thu Mar 13 13:48:00 2014 -0400 @@ -91,21 +91,30 @@ // systempolicy permissions need to be accounted for as well e = systemPolicy.getPermissions(appletCS).elements(); - while (e.hasMoreElements()) + while (e.hasMoreElements()) { clPermissions.add(e.nextElement()); + } // and so do permissions from the jnlp-specific system policy if (systemJnlpPolicy != null) { e = systemJnlpPolicy.getPermissions(appletCS).elements(); - while (e.hasMoreElements()) + while (e.hasMoreElements()) { clPermissions.add(e.nextElement()); + } } // and permissiosn from jnlp-specific user policy too if (userJnlpPolicy != null) { e = userJnlpPolicy.getPermissions(appletCS).elements(); - while (e.hasMoreElements()) + while (e.hasMoreElements()) { clPermissions.add(e.nextElement()); + } + + CodeSource appletCodebaseSource = new CodeSource(JNLPRuntime.getApplication().getJNLPFile().getCodeBase(), (java.security.cert.Certificate[]) null); + e = userJnlpPolicy.getPermissions(appletCodebaseSource).elements(); + while (e.hasMoreElements()) { + clPermissions.add(e.nextElement()); + } } return clPermissions; @@ -120,7 +129,9 @@ * Refresh. */ public void refresh() { - // no op + if (userJnlpPolicy != null) { + userJnlpPolicy.refresh(); + } } /** diff -r abec2ce76cdb -r dfc27d4d55d5 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Mar 13 11:52:14 2014 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Mar 13 13:48:00 2014 -0400 @@ -292,6 +292,10 @@ } + public static void reloadPolicy() { + policy.refresh(); + } + /** * Returns a TrustManager ideal for the running VM. * From aazores at redhat.com Thu Mar 13 18:43:34 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 14:43:34 -0400 Subject: [rfc][icedtea-web] implemented Application-Library-Allowable-Codebase Attribute In-Reply-To: <531F632F.1000005@redhat.com> References: <530F71CF.4040207@redhat.com> <53173C78.5050204@redhat.com> <531F632F.1000005@redhat.com> Message-ID: <5321FC56.3070606@redhat.com> On 03/11/2014 03:25 PM, Jiri Vanek wrote: > All your nits have been fixed. However: > > I'm still not using the AppTrustWarningPanel, so rember button is > useless. It will come as another changeset (if ever) > - this patch broke elluminate - one of the deadly throws is probably > redundant and should be repalced by security prompt. Not okay to push if elluminate is broken by this... have you figured out what to do about it? > - jsut hint - download indicator is broken > - elluminat works, but freaze to, same as > http://www.walter-fendt.de/ph14e/resultant.htm > > I guess all above are older issues not related to this patch. > > > J. > Thanks, -- Andrew A From aazores at redhat.com Thu Mar 13 19:05:37 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 15:05:37 -0400 Subject: [rfc][icedtea-web] implemented Application-Library-Allowable-Codebase Attribute In-Reply-To: <5321FC56.3070606@redhat.com> References: <530F71CF.4040207@redhat.com> <53173C78.5050204@redhat.com> <531F632F.1000005@redhat.com> <5321FC56.3070606@redhat.com> Message-ID: <53220181.4050603@redhat.com> On 03/13/2014 02:43 PM, Andrew Azores wrote: > On 03/11/2014 03:25 PM, Jiri Vanek wrote: >> All your nits have been fixed. However: >> >> I'm still not using the AppTrustWarningPanel, so rember button is >> useless. It will come as another changeset (if ever) >> - this patch broke elluminate - one of the deadly throws is probably >> redundant and should be repalced by security prompt. > > Not okay to push if elluminate is broken by this... have you figured > out what to do about it? > >> - jsut hint - download indicator is broken >> - elluminat works, but freaze to, same as >> http://www.walter-fendt.de/ph14e/resultant.htm >> >> I guess all above are older issues not related to this patch. >> >> >> J. >> > > Thanks, > Apparently it was just a broken cache problem. Elluminate does work. One nit was left unfixed: > + URL documentBase = null; > + if (file instanceof PluginBridge) { > + documentBase = ((PluginBridge) file).getSourceLocation(); > + } > + if (documentBase == null) { > + documentBase = file.getCodeBase(); > + } Good to go otherwise, I think. Thanks, -- Andrew A From aazores at redhat.com Thu Mar 13 19:08:05 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 15:08:05 -0400 Subject: [rfc][icedtea-web] Launching PolicyEditor from CertWarningPane Message-ID: <53220215.60301@redhat.com> Hi, This patch adds a button which summons a popup menu, currently with only one item, allowing the user to launch PolicyEditor directly from the warning dialog. The editor appears with the current applet's codebase added (if necessary) and pre-selected. This, along with the sandbox button and earlier patch allowing JNLPPolicy to use per-codebase policy entries and to reload at runtime, allows for easy configuration of fine grained permissions granted to an applet. Feedback/recommendations on the UI here are definitely welcome. At a later point, extra items will be added to the popup menu to allow for "this run only" temporary permissions to be granted to the applet. These choices will have to use a different mechanism for adding the permissions, however, since it won't be automatically handled by the JNLPPolicy/automatically reloaded by SecurityDelegate, as the policy file permissions are. (note the conspicuous lack of any code here to actually force a policy reload - this is already handled by the sandbox button and SecurityDelegate) Note that there is a visual bug with PolicyEditor where the checkboxes may not be updated correctly, and will be incorrectly blank when the currently selected codebase actually does have permissions assigned. This will be addressed separately. As a workaround, simply switch to "All applets" codebase, then back to the applet-specific one. The checkboxes will then correctly update. http://caff.de/applettest/Signed.html can serve as a test applet again. ChangeLog: Add button with popup menu to launch PolicyEditor * netx/net/sourceforge/jnlp/resources/Messages.properties: (ButPolicyEditorDropdown, CertWarnPolicyTip, CertWarnPolicyEditorItem): new messages * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: (addComponents, setTextAndLabels, addButtons) refactored and split methods. (createPolicyPermissionsMenu) new method. (PolicyEditorLaunchListener) new ActionListener for advancedOptions button Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-in-dialog-4.patch Type: text/x-patch Size: 14327 bytes Desc: not available URL: From aazores at redhat.com Thu Mar 13 19:30:23 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 15:30:23 -0400 Subject: [rfc][icedtea-web][policyeditor] Checkboxes not updating Message-ID: <5322074F.9030703@redhat.com> Hi, This patch ensures that operations which should be done by the EDT are actually done by it, and also ensures that when a new codebase is added/selected, that the checkboxes properly update the first time around, without needing to select a different codebase and go back. ChangeLog: * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (addNewCodebase) ensure that checkboxes update. (removeCodebase, updateCheckboxes) ensure UI updates are done on EDT. Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-checkboxes.patch Type: text/x-patch Size: 4310 bytes Desc: not available URL: From aazores at redhat.com Thu Mar 13 19:41:54 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 15:41:54 -0400 Subject: [rfc][icedtea-web] Launching PolicyEditor from CertWarningPane In-Reply-To: <53220215.60301@redhat.com> References: <53220215.60301@redhat.com> Message-ID: <53220A02.7090506@redhat.com> On 03/13/2014 03:08 PM, Andrew Azores wrote: > Hi, > > This patch adds a button which summons a popup menu, currently with > only one item, allowing the user to launch PolicyEditor directly from > the warning dialog. The editor appears with the current applet's > codebase added (if necessary) and pre-selected. This, along with the > sandbox button and earlier patch allowing JNLPPolicy to use > per-codebase policy entries and to reload at runtime, allows for easy > configuration of fine grained permissions granted to an applet. > > Feedback/recommendations on the UI here are definitely welcome. At a > later point, extra items will be added to the popup menu to allow for > "this run only" temporary permissions to be granted to the applet. > These choices will have to use a different mechanism for adding the > permissions, however, since it won't be automatically handled by the > JNLPPolicy/automatically reloaded by SecurityDelegate, as the policy > file permissions are. (note the conspicuous lack of any code here to > actually force a policy reload - this is already handled by the > sandbox button and SecurityDelegate) > > Note that there is a visual bug with PolicyEditor where the checkboxes > may not be updated correctly, and will be incorrectly blank when the > currently selected codebase actually does have permissions assigned. > This will be addressed separately. As a workaround, simply switch to > "All applets" codebase, then back to the applet-specific one. The > checkboxes will then correctly update. > > http://caff.de/applettest/Signed.html can serve as a test applet again. > > ChangeLog: > Add button with popup menu to launch PolicyEditor > * netx/net/sourceforge/jnlp/resources/Messages.properties: > (ButPolicyEditorDropdown, CertWarnPolicyTip, > CertWarnPolicyEditorItem): new messages > * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: > (addComponents, setTextAndLabels, addButtons) refactored and split > methods. (createPolicyPermissionsMenu) new method. > (PolicyEditorLaunchListener) new ActionListener for advancedOptions > button > > Thanks, > Sorry, tiny update here. I noticed that there was a small "deadspot" in the middle of the new button, which was apparently the popupmenu component, as clicking it caused PolicyEditor to appear. It seems this was because the menu was added as a child component of the button. Adding the component to the pane itself, which is the only change between this new patch and the previous one, resolves this. The popup menu still appears in the same place and works fine as far as I can tell. Is there some better way to handle JPopupMenus? Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-in-dialog-4.patch Type: text/x-patch Size: 14355 bytes Desc: not available URL: From aazores at redhat.com Thu Mar 13 20:43:32 2014 From: aazores at redhat.com (Andrew Azores) Date: Thu, 13 Mar 2014 16:43:32 -0400 Subject: [rfc][icedtea-web] SecurityDelegate addPermission and reference for CertWarningPane Message-ID: <53221874.3030302@redhat.com> Hi, The smaller of these two patches simply exposes JNLPClassLoader#addPermission(Permission) through three new SecurityDelegate methods: #addPermission(Permission), #addPermissions(PermissionCollection), and #addPermissions(Collection). The larger patch passes a SecurityDelegate reference through the security dialog system so that the delegate is available to CertWarningPane. This is in preparation for a patch that will add "this run only" temporary permission options to the CertWarningPane, achieved by "injecting" these permissions directly into the classloader via the delegate. These extra options are not included because they are blocked on "Launching PolicyEditor from CertWarningPane", but this infrastructure work doesn't depend on that patch. These two patches apply cleanly together, but certwarning-securitydelegate will have a small and easily resolvable conflict with policyeditor-in-dialog-4 if they are used together. (securitydelegate-addpermission) ChangeLog: * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (SecurityDelegate addPermission, addPermissions) new methods. (SecurityDelegateImpl addPermission, addPermissions) implement previous. (certwarning-securitydelegate) ChangeLog: * netx/net/sourceforge/jnlp/security/JNLPAppVerifier.java: (checkTrustWithUser) pass SecurityDelegate reference to SecurityDialogs.showCertWarningDialog * netx/net/sourceforge/jnlp/security/PluginAppVerifier.java: same * netx/net/sourceforge/jnlp/security/SecurityDialog.java: pass SecurityDelegate reference from extras into CertWarningPane constructor * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: (showCertWarningDialog) added SecurityDelegate parameter, add to extras array. * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java: (askUser) pass null for SecurityDelegate reference * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: (CertWarningPane) added SecurityDelegate constructor parameter and (securityDelegate) field Thanks, -- Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: securitydelegate-addpermission.patch Type: text/x-patch Size: 1351 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: certwarning-securitydelegate.patch Type: text/x-patch Size: 8058 bytes Desc: not available URL: From ptisnovs at icedtea.classpath.org Fri Mar 14 12:14:24 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Mar 2014 12:14:24 +0000 Subject: /hg/rhino-tests: Enhancements of various tests in ScriptContextC... Message-ID: changeset 39b90cb1bd47 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=39b90cb1bd47 author: Pavel Tisnovsky date: Fri Mar 14 13:14:58 2014 +0100 Enhancements of various tests in ScriptContextClassTest. diffstat: ChangeLog | 5 ++++ src/org/RhinoTests/ScriptContextClassTest.java | 32 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diffs (61 lines): diff -r 7a653bbdeeec -r 39b90cb1bd47 ChangeLog --- a/ChangeLog Thu Mar 13 09:50:36 2014 +0100 +++ b/ChangeLog Fri Mar 14 13:14:58 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-14 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Enhancements of various tests in ScriptContextClassTest. + 2014-03-13 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 7a653bbdeeec -r 39b90cb1bd47 src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Thu Mar 13 09:50:36 2014 +0100 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Fri Mar 14 13:14:58 2014 +0100 @@ -1832,6 +1832,30 @@ } try { + this.scriptContextClass.cast(new java.awt.Label()); + throw new AssertionError("Class.cast(new java.awt.Label()) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.scriptContextClass.cast(new java.awt.Label(new String())); + throw new AssertionError("Class.cast(new java.awt.Label(new String())) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { + this.scriptContextClass.cast(new java.awt.Label("xyzzy")); + throw new AssertionError("Class.cast(new java.awt.Label(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptContextClass.cast(new javax.swing.JLabel()); throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception"); } @@ -1848,6 +1872,14 @@ } try { + this.scriptContextClass.cast(new javax.swing.JLabel("xyzzy")); + throw new AssertionError("Class.cast(new javax.swing.JLabel(\"xyzzy\")) does not throw any exception"); + } + catch (Exception e) { + // expected exception + } + + try { this.scriptContextClass.cast(new javax.swing.JPanel()); throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception"); } From ptisnovs at icedtea.classpath.org Fri Mar 14 12:28:55 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Mar 2014 12:28:55 +0000 Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s... Message-ID: changeset 2ffb2f873ec8 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2ffb2f873ec8 author: Pavel Tisnovsky date: Fri Mar 14 13:29:36 2014 +0100 Ten new tests added into BitBltUsingBgColor test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 150 +++++++++++++++++++++ 2 files changed, 155 insertions(+), 0 deletions(-) diffs (172 lines): diff -r 402bff2be904 -r 2ffb2f873ec8 ChangeLog --- a/ChangeLog Thu Mar 13 09:52:52 2014 +0100 +++ b/ChangeLog Fri Mar 14 13:29:36 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Ten new tests added into BitBltUsingBgColor test suite. + 2014-03-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: diff -r 402bff2be904 -r 2ffb2f873ec8 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Mar 13 09:52:52 2014 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Fri Mar 14 13:29:36 2014 +0100 @@ -5822,6 +5822,156 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeUshortGrayBackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeUshortGrayBackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.yellow); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY. + * Background color is set to Color.white. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeUshortGrayBackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltDiagonalCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.white); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.black. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.blue. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.green. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.cyan. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.magenta); + } + + /** + * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.yellow. + * + * @param image + * image to be used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d) + { + return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, Color.yellow); + } + + /** * Entry point to the test suite. * * @param args not used in this case From jvanek at icedtea.classpath.org Fri Mar 14 12:40:34 2014 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 14 Mar 2014 12:40:34 +0000 Subject: /hg/icedtea-web: Base implementation of Application-Library-Allo... Message-ID: changeset aba4c18c4c64 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=aba4c18c4c64 author: Jiri Vanek date: Fri Mar 14 13:06:03 2014 +0100 Base implementation of Application-Library-Allowable-Codebase. Remember button not yet working. diffstat: ChangeLog | 33 ++ netx/net/sourceforge/jnlp/JNLPFile.java | 14 +- netx/net/sourceforge/jnlp/resources/Messages.properties | 19 + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 93 +++++ netx/net/sourceforge/jnlp/security/SecurityDialog.java | 6 + netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 34 +- netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java | 165 ++++++++++ netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java | 162 +++++++++ netx/net/sourceforge/jnlp/util/ClasspathMatcher.java | 30 +- netx/net/sourceforge/jnlp/util/UrlUtils.java | 105 ++++++ tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java | 98 +++++ tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 107 ++++++ 12 files changed, 846 insertions(+), 20 deletions(-) diffs (truncated from 1090 to 500 lines): diff -r dfc27d4d55d5 -r aba4c18c4c64 ChangeLog --- a/ChangeLog Thu Mar 13 13:48:00 2014 -0400 +++ b/ChangeLog Fri Mar 14 13:06:03 2014 +0100 @@ -1,3 +1,36 @@ +2014-03-14 Jiri Vanek + + Base implementation of Application-Library-Allowable-Codebase. Remember + button not yet working. + * netx/net/sourceforge/jnlp/JNLPFile.java: (ClasspathMatchers) + (getApplicationLibraryAllowableCodebase) (getCodebase) (getCodeBaseMatchersAttribute) + (getCodeBaseMatchersAttribute) (getCodeBaseMatchersAttribute) changed signature + to include/not include path in returned matcher. + * netx/net/sourceforge/jnlp/resources/Messages.properties: Added keys + (ALACAMissingMainTitle) (ALACAMissingInfo) (ALACAMatchingMainTitle) + (ALACAMatchingInfo) for new dialogs. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Implemented + (checkApplicationLibraryAllowableCodebaseAttribute). Used in (init) + * netx/net/sourceforge/jnlp/security/SecurityDialog.java: made aware of + new constants (MISSING_ALACA) and (MATCHING_ALACA) + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: new constants + (MISSING_ALACA) and (MATCHING_ALACA). Implemented (showMissingALACAttributePanel) + and (showMatchingALACAttributePanel) + * netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java + new dialog for Matching attribute + * netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java: + new dialog for Missing attribute. + * netx/net/sourceforge/jnlp/util/ClasspathMatcher.java: allowing user to + choose whether to include paths in matching or not. + * netx/net/sourceforge/jnlp/util/UrlUtils.java: new util methods (removeFileName) + (setOfUrlsToHtmlList) (sanitizeLastSlash) and (equalsIgnoreLastSlash) to + strip filename from url, toString for iterable of urls to string, and + for operations with URLs independently on last slash + * tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java: added + tests for paths + * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added tests + for new methods + 2014-03-13 Andrew Azores * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/JNLPFile.java --- a/netx/net/sourceforge/jnlp/JNLPFile.java Thu Mar 13 13:48:00 2014 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri Mar 14 13:06:03 2014 +0100 @@ -920,21 +920,21 @@ * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#caller_allowable */ public ClasspathMatcher.ClasspathMatchers getCallerAllowableCodebase() { - return getCodeBaseMatchersAttribute(CALLER_ALLOWABLE); + return getCodeBaseMatchersAttribute(CALLER_ALLOWABLE, false); } /** * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_library */ public ClasspathMatcher.ClasspathMatchers getApplicationLibraryAllowableCodebase() { - return getCodeBaseMatchersAttribute(APP_LIBRARY_ALLOWABLE); + return getCodeBaseMatchersAttribute(APP_LIBRARY_ALLOWABLE, true); } /** * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#codebase */ public ClasspathMatcher.ClasspathMatchers getCodebase() { - return getCodeBaseMatchersAttribute(CODEBASE); + return getCodeBaseMatchersAttribute(CODEBASE, false); } /** @@ -1004,16 +1004,16 @@ return loader.checkForAttributeInJars(Arrays.asList(getResources().getJARs()), name); } - public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(String s) { - return getCodeBaseMatchersAttribute(new Attributes.Name(s)); + public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(String s, boolean includePath) { + return getCodeBaseMatchersAttribute(new Attributes.Name(s), includePath); } - public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(Attributes.Name name) { + public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(Attributes.Name name, boolean includePath) { String s = getAttribute(name); if (s == null) { return null; } - return ClasspathMatcher.ClasspathMatchers.compile(s); + return ClasspathMatcher.ClasspathMatchers.compile(s, includePath); } private ManifestBoolean processBooleanAttribute(String id) throws IllegalArgumentException { diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Mar 13 13:48:00 2014 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Mar 14 13:06:03 2014 +0100 @@ -58,6 +58,25 @@ and
\ http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html +# missing Application-Library-Allowable-Codebase dialogue +ALACAMissingMainTitle=Application {0} \ +form codebase {1} is missing the Application-Library-Allowable-Codebase attribute. \ +This application uses resources from the following remote locations:
{2} Are you sure you want to run this application? +ALACAMissingInfo=For more information you can visit:
\ + \ +http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library
\ +and
\ +http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html +# matching Application-Library-Allowable-Codebase dialogue +ALACAMatchingMainTitle=Application {0} \ +form codebase {1} is requiring valid resources from different locations:
{2}
\ +Those resources are expected to be loaded. Do you agree to run this application? +ALACAMatchingInfo=For more information you can visit:
\ + \ +http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library
\ +and
\ +http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html + # LS - Severity LSMinor=Minor LSFatal=Fatal diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 13 13:48:00 2014 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Mar 14 13:06:03 2014 +0100 @@ -92,6 +92,7 @@ import net.sourceforge.jnlp.util.ClasspathMatcher.ClasspathMatchers; import net.sourceforge.jnlp.util.JarFile; import net.sourceforge.jnlp.util.StreamUtils; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.logging.OutputController; import sun.misc.JarIndex; @@ -292,6 +293,8 @@ checkPermissionsAttribute(); + checkApplicationLibraryAllowableCodebaseAttribute(); + installShutdownHooks(); @@ -2324,6 +2327,96 @@ public boolean getRunInSandbox(); } + private void checkApplicationLibraryAllowableCodebaseAttribute() throws LaunchException { + if (signing == SigningState.NONE){ + return; /*when app is not signed at all, then skip this check*/ + } + //conditions + URL codebase = file.getCodeBase(); + URL documentBase = null; + if (file instanceof PluginBridge) { + documentBase = ((PluginBridge) file).getSourceLocation(); + } + if (documentBase == null) { + documentBase = file.getCodeBase(); + } + + //cases + Set usedUrls = new HashSet(); + URL sourceLocation = file.getSourceLocation(); + ResourcesDesc[] resourcesDescs = file.getResourcesDescs(); + if (sourceLocation != null) { + usedUrls.add(UrlUtils.removeFileName(sourceLocation)); + } + for (ResourcesDesc resourcesDesc: resourcesDescs) { + ExtensionDesc[] ex = resourcesDesc.getExtensions(); + if (ex != null) { + for ( ExtensionDesc extensionDesc: ex) { + if (extensionDesc != null) { + usedUrls.add(UrlUtils.removeFileName(extensionDesc.getLocation())); + } + } + } + JARDesc[] jars = resourcesDesc.getJARs(); + if (jars != null) { + for (JARDesc jarDesc: jars) { + if (jarDesc != null) { + usedUrls.add(UrlUtils.removeFileName(jarDesc.getLocation())); + } + } + } + JNLPFile jnlp = resourcesDesc.getJNLPFile(); + if (jnlp != null) { + usedUrls.add(UrlUtils.removeFileName(jnlp.getSourceLocation())); + } + + } + OutputController.getLogger().log("Found alaca URLs to be verified"); + for (URL url : usedUrls) { + OutputController.getLogger().log(" - " + url.toExternalForm()); + } + if (usedUrls.isEmpty()) { + //I hope this is the case, when the resources is/are + //only codebase classes. Then it should be safe to return. + OutputController.getLogger().log("The application is not using any url resources, skipping Application-Library-Allowable-Codebase Attribute check."); + return; + } + + if (usedUrls.size() == 1) { + if (UrlUtils.equalsIgnoreLastSlash(usedUrls.toArray(new URL[0])[0], codebase) + && UrlUtils.equalsIgnoreLastSlash(usedUrls.toArray(new URL[0])[0], documentBase)) { + //all resoources are from codebase or document base. it is ok to proceeed. + OutputController.getLogger().log("All applications resources (" + usedUrls.toArray(new URL[0])[0] + ") are from codebas/documentbase " + codebase + "/" + documentBase + ", skipping Application-Library-Allowable-Codebase Attribute check."); + return; + } + } + ClasspathMatchers att = file.getManifestsAttributes().getApplicationLibraryAllowableCodebase(); + + if (att == null) { + boolean a = SecurityDialogs.showMissingALACAttributePanel(file.getTitle(), documentBase, usedUrls); + if (!a) { + throw new LaunchException("The application uses non-codebase resources, has no Application-Library-Allowable-Codebase Attribute, and was blocked from running by the user"); + } else { + OutputController.getLogger().log("The application uses non-codebase resources, has no Application-Library-Allowable-Codebase Attribute, and was allowed to run by the user"); + return; + } + } else { + for (URL foundUrl : usedUrls) { + if (!att.matches(foundUrl)) { + throw new LaunchException("The resource from " + foundUrl + " does not match the location in Application-Library-Allowable-Codebase Attribute " + att + ". Blocking the application from running."); + } else { + OutputController.getLogger().log("The resource from " + foundUrl + " does match the location in Application-Library-Allowable-Codebase Attribute " + att + ". Continuing."); + } + } + } + boolean a = SecurityDialogs.showMatchingALACAttributePanel(file.getTitle(), documentBase, usedUrls); + if (!a) { + throw new LaunchException("The application uses non-codebase resources, which do match its Application-Library-Allowable-Codebase Attribute, but was blocked from running by the user." ); + } else { + OutputController.getLogger().log("The application uses non-codebase resources, which do match its Application-Library-Allowable-Codebase Attribute, and was allowed to run by the user." ); + } + } + /** * Handles security decision logic for the JNLPClassLoader, eg which permission level to assign * to JARs. diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/SecurityDialog.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Thu Mar 13 13:48:00 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Fri Mar 14 13:06:03 2014 +0100 @@ -37,6 +37,8 @@ package net.sourceforge.jnlp.security; +import net.sourceforge.jnlp.security.dialogs.MissingALACAttributePanel; +import net.sourceforge.jnlp.security.dialogs.MatchingALACAttributePanel; import net.sourceforge.jnlp.security.dialogs.MissingPermissionsAttributePanel; import net.sourceforge.jnlp.security.dialogs.AppletWarningPane; import net.sourceforge.jnlp.security.dialogs.AccessWarningPane; @@ -320,6 +322,10 @@ panel = new PasswordAuthenticationPane(this, extras); else if (dialogType == DialogType.UNSIGNED_EAS_NO_PERMISSIONS_WARNING) panel = new MissingPermissionsAttributePanel(this, (String) extras[0], (String) extras[1]); + else if (dialogType == DialogType.MISSING_ALACA) + panel = new MissingALACAttributePanel(this, (String) extras[0], (String) extras[1], (String) extras[2]); + else if (dialogType == DialogType.MATCHING_ALACA) + panel = new MatchingALACAttributePanel(this, (String) extras[0], (String) extras[1], (String) extras[2]); add(panel, BorderLayout.CENTER); } diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/SecurityDialogs.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Thu Mar 13 13:48:00 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Mar 14 13:06:03 2014 +0100 @@ -44,6 +44,7 @@ import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.Set; import java.util.concurrent.Semaphore; import javax.swing.JDialog; @@ -52,6 +53,7 @@ import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.AppTrustWarningPanel.AppSigningWarningAction; import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; @@ -80,7 +82,9 @@ UNSIGNED_WARNING, /* requires confirmation with 'high-security' setting */ APPLET_WARNING, AUTHENTICATION, - UNSIGNED_EAS_NO_PERMISSIONS_WARNING /* when Extended applet security is at High Security and no permission attribute is find, */ + UNSIGNED_EAS_NO_PERMISSIONS_WARNING, /* when Extended applet security is at High Security and no permission attribute is find, */ + MISSING_ALACA, /*alaca - Application-Library-Allowable-Codebase Attribute*/ + MATCHING_ALACA } /** The types of access which may need user permission. */ @@ -263,6 +267,32 @@ return (Object[]) response; } + public static boolean showMissingALACAttributePanel(String title, URL codeBase, Set remoteUrls) { + + if (!shouldPromptUser()) { + return false; + } + + SecurityDialogMessage message = new SecurityDialogMessage(); + message.dialogType = DialogType.MISSING_ALACA; + message.extras = new Object[]{title, codeBase.toString(), UrlUtils.setOfUrlsToHtmlList(remoteUrls)}; + Object selectedValue = getUserResponse(message); + return getIntegerResponseAsBoolean(selectedValue); + } + + public static boolean showMatchingALACAttributePanel(String title, URL codeBase, Set remoteUrls) { + + if (!shouldPromptUser()) { + return false; + } + + SecurityDialogMessage message = new SecurityDialogMessage(); + message.dialogType = DialogType.MATCHING_ALACA; + message.extras = new Object[]{title, codeBase.toString(), UrlUtils.setOfUrlsToHtmlList(remoteUrls)}; + Object selectedValue = getUserResponse(message); + return getIntegerResponseAsBoolean(selectedValue); + } + /** * FIXME This is unused. Remove it? * @return (0, 1, 2) => (Yes, No, Cancel) @@ -417,5 +447,5 @@ } }); } - + } diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java Fri Mar 14 13:06:03 2014 +0100 @@ -0,0 +1,165 @@ +/* + Copyright (C) 2008 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.security.dialogs; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Desktop; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Image; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; +import javax.imageio.ImageIO; + +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JEditorPane; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingConstants; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; +import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.security.SecurityDialog; +import net.sourceforge.jnlp.util.UrlUtils; +import net.sourceforge.jnlp.util.logging.OutputController; + +/** + * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library + */ +public class MatchingALACAttributePanel extends SecurityDialogPanel { + + public MatchingALACAttributePanel(SecurityDialog x, String title, String codebase, String remoteUrls) { + super(x); + try { + addComponents(title, codebase, remoteUrls); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + if (x != null) { + x.setMinimumSize(new Dimension(600, 400)); + } + } + + protected final void addComponents(String title, String codebase, String remoteUrls) throws IOException { + + URL imgUrl = this.getClass().getResource("/net/sourceforge/jnlp/resources/question.png"); + ImageIcon icon; + Image img = ImageIO.read(imgUrl); + icon = new ImageIcon(img); + String topLabelText = Translator.R("ALACAMatchingMainTitle", title, codebase, remoteUrls); + String bottomLabelText = Translator.R("ALACAMatchingInfo"); + + JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.CENTER); + topLabel.setFont(new Font(topLabel.getFont().toString(), + Font.BOLD, 12)); + JPanel topPanel = new JPanel(new BorderLayout()); + topPanel.setBackground(Color.WHITE); + topPanel.add(topLabel, BorderLayout.CENTER); + topPanel.setPreferredSize(new Dimension(400, 80)); + topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + JEditorPane bottomLabel = new JEditorPane("text/html", htmlWrap(bottomLabelText)); + bottomLabel.setEditable(false); + bottomLabel.addHyperlinkListener(new HyperlinkListener() { + @Override + public void hyperlinkUpdate(HyperlinkEvent e) { + try { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + Desktop.getDesktop().browse(e.getURL().toURI()); + } + } catch (IOException ex) { + OutputController.getLogger().log(ex); + } catch (URISyntaxException ex) { + OutputController.getLogger().log(ex); + } + } + }); + JPanel infoPanel = new JPanel(new BorderLayout()); + infoPanel.add(bottomLabel, BorderLayout.CENTER); + infoPanel.setPreferredSize(new Dimension(400, 80)); + infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + bottomLabel.setBackground(infoPanel.getBackground()); + + //run and cancel buttons + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + + JButton yes = new JButton(Translator.R("ButYes")); + JButton no = new JButton(Translator.R("ButNo")); + JCheckBox remeber = new JCheckBox(htmlWrap(Translator.R("SRememberOption"))); + int buttonWidth = yes.getMinimumSize().width; + int buttonHeight = yes.getMinimumSize().height; + Dimension d = new Dimension(buttonWidth, buttonHeight); + yes.setPreferredSize(d); + no.setPreferredSize(d); + yes.addActionListener(createSetValueListener(parent, 0)); + no.addActionListener(createSetValueListener(parent, 1)); + initialFocusComponent = no; + buttonPanel.add(remeber); + buttonPanel.add(yes); + buttonPanel.add(no); + buttonPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + //all of the above + setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); + add(topPanel); + add(infoPanel); + add(buttonPanel); + + } + + public static void main(String[] args) throws MalformedURLException { + Set s = new HashSet(); + s.add(new URL("http:/blah.com/blah")); + s.add(new URL("http:/blah.com/blah/blah")); + MatchingALACAttributePanel w = new MatchingALACAttributePanel(null, "HelloWorld", "http://nbblah.url", UrlUtils.setOfUrlsToHtmlList(s)); + JFrame f = new JFrame(); + f.setSize(600, 400); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.add(w, BorderLayout.CENTER); + f.setVisible(true); + } +} diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Fri Mar 14 13:06:03 2014 +0100 From jvanek at redhat.com Fri Mar 14 13:24:06 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 14 Mar 2014 14:24:06 +0100 Subject: [rfc][icedtea-web] implemented Application-Library-Allowable-Codebase Attribute In-Reply-To: <53220181.4050603@redhat.com> References: <530F71CF.4040207@redhat.com> <53173C78.5050204@redhat.com> <531F632F.1000005@redhat.com> <5321FC56.3070606@redhat.com> <53220181.4050603@redhat.com> Message-ID: <532302F6.7050200@redhat.com> On 03/13/2014 08:05 PM, Andrew Azores wrote: > On 03/13/2014 02:43 PM, Andrew Azores wrote: >> On 03/11/2014 03:25 PM, Jiri Vanek wrote: >>> All your nits have been fixed. However: >>> >>> I'm still not using the AppTrustWarningPanel, so rember button is useless. It will come as >>> another changeset (if ever) >>> - this patch broke elluminate - one of the deadly throws is probably redundant and should be >>> repalced by security prompt. >> >> Not okay to push if elluminate is broken by this... have you figured out what to do about it? >> >>> - jsut hint - download indicator is broken >>> - elluminat works, but freaze to, same as http://www.walter-fendt.de/ph14e/resultant.htm >>> >>> I guess all above are older issues not related to this patch. >>> >>> >>> J. >>> >> >> Thanks, >> > > Apparently it was just a broken cache problem. Elluminate does work. > > One nit was left unfixed: > >> + URL documentBase = null; >> + if (file instanceof PluginBridge) { >> + documentBase = ((PluginBridge) file).getSourceLocation(); >> + } >> + if (documentBase == null) { >> + documentBase = file.getCodeBase(); >> + } > I have kept it as it was. I think there can be state, when (PluginBridge) file).getSourceLocation() will really remian null. But codebase is never null. J. From jvanek at redhat.com Fri Mar 14 13:33:49 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 14 Mar 2014 14:33:49 +0100 Subject: [rfc][icedtea-web][policyeditor] Checkboxes not updating In-Reply-To: <5322074F.9030703@redhat.com> References: <5322074F.9030703@redhat.com> Message-ID: <5323053D.3040607@redhat.com> On 03/13/2014 08:30 PM, Andrew Azores wrote: > Hi, > > This patch ensures that operations which should be done by the EDT are actually done by it, and also > ensures that when a new codebase is added/selected, that the checkboxes properly update the first > time around, without needing to select a different codebase and go back. > > ChangeLog: > * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (addNewCodebase) ensure that > checkboxes update. (removeCodebase, updateCheckboxes) ensure UI updates are done on EDT. > > Thanks, > This should be ok to go. J. From aazores at icedtea.classpath.org Fri Mar 14 13:40:06 2014 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Fri, 14 Mar 2014 13:40:06 +0000 Subject: /hg/icedtea-web: PolicyEditor fix checkbox UI updating on open Message-ID: changeset fdff61a60cc1 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fdff61a60cc1 author: Andrew Azores date: Fri Mar 14 09:39:56 2014 -0400 PolicyEditor fix checkbox UI updating on open * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (addNewCodebase) ensure that checkboxes update. (removeCodebase, updateCheckboxes) ensure UI updates are done on EDT. diffstat: ChangeLog | 6 + netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 83 ++++++--- 2 files changed, 59 insertions(+), 30 deletions(-) diffs (123 lines): diff -r aba4c18c4c64 -r fdff61a60cc1 ChangeLog --- a/ChangeLog Fri Mar 14 13:06:03 2014 +0100 +++ b/ChangeLog Fri Mar 14 09:39:56 2014 -0400 @@ -1,3 +1,9 @@ +2014-03-14 Andrew Azores + + * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: + (addNewCodebase) ensure that checkboxes update. (removeCodebase, + updateCheckboxes) ensure UI updates are done on EDT. + 2014-03-14 Jiri Vanek Base implementation of Application-Library-Allowable-Codebase. Remember diff -r aba4c18c4c64 -r fdff61a60cc1 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java --- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Fri Mar 14 13:06:03 2014 +0100 +++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Fri Mar 14 09:39:56 2014 -0400 @@ -478,10 +478,21 @@ model = codebase; } if (!existingCodebase) { - listModel.addElement(model); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + listModel.addElement(model); + } + }); changesMade = true; } - list.setSelectedValue(model, true); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + list.setSelectedValue(model, true); + updateCheckboxes(codebase); + } + }); } /** @@ -545,8 +556,14 @@ previousIndex = 0; } codebasePermissionsMap.remove(codebase); - listModel.removeElement(codebase); - list.setSelectedIndex(previousIndex); + final int fIndex = previousIndex; + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + listModel.removeElement(codebase); + list.setSelectedIndex(fIndex); + } + }); changesMade = true; } @@ -592,33 +609,39 @@ * @param codebase whose permissions to display */ private void updateCheckboxes(final String codebase) { - for (final PolicyEditorPermissions perm : PolicyEditorPermissions.values()) { - final JCheckBox box = checkboxMap.get(perm); - for (final ActionListener l : box.getActionListeners()) { - box.removeActionListener(l); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + for (final PolicyEditorPermissions perm : PolicyEditorPermissions.values()) { + final JCheckBox box = checkboxMap.get(perm); + for (final ActionListener l : box.getActionListeners()) { + box.removeActionListener(l); + } + initializeMapForCodebase(codebase); + final Map map = codebasePermissionsMap.get(codebase); + final boolean state; + if (map != null) { + final Boolean s = map.get(perm); + if (s != null) { + state = s; + } else { + state = false; + } + } else { + state = false; + } + box.setSelected(state); + box.addActionListener(new ActionListener() { + @Override + public void actionPerformed(final ActionEvent e) { + changesMade = true; + map.put(perm, box.isSelected()); + } + }); + } } - initializeMapForCodebase(codebase); - final Map map = codebasePermissionsMap.get(codebase); - final boolean state; - if (map != null) { - final Boolean s = map.get(perm); - if (s != null) { - state = s; - } else { - state = false; - } - } else { - state = false; - } - box.setSelected(state); - box.addActionListener(new ActionListener() { - @Override - public void actionPerformed(final ActionEvent e) { - changesMade = true; - map.put(perm, box.isSelected()); - } - }); - } + }); + } /** From jvanek at redhat.com Fri Mar 14 14:34:06 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 14 Mar 2014 15:34:06 +0100 Subject: [rfc][icedtea-web] Launching PolicyEditor from CertWarningPane In-Reply-To: <53220A02.7090506@redhat.com> References: <53220215.60301@redhat.com> <53220A02.7090506@redhat.com> Message-ID: <5323135E.6070700@redhat.com> On 03/13/2014 08:41 PM, Andrew Azores wrote: > On 03/13/2014 03:08 PM, Andrew Azores wrote: >> Hi, >> >> This patch adds a button which summons a popup menu, currently with only one item, allowing the >> user to launch PolicyEditor directly from the warning dialog. The editor appears with the current >> applet's codebase added (if necessary) and pre-selected. This, along with the sandbox button and >> earlier patch allowing JNLPPolicy to use per-codebase policy entries and to reload at runtime, >> allows for easy configuration of fine grained permissions granted to an applet. >> >> Feedback/recommendations on the UI here are definitely welcome. At a later point, extra items will >> be added to the popup menu to allow for "this run only" temporary permissions to be granted to the >> applet. These choices will have to use a different mechanism for adding the permissions, however, >> since it won't be automatically handled by the JNLPPolicy/automatically reloaded by >> SecurityDelegate, as the policy file permissions are. (note the conspicuous lack of any code here >> to actually force a policy reload - this is already handled by the sandbox button and >> SecurityDelegate) >> >> Note that there is a visual bug with PolicyEditor where the checkboxes may not be updated >> correctly, and will be incorrectly blank when the currently selected codebase actually does have >> permissions assigned. This will be addressed separately. As a workaround, simply switch to "All >> applets" codebase, then back to the applet-specific one. The checkboxes will then correctly update. >> >> http://caff.de/applettest/Signed.html can serve as a test applet again. >> >> ChangeLog: >> Add button with popup menu to launch PolicyEditor >> * netx/net/sourceforge/jnlp/resources/Messages.properties: (ButPolicyEditorDropdown, >> CertWarnPolicyTip, CertWarnPolicyEditorItem): new messages >> * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: (addComponents, >> setTextAndLabels, addButtons) refactored and split methods. (createPolicyPermissionsMenu) new >> method. (PolicyEditorLaunchListener) new ActionListener for advancedOptions button >> >> Thanks, >> > > Sorry, tiny update here. I noticed that there was a small "deadspot" in the middle of the new > button, which was apparently the popupmenu component, as clicking it caused PolicyEditor to appear. > It seems this was because the menu was added as a child component of the button. Adding the > component to the pane itself, which is the only change between this new patch and the previous one, > resolves this. The popup menu still appears in the same place and works fine as far as I can tell. > > Is there some better way to handle JPopupMenus? > > Thanks, > many import issues. Invaid(how comae? My wrong I guess) and especially unused imports. I gave up an code a bit O:). So user experience: popupmenu - best handling is NOT to add as component. And do not show them in actionPerforemd. Show them *without* parent, in mause Clicked - it have positionOnScreen, and you show the poup menu on this pposition. Should work like charm. I would excude this "V" from pproperties. Also the button s quote wide. Maybe use image rather? Interesting state - dialog appeared , I clicked "V" clicked show policy editor, it apeared, I clicked cancel in mian dilog/or ok in main dialog.. The editro should be modal How does it behave for yes/no/cancel/close of policy editor? - small nit - other codebases in editor are confusing. Thanx! J. From jvanek at redhat.com Fri Mar 14 14:34:43 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 14 Mar 2014 15:34:43 +0100 Subject: [rfc][icedtea-web] New PartiallySigned Dialog In-Reply-To: <531DE32B.90300@redhat.com> References: <53164E8D.90101@redhat.com> <53189FFA.3000404@redhat.com> <531DE32B.90300@redhat.com> Message-ID: <53231383.2050402@redhat.com> On 03/10/2014 05:07 PM, Andrew Azores wrote: > On 03/06/2014 11:19 AM, Jiri Vanek wrote: >> On 03/04/2014 11:07 PM, Andrew Azores wrote: >>> Hi, >>> >>> This patch introduces a new PartiallySigned dialog to replace the NotAllSigned prompt. This new >>> dialog uses the same abstracted parent class that was pulled out of the Unsigned dialog, so it >>> uses the same remembered action storage and has the same general look and feel. This dialog also >>> has a Sandbox button, just like CertWarningPane recently gained for fully signed applets, which >>> allows partially signed ones to also be run with only sandbox permissions. Some more security >>> info is also present on the dialog, eg the applet's publisher and codebase. Not yet included is a >>> new Help text for this dialog, but this can be written up separately IMO. Right now it will just >>> display the same Help as the Unsigned dialog. >>> many import issues. Invaid(how comae? My wrong I guess) and especially unused imports. I gave up an code a bit O:). And user experience is quite good. Will this get custom policies too? Othervise ok to go. From aazores at redhat.com Fri Mar 14 14:41:07 2014 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Mar 2014 10:41:07 -0400 (EDT) Subject: [rfc][icedtea-web] New PartiallySigned Dialog In-Reply-To: <53231383.2050402@redhat.com> References: <53164E8D.90101@redhat.com> <53189FFA.3000404@redhat.com> <531DE32B.90300@redhat.com> <53231383.2050402@redhat.com> Message-ID: <635654798.4133357.1394808067678.JavaMail.zimbra@redhat.com> Yes, a custom policy button will be coming too. Thanks, Andrew A ----- Original Message ----- From: "Jiri Vanek" To: "Andrew Azores" Cc: "IcedTea" Sent: Friday, March 14, 2014 10:34:43 AM Subject: Re: [rfc][icedtea-web] New PartiallySigned Dialog On 03/10/2014 05:07 PM, Andrew Azores wrote: > On 03/06/2014 11:19 AM, Jiri Vanek wrote: >> On 03/04/2014 11:07 PM, Andrew Azores wrote: >>> Hi, >>> >>> This patch introduces a new PartiallySigned dialog to replace the NotAllSigned prompt. This new >>> dialog uses the same abstracted parent class that was pulled out of the Unsigned dialog, so it >>> uses the same remembered action storage and has the same general look and feel. This dialog also >>> has a Sandbox button, just like CertWarningPane recently gained for fully signed applets, which >>> allows partially signed ones to also be run with only sandbox permissions. Some more security >>> info is also present on the dialog, eg the applet's publisher and codebase. Not yet included is a >>> new Help text for this dialog, but this can be written up separately IMO. Right now it will just >>> display the same Help as the Unsigned dialog. >>> many import issues. Invaid(how comae? My wrong I guess) and especially unused imports. I gave up an code a bit O:). And user experience is quite good. Will this get custom policies too? Othervise ok to go. From aazores at icedtea.classpath.org Fri Mar 14 14:50:38 2014 From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org) Date: Fri, 14 Mar 2014 14:50:38 +0000 Subject: /hg/icedtea-web: New PartiallySigned Dialog Message-ID: changeset 15bbdf43c1e7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=15bbdf43c1e7 author: Andrew Azores date: Fri Mar 14 10:50:15 2014 -0400 New PartiallySigned Dialog Added new PartiallySigned Dialog to replace NotAllSignedWarningPane. Also includes a Sandbox button. * netx/net/sourceforge/jnlp/resources/Messages.properties: (APPEXTSecunsignedAppletActionSandbox, LPartiallySignedApplet, LPartiallySignedAppletUserDenied) new messages. (SNotAllSignedSummary, SNotAllSignedDetail, SNotAllSignedQuestion) keys renamed to SPartially* * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: (SNotAllSignedSummary, SNotAllSignedDetail, SNotAllSignedQuestion) keys renamed to SPartially* * netx/net/sourceforge/jnlp/resources/Messages_de.properties: same * netx/net/sourceforge/jnlp/resources/Messages_pl.properties: same * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Logic added for displaying new PartiallySigned dialog. (showNotAllSignedDialog) removed. (getSigningState) new method. (promptUserOnPartialSigning, userPromptedForPartialSigning) new methods for SecurityDelegate. * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningDialog.java: (partiallySigned) new method * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java: (chosenActionSetter) refactored to allow Sandbox action. (setupInfoPanel) applet title made overrideable by subclasses * netx/net/sourceforge/jnlp/security/SecurityDialog.java: (NOTALLSIGNED_WARNING) renamed PARTIALLYSIGNED_WARNING, display new dialog rather than old * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: (NOTALLSIGNED_WARNING) renamed PARTIALLYSIGNED_WARNING. (showNotAllSignedWarningDialog) removed. (showPartiallySignedWarningDialog) new method * netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java: Added Sandbox action * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: (checkPartiallySignedWithUserIfRequired) new method * tests/reproducers/custom/SignedAppletCodebaseLoading/testcases/SignedAppletCodebaseLoadingTests.java: test now passes since dialog will not appear if applet security is set to Low. KnownToFail removed. * tests/reproducers/custom/SignedAppletExternalMainClass/testcases/SignedAppletExternalMainClassTest.java: same * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java: new class * netx/net/sourceforge/jnlp/security/dialogs/NotAllSignedWarningPane.java: deleted in favour of PartiallySignedAppTrustWarningPanel diffstat: ChangeLog | 41 ++ netx/net/sourceforge/jnlp/resources/Messages.properties | 9 +- netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 6 +- netx/net/sourceforge/jnlp/resources/Messages_de.properties | 6 +- netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 6 +- netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 53 ++- netx/net/sourceforge/jnlp/security/SecurityDialog.java | 55 +-- netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 43 +- netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java | 8 +- netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java | 50 +++ netx/net/sourceforge/jnlp/security/dialogs/NotAllSignedWarningPane.java | 115 -------- netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningDialog.java | 6 + netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java | 27 +- netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java | 140 ++++++++++ tests/reproducers/custom/SignedAppletCodebaseLoading/testcases/SignedAppletCodebaseLoadingTests.java | 3 - tests/reproducers/custom/SignedAppletExternalMainClass/testcases/SignedAppletExternalMainClassTest.java | 3 - 16 files changed, 350 insertions(+), 221 deletions(-) diffs (truncated from 919 to 500 lines): diff -r fdff61a60cc1 -r 15bbdf43c1e7 ChangeLog --- a/ChangeLog Fri Mar 14 09:39:56 2014 -0400 +++ b/ChangeLog Fri Mar 14 10:50:15 2014 -0400 @@ -1,3 +1,44 @@ +2014-03-14 Andrew Azores + + Added new PartiallySigned Dialog to replace NotAllSignedWarningPane. + Also includes a Sandbox button. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + (APPEXTSecunsignedAppletActionSandbox, LPartiallySignedApplet, + LPartiallySignedAppletUserDenied) new messages. (SNotAllSignedSummary, + SNotAllSignedDetail, SNotAllSignedQuestion) keys renamed to SPartially* + * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: (SNotAllSignedSummary, + SNotAllSignedDetail, SNotAllSignedQuestion) keys renamed to SPartially* + * netx/net/sourceforge/jnlp/resources/Messages_de.properties: same + * netx/net/sourceforge/jnlp/resources/Messages_pl.properties: same + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: + Logic added for displaying new PartiallySigned dialog. + (showNotAllSignedDialog) removed. (getSigningState) new method. + (promptUserOnPartialSigning, userPromptedForPartialSigning) new methods for + SecurityDelegate. + * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningDialog.java: + (partiallySigned) new method + * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java: + (chosenActionSetter) refactored to allow Sandbox action. (setupInfoPanel) applet + title made overrideable by subclasses + * netx/net/sourceforge/jnlp/security/SecurityDialog.java: (NOTALLSIGNED_WARNING) + renamed PARTIALLYSIGNED_WARNING, display new dialog rather than old + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: (NOTALLSIGNED_WARNING) + renamed PARTIALLYSIGNED_WARNING. (showNotAllSignedWarningDialog) removed. + (showPartiallySignedWarningDialog) new method + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java: + Added Sandbox action + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: + (checkPartiallySignedWithUserIfRequired) new method + * tests/reproducers/custom/SignedAppletCodebaseLoading/testcases/SignedAppletCodebaseLoadingTests.java: + test now passes since dialog will not appear if applet security is set to Low. + KnownToFail removed. + * tests/reproducers/custom/SignedAppletExternalMainClass/testcases/SignedAppletExternalMainClassTest.java: + same + * netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java: + new class + * netx/net/sourceforge/jnlp/security/dialogs/NotAllSignedWarningPane.java: deleted + in favour of PartiallySignedAppTrustWarningPanel + 2014-03-14 Andrew Azores * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Mar 14 10:50:15 2014 -0400 @@ -127,6 +127,8 @@ LUnsignedApplet=The applet was unsigned. LUnsignedAppletPolicyDenied=The applet was unsigned, and the security policy prevented it from running. LUnsignedAppletUserDenied=The applet was unsigned, and was not trusted. +LPartiallySignedApplet=The applet was partially signed. +LPartiallySignedAppletUserDenied=The applet was partially signed, and the user did not trust it. LSignedAppJarUsingUnsignedJar=Signed application using unsigned jars. LSignedAppJarUsingUnsignedJarInfo=The main application jar is signed, but some of the jars it is using aren't. LRunInSandboxError=Run in Sandbox call performed too late. @@ -291,9 +293,9 @@ SUnsignedAllowedBefore=You have accepted this applet previously. SUnsignedRejectedBefore=You have rejected this applet previously. SUnsignedQuestion=Allow the applet to run? -SNotAllSignedSummary=Only parts of this application code are signed. -SNotAllSignedDetail=This application contains both signed and unsigned code. While signed code is safe if you trust the provider, unsigned code may imply code outside of the trusted provider's control. -SNotAllSignedQuestion=Do you wish to proceed and run this application anyway? +SPartiallySignedSummary=Only parts of this application code are signed. +SPartiallySignedDetail=This application contains both signed and unsigned code. While signed code is safe if you trust the provider, unsigned code may imply code outside of the trusted provider's control. +SPartiallySignedQuestion=Do you wish to proceed and run this application anyway? SAuthenticationPrompt=The {0} server at {1} is requesting authentication. It says "{2}" SJNLPFileIsNotSigned=This application contains a digital signature in which the launching JNLP file is not signed. SAppletTitle=Applet title: {0} @@ -755,6 +757,7 @@ APPEXTSECunsignedAppletActionAlways=Always trust this (matching) applet(s) APPEXTSECunsignedAppletActionNever=Never trust this (matching) applet(s) APPEXTSECunsignedAppletActionYes=This applet was visited and allowed +APPEXTSecunsignedAppletActionSandbox=This applet was visited and allowed to run with restricted privileges APPEXTSECunsignedAppletActionNo=This applet was visited and denied APPEXTSECControlPanelExtendedAppletSecurityTitle=Extended applet security APPEXTSECguiTableModelTableColumnAction=Action diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/resources/Messages_cs.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Mar 14 10:50:15 2014 -0400 @@ -232,9 +232,9 @@ SUnsignedAllowedBefore=Tento applet jste ji\u017e d\u0159\u00edve povolili. SUnsignedRejectedBefore=Tento applet jste ji\u017e d\u0159\u00edve odm\u00edtli. SUnsignedQuestion=Povolit spu\u0161t\u011bn\u00ed appletu? -SNotAllSignedSummary=Podeps\u00e1ny jsou jen \u010d\u00e1sti k\u00f3du t\u00e9to aplikace. -SNotAllSignedDetail=Tato aplikace obsahuje podepsan\u00fd i nepodepsan\u00fd k\u00f3d. Podepsan\u00fd k\u00f3d je bezpe\u010dn\u00fd, pokud d\u016fv\u011b\u0159ujete poskytovateli tohoto k\u00f3du. Nepodepsan\u00e9 \u010d\u00e1sti mohou obsahovat k\u00f3d, kter\u00fd nen\u00ed pod kontrolou d\u016fv\u011bryhodn\u00e9ho poskytovatele. -SNotAllSignedQuestion=Chcete p\u0159esto pokra\u010dovat a spustit aplikaci? +SPartiallySignedSummary=Podeps\u00e1ny jsou jen \u010d\u00e1sti k\u00f3du t\u00e9to aplikace. +SPartiallySignedDetail=Tato aplikace obsahuje podepsan\u00fd i nepodepsan\u00fd k\u00f3d. Podepsan\u00fd k\u00f3d je bezpe\u010dn\u00fd, pokud d\u016fv\u011b\u0159ujete poskytovateli tohoto k\u00f3du. Nepodepsan\u00e9 \u010d\u00e1sti mohou obsahovat k\u00f3d, kter\u00fd nen\u00ed pod kontrolou d\u016fv\u011bryhodn\u00e9ho poskytovatele. +SPartiallySignedQuestion=Chcete p\u0159esto pokra\u010dovat a spustit aplikaci? SAuthenticationPrompt=Server {0} na adrese {1} vy\u017eaduje ov\u011b\u0159en\u00ed. Zpr\u00e1va: \u201e{2}\u201c SJNLPFileIsNotSigned=Tato aplikace obsahuje digit\u00e1ln\u00ed podpis, v r\u00e1mci kter\u00e9ho v\u0161ak nen\u00ed podeps\u00e1n spou\u0161t\u011bn\u00fd soubor JNLP. diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/resources/Messages_de.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties Fri Mar 14 10:50:15 2014 -0400 @@ -244,9 +244,9 @@ SUnsignedAllowedBefore=Dieses Applet wurde bereits akzeptiert. SUnsignedRejectedBefore=Dieses Applet wurde bereits abgelehnt. SUnsignedQuestion=Soll dem Applet die Ausf\u00fchrung erlaubt werden? -SNotAllSignedSummary=Nur Teile des Anwendungscodes sind signiert. -SNotAllSignedDetail=Diese Anwendung enth\u00e4lt sowohl signierten als auch nicht signierten Code. W\u00e4hrend signierter Code sicher ist, wenn Sie dem Anbieter vertrauen, kann nicht signierter Code sich \u00fcber Code erstrecken, der sich der Kontrolle des Anbieters entzieht. -SNotAllSignedQuestion=Soll fortgefahren und diese Anwendung dennoch zur Ausf\u00fchrung gebracht werden? +SPartiallySignedSummary=Nur Teile des Anwendungscodes sind signiert. +SPartiallySignedDetail=Diese Anwendung enth\u00e4lt sowohl signierten als auch nicht signierten Code. W\u00e4hrend signierter Code sicher ist, wenn Sie dem Anbieter vertrauen, kann nicht signierter Code sich \u00fcber Code erstrecken, der sich der Kontrolle des Anbieters entzieht. +SPartiallySignedQuestion=Soll fortgefahren und diese Anwendung dennoch zur Ausf\u00fchrung gebracht werden? SAuthenticationPrompt=Der Server {0} von {1} fordert Authentifizierung an. Er sagt: \u201e{2}\u201c SJNLPFileIsNotSigned=Die Anwendung enth\u00e4lt eine digitale Signatur in der, die startende JNLP-Datei nicht signiert ist. diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/resources/Messages_pl.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Fri Mar 14 10:50:15 2014 -0400 @@ -244,9 +244,9 @@ SUnsignedAllowedBefore=Zaakceptowa\u0142e\u015b ten applet poprzednio. SUnsignedRejectedBefore=Odrzuci\u0142e\u015b ten applet poprzednio. SUnsignedQuestion=Czy chcesz zezwoli\u0107 temu applet-owi na uruchomienie? -SNotAllSignedSummary=Zaledwie cz\u0119\u015bci kodu tej aplikacji s\u0105 podpisane. -SNotAllSignedDetail=Ta aplikacja zawiera zar\u00f3wno podpisany jak i niepodpisany kod. Cho\u0107 kod, kt\u00f3ry jest podpisany przez zaufanego dostawc\u0119 jest bezpieczny, niepodpisany kod mo\u017ce poci\u0105ga\u0107 za sob\u0105 kod, kt\u00f3ry jest poza kontrolnym zasi\u0119giem zaufanego dostawcy. -SNotAllSignedQuestion=Czy chcesz kontynuowa\u0107 i mimo to uruchomi\u0107 t\u0105 aplikacj\u0119? +SPartiallySignedSummary=Zaledwie cz\u0119\u015bci kodu tej aplikacji s\u0105 podpisane. +SPartiallySignedDetail=Ta aplikacja zawiera zar\u00f3wno podpisany jak i niepodpisany kod. Cho\u0107 kod, kt\u00f3ry jest podpisany przez zaufanego dostawc\u0119 jest bezpieczny, niepodpisany kod mo\u017ce poci\u0105ga\u0107 za sob\u0105 kod, kt\u00f3ry jest poza kontrolnym zasi\u0119giem zaufanego dostawcy. +SPartiallySignedQuestion=Czy chcesz kontynuowa\u0107 i mimo to uruchomi\u0107 t\u0105 aplikacj\u0119? SAuthenticationPrompt=Serwer {0} w \u201e{1}\u201d \u017c\u0105da uwierzytelnienia. Podaje komunikat: \u201e{2}\u201d SJNLPFileIsNotSigned=Ta aplikacja zawiera podpis cyfrowy, jednak startowany plik JNLP jest bez podpisu. diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Mar 14 10:50:15 2014 -0400 @@ -15,7 +15,6 @@ package net.sourceforge.jnlp.runtime; -import net.sourceforge.jnlp.JNLPFile.ManifestBoolean; import static net.sourceforge.jnlp.runtime.Translator.R; import java.io.File; @@ -65,6 +64,7 @@ import net.sourceforge.jnlp.ExtensionDesc; import net.sourceforge.jnlp.JARDesc; import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.JNLPFile.ManifestBoolean; import net.sourceforge.jnlp.JNLPMatcher; import net.sourceforge.jnlp.JNLPMatcherException; import net.sourceforge.jnlp.LaunchDesc; @@ -365,7 +365,9 @@ // the user was already shown a CertWarning dialog and has chosen to run the applet sandboxed. // This means they've already agreed to running the applet and have specified with which // permission level to do it! - if (!loader.getSigning() && !loader.securityDelegate.userPromptedForSandbox() && file instanceof PluginBridge) { + if (loader.getSigningState() == SigningState.PARTIAL) { + loader.securityDelegate.promptUserOnPartialSigning(); + } else if (!loader.getSigning() && !loader.securityDelegate.userPromptedForSandbox() && file instanceof PluginBridge) { UnsignedAppletTrustConfirmation.checkUnsignedWithUserIfRequired((PluginBridge)file); } @@ -374,10 +376,9 @@ JNLPClassLoader extLoader = uniqueKeyToLoader.get(uniqueKey); if (extLoader != null && extLoader != loader) { - if (loader.getSigning() && !extLoader.getSigning()) - if (!SecurityDialogs.showNotAllSignedWarningDialog(file)) - throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); - + if (loader.getSigning() != extLoader.getSigning()) { + loader.securityDelegate.promptUserOnPartialSigning(); + } loader.merge(extLoader); extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used } @@ -1055,7 +1056,7 @@ return; } - if (jcv.isFullySigned() && !jcv.getAlreadyTrustPublisher()) { + if (getSigningState() == SigningState.FULL && jcv.isFullySigned() && !jcv.getAlreadyTrustPublisher()) { jcv.checkTrustWithUser(securityDelegate, file); } } @@ -1077,21 +1078,6 @@ } /** - * Display a dialog prompting the user to proceed on applets with mixed signing. - * @param file the JNLPFile or PluginBridge describing the applet/application to be launched - * @throws LaunchException if the user does not approve the prompt - */ - private void showNotAllSignedDialog(JNLPFile file) throws LaunchException { - if (JNLPRuntime.isTrustAll()) { - return; - } - - if (!SecurityDialogs.showNotAllSignedWarningDialog(file)) { - throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); - } - } - - /** * Add applet's codebase URL. This allows compatibility with * applets that load resources from their codebase instead of * through JARs, but can slow down resource loading. Resources @@ -1921,7 +1907,7 @@ if (signing == SigningState.FULL && JNLPRuntime.isVerifying()) { signing = SigningState.PARTIAL; try { - showNotAllSignedDialog(this.file); + securityDelegate.promptUserOnPartialSigning(); } catch (LaunchException e) { throw new RuntimeException("The signed applet required loading of unsigned code from the codebase, " + "which the user refused", e); @@ -1929,6 +1915,10 @@ } } + public SigningState getSigningState() { + return signing; + } + protected SecurityDesc getSecurity() { return security; } @@ -2314,6 +2304,8 @@ public static interface SecurityDelegate { public boolean isPluginApplet(); + public boolean userPromptedForPartialSigning(); + public boolean userPromptedForSandbox(); public SecurityDesc getCodebaseSecurityDesc(final JARDesc jarDesc, final String codebaseHost); @@ -2322,6 +2314,8 @@ public SecurityDesc getJarPermissions(final String codebaseHost); + public void promptUserOnPartialSigning() throws LaunchException; + public void setRunInSandbox() throws LaunchException; public boolean getRunInSandbox(); @@ -2424,6 +2418,7 @@ public static class SecurityDelegateImpl implements SecurityDelegate { private final JNLPClassLoader classLoader; private boolean runInSandbox; + private boolean promptedForPartialSigning; private boolean promptedForSandbox; public SecurityDelegateImpl(final JNLPClassLoader classLoader) { @@ -2530,10 +2525,22 @@ this.runInSandbox = true; } + public void promptUserOnPartialSigning() throws LaunchException { + if (promptedForPartialSigning || JNLPRuntime.isTrustAll()) { + return; + } + promptedForPartialSigning = true; + UnsignedAppletTrustConfirmation.checkPartiallySignedWithUserIfRequired(this, classLoader.file, classLoader.jcv); + } + public boolean getRunInSandbox() { return this.runInSandbox; } + public boolean userPromptedForPartialSigning() { + return this.promptedForPartialSigning; + } + public boolean userPromptedForSandbox() { return this.promptedForSandbox; } diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/security/SecurityDialog.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Fri Mar 14 10:50:15 2014 -0400 @@ -37,35 +37,34 @@ package net.sourceforge.jnlp.security; -import net.sourceforge.jnlp.security.dialogs.MissingALACAttributePanel; -import net.sourceforge.jnlp.security.dialogs.MatchingALACAttributePanel; -import net.sourceforge.jnlp.security.dialogs.MissingPermissionsAttributePanel; -import net.sourceforge.jnlp.security.dialogs.AppletWarningPane; -import net.sourceforge.jnlp.security.dialogs.AccessWarningPane; -import net.sourceforge.jnlp.security.dialogs.NotAllSignedWarningPane; -import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.UnsignedAppletTrustWarningDialog; -import net.sourceforge.jnlp.security.dialogs.PasswordAuthenticationPane; -import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel; -import net.sourceforge.jnlp.security.dialogs.CertWarningPane; -import net.sourceforge.jnlp.security.dialogs.SingleCertInfoPane; -import net.sourceforge.jnlp.security.dialogs.CertsInfoPane; -import net.sourceforge.jnlp.security.dialogs.MoreInfoPane; +import java.awt.BorderLayout; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.security.cert.X509Certificate; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.swing.JDialog; + import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.security.SecurityDialogs.AccessType; import net.sourceforge.jnlp.security.SecurityDialogs.DialogType; +import net.sourceforge.jnlp.security.dialogs.AccessWarningPane; +import net.sourceforge.jnlp.security.dialogs.AppletWarningPane; +import net.sourceforge.jnlp.security.dialogs.CertWarningPane; +import net.sourceforge.jnlp.security.dialogs.CertsInfoPane; +import net.sourceforge.jnlp.security.dialogs.MatchingALACAttributePanel; +import net.sourceforge.jnlp.security.dialogs.MissingALACAttributePanel; +import net.sourceforge.jnlp.security.dialogs.MissingPermissionsAttributePanel; +import net.sourceforge.jnlp.security.dialogs.MoreInfoPane; +import net.sourceforge.jnlp.security.dialogs.PasswordAuthenticationPane; +import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel; +import net.sourceforge.jnlp.security.dialogs.SingleCertInfoPane; +import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.AppTrustWarningDialog; import net.sourceforge.jnlp.util.ImageResources; - -import java.awt.*; - -import javax.swing.*; - -import java.awt.event.*; -import java.security.cert.X509Certificate; -import java.util.concurrent.CopyOnWriteArrayList; - -import java.util.List; +import net.sourceforge.jnlp.util.ScreenFinder; import net.sourceforge.jnlp.util.logging.OutputController; -import net.sourceforge.jnlp.util.ScreenFinder; /** * Provides methods for showing security warning dialogs for a wide range of @@ -241,7 +240,7 @@ dialogTitle = "Security Warning"; else if (dialogType == DialogType.APPLET_WARNING) dialogTitle = "Applet Warning"; - else if (dialogType == DialogType.NOTALLSIGNED_WARNING) + else if (dialogType == DialogType.PARTIALLYSIGNED_WARNING) dialogTitle = "Security Warning"; else if (dialogType == DialogType.AUTHENTICATION) dialogTitle = "Authentication Required"; @@ -314,10 +313,10 @@ panel = new AccessWarningPane(this, extras, this.certVerifier); else if (dialogType == DialogType.APPLET_WARNING) panel = new AppletWarningPane(this, this.certVerifier); - else if (dialogType == DialogType.NOTALLSIGNED_WARNING) - panel = new NotAllSignedWarningPane(this); + else if (dialogType == DialogType.PARTIALLYSIGNED_WARNING) + panel = AppTrustWarningDialog.partiallySigned(this, file); else if (dialogType == DialogType.UNSIGNED_WARNING) // Only necessary for applets on 'high security' or above - panel = new UnsignedAppletTrustWarningDialog(this, file); + panel = AppTrustWarningDialog.unsigned(this, file); else if (dialogType == DialogType.AUTHENTICATION) panel = new PasswordAuthenticationPane(this, extras); else if (dialogType == DialogType.UNSIGNED_EAS_NO_PERMISSIONS_WARNING) diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/security/SecurityDialogs.java --- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Mar 14 10:50:15 2014 -0400 @@ -78,7 +78,7 @@ CERT_INFO, SINGLE_CERT_INFO, ACCESS_WARNING, - NOTALLSIGNED_WARNING, + PARTIALLYSIGNED_WARNING, UNSIGNED_WARNING, /* requires confirmation with 'high-security' setting */ APPLET_WARNING, AUTHENTICATION, @@ -98,7 +98,7 @@ NETWORK, VERIFIED, UNVERIFIED, - NOTALLSIGNED, + PARTIALLYSIGNED, UNSIGNED, /* requires confirmation with 'high-security' setting */ SIGNING_ERROR } @@ -163,29 +163,6 @@ } /** - * Shows a warning dialog for when the main application jars are signed, - * but extensions aren't - * - * @return true if permission was granted by the user, false otherwise. - */ - public static boolean showNotAllSignedWarningDialog(JNLPFile file) { - - if (!shouldPromptUser()) { - return false; - } - - final SecurityDialogMessage message = new SecurityDialogMessage(); - message.dialogType = DialogType.NOTALLSIGNED_WARNING; - message.accessType = AccessType.NOTALLSIGNED; - message.file = file; - message.extras = new Object[0]; - - Object selectedValue = getUserResponse(message); - - return getIntegerResponseAsBoolean(selectedValue); - } - - /** * Shows a warning dialog for when a plugin applet is unsigned. * This is used with 'high-security' setting. * @@ -238,6 +215,22 @@ } /** + * Shows a warning dialog for when an applet or application is partially signed. + * + * @return true if permission was granted by the user, false otherwise. + */ + public static AppSigningWarningAction showPartiallySignedWarningDialog(JNLPFile file, CertVerifier certVerifier) { + + final SecurityDialogMessage message = new SecurityDialogMessage(); + message.dialogType = DialogType.PARTIALLYSIGNED_WARNING; + message.accessType = AccessType.PARTIALLYSIGNED; + message.file = file; + message.certVerifier = certVerifier; + + return (AppSigningWarningAction) getUserResponse(message); + } + + /** * Present a dialog to the user asking them for authentication information, * and returns the user's response. The caller must have * NetPermission("requestPasswordAuthentication") for this to work. diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java --- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java Fri Mar 14 10:50:15 2014 -0400 @@ -39,7 +39,7 @@ public enum ExecuteAppletAction { - ALWAYS, NEVER, YES, NO; + ALWAYS, NEVER, YES, SANDBOX, NO; public String toChar() { switch (this) { @@ -49,6 +49,8 @@ return "N"; case YES: return "y"; + case SANDBOX: + return "s"; case NO: return "n"; } @@ -63,6 +65,8 @@ return Translator.R("APPEXTSECunsignedAppletActionNever"); case YES: return Translator.R("APPEXTSECunsignedAppletActionYes"); + case SANDBOX: + return Translator.R("APPEXTSECunsignedAppletActionSandbox"); case NO: return Translator.R("APPEXTSECunsignedAppletActionNo"); } @@ -76,6 +80,8 @@ return ExecuteAppletAction.NEVER; } else if (s.startsWith("y")) { return ExecuteAppletAction.YES; + } else if (s.startsWith("s")) { + return ExecuteAppletAction.SANDBOX; } else if (s.startsWith("n")) { return ExecuteAppletAction.NO; } else { diff -r fdff61a60cc1 -r 15bbdf43c1e7 netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java --- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Fri Mar 14 09:39:56 2014 -0400 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Fri Mar 14 10:50:15 2014 -0400 @@ -48,6 +48,8 @@ import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.LaunchException; import net.sourceforge.jnlp.PluginBridge; +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.runtime.JNLPClassLoader.SecurityDelegate; import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.AppTrustWarningPanel.AppSigningWarningAction; import net.sourceforge.jnlp.security.CertVerifier; import net.sourceforge.jnlp.security.SecurityDialogs; @@ -212,4 +214,52 @@ } + public static void checkPartiallySignedWithUserIfRequired(SecurityDelegate securityDelegate, JNLPFile file, + CertVerifier certVerifier) throws LaunchException { + + if (JNLPRuntime.isTrustNone()) { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Running partially signed applet at " + file.getCodeBase() + " with only Sandbox permissions due to -Xtrustnone flag"); + securityDelegate.setRunInSandbox(); + return; + } + + if (!unsignedConfirmationIsRequired()) { + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Running partially signed applet at " + file.getCodeBase() + " does not require confirmation according to security policy."); + return; + } From stefan.reich.maker.of.eye at googlemail.com Fri Mar 14 15:52:52 2014 From: stefan.reich.maker.of.eye at googlemail.com (Stefan Reich) Date: Fri, 14 Mar 2014 16:52:52 +0100 Subject: How to have WebStart create start menu items (on Linux)? In-Reply-To: <20140312160430.GG2062@redhat.com> References: <20140312160430.GG2062@redhat.com> Message-ID: Hi Omair! On Wed, Mar 12, 2014 at 5:04 PM, Omair Majid wrote: > Hi, > > * Stefan Reich [2014-03-09 > 11:13]: > > I have successfully deployed a WebStart app on both Windows and IcedTea. > > Good to hear! > Yes... it's a very important milestone! I want to conquer desktops all over the world :-) Build trust and such! > > > Just about the only thing I'm missing (- apart from a certificate from a > CA > > that I can afford - ) is to place entries in the start menu. > > > > But anyways - WebStart/IcedTea should be able to do it, right? I am > getting a > > desktop short cut alright, just none in the start menu. > > I think this feature is currently un-implemented [1]. If you can provide > patches, I am sure we will try and incorporate them. > Oh. Yeah it looks unimplemented anyway. > > The implementation of menus is described in the Desktop Menu > Specification [2]. > It looks... daunting :/ I'd love to do it, but I think I'll need to write an AI to solve this. Hah :-) Many greetings, Stefan -------------- next part -------------- An HTML attachment was scrubbed... URL: From aazores at redhat.com Fri Mar 14 16:00:28 2014 From: aazores at redhat.com (Andrew Azores) Date: Fri, 14 Mar 2014 12:00:28 -0400 (EDT) Subject: [rfc][icedtea-web] Launching PolicyEditor from CertWarningPane In-Reply-To: <5323135E.6070700@redhat.com> References: <53220215.60301@redhat.com> <53220A02.7090506@redhat.com> <5323135E.6070700@redhat.com> Message-ID: <780923058.4176443.1394812828836.JavaMail.zimbra@redhat.com> > many import issues. Invaid(how comae? My wrong I guess) and especially unused imports. > > I gave up an code a bit O:). So user experience: > > > popupmenu - best handling is NOT to add as component. And do not show them in actionPerforemd. > Show them *without* parent, in mause Clicked - it have positionOnScreen, and you show the poup menu > on this pposition. Should work like charm. This seems to work well, thanks for the tip. > > I would excude this "V" from pproperties. Also the button s quote wide. Maybe use image rather? I tried using an image now but wasn't really happy with the results. I've changed it instead to a unicode character that looks like the three horizontal line overflow menu icon that's being used by iOS and Android. I think it's pretty nice although the button is still a bit wide. > > Interesting state - dialog appeared , I clicked "V" clicked show policy editor, it apeared, I > clicked cancel in mian dilog/or ok in main dialog.. The editro should be modal Hmm, well it's a JFrame, so I can't easily make it modal I don't think. Maybe as a separate changeset PolicyEditor can be made into a JDialog and CertWarningPane can then be made to use it as a modal dialog? > > How does it behave for yes/no/cancel/close of policy editor? The CertWarningPane doesn't know about this at all. All it knows about is if it has a PolicyEditor reference, and if it does, if the editor is still open or has been closed. > - small nit - other codebases in editor are confusing. > > > Thanx! > J. > I suppose, but PolicyEditor doesn't have any mechanism right now to display only one codebase when there are also others present in the policy file. Thanks, Andrew A -------------- next part -------------- A non-text attachment was scrubbed... Name: policyeditor-in-dialog-5.patch Type: text/x-patch Size: 14236 bytes Desc: not available URL: From bugzilla-daemon at icedtea.classpath.org Sat Mar 15 01:07:21 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 15 Mar 2014 01:07:21 +0000 Subject: [Bug 1699] [IcedTea7] Support building the SunEC provider with system NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1699 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[IcedTea7] Supporting |[IcedTea7] Support building |building the SunEC provider |the SunEC provider with |with system NSS |system NSS -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Mar 15 09:51:24 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 15 Mar 2014 09:51:24 +0000 Subject: [Bug 1699] [IcedTea7] Support building the SunEC provider with system NSS In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1699 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=9341cc31ced6 author: andrew date: Sat Mar 15 01:07:27 2014 +0000 PR1699: Support building the SunEC provider with system NSS -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ptisnovs at icedtea.classpath.org Mon Mar 17 10:47:15 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 17 Mar 2014 10:47:15 +0000 Subject: /hg/gfx-test: Eight helper methods added into CommonBitmapOperat... Message-ID: changeset e459010f5534 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e459010f5534 author: Pavel Tisnovsky date: Mon Mar 17 11:47:56 2014 +0100 Eight helper methods added into CommonBitmapOperations. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/CommonBitmapOperations.java | 218 +++++++++++++++++- 2 files changed, 222 insertions(+), 1 deletions(-) diffs (296 lines): diff -r 2ffb2f873ec8 -r e459010f5534 ChangeLog --- a/ChangeLog Fri Mar 14 13:29:36 2014 +0100 +++ b/ChangeLog Mon Mar 17 11:47:56 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-17 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Eight helper methods added into CommonBitmapOperations. + 2014-03-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 2ffb2f873ec8 -r e459010f5534 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Fri Mar 14 13:29:36 2014 +0100 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Mon Mar 17 11:47:56 2014 +0100 @@ -1,7 +1,7 @@ /* Java gfx-test framework - Copyright (C) 2010, 2011, 2012, 2013 Red Hat + Copyright (C) 2010, 2011, 2012, 2013, 2014 Red Hat This file is part of IcedTea. @@ -1668,6 +1668,33 @@ } /** + * Create new buffered image containing horizontal grayscale gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalGrayscaleGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalGrayscaleGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing vertical grayscale gradient and then perform basic BitBlt test. * * @param image @@ -1720,6 +1747,33 @@ } /** + * Create new buffered image containing vertical grayscale gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalGrayscaleGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalGrayscaleGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal red gradient and then perform basic BitBlt test. * * @param image @@ -1772,6 +1826,33 @@ } /** + * Create new buffered image containing horizontal red gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalRedGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalRedGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing vertical red gradient and then perform basic BitBlt test. * * @param image @@ -1824,6 +1905,33 @@ } /** + * Create new buffered image containing vertical red gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalRedGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalRedGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal blue gradient and then perform basic BitBlt test. * * @param image @@ -1876,6 +1984,33 @@ } /** + * Create new buffered image containing horizontal blue gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalBlueGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalBlueGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing vertical blue gradient and then perform basic BitBlt test. * * @param image @@ -1928,6 +2063,33 @@ } /** + * Create new buffered image containing vertical blue gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalBlueGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalBlueGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal green gradient and then perform basic BitBlt test. * * @param image @@ -1980,6 +2142,33 @@ } /** + * Create new buffered image containing horizontal green gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithHorizontalGreenGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalGreenGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing vertical green gradient and then perform basic BitBlt test. * * @param image @@ -2032,6 +2221,33 @@ } /** + * Create new buffered image containing vertical green gradient and then perform + * basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + * @param rop + * selected raster operation + */ + public static TestResult doBitBltTestWithVerticalGreenGradientImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop) + { + // create new buffered bitmap with given type + // bitmap should contains checker pattern + BufferedImage bufferedImage = ImageFactory.createVerticalGreenGradientImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp + return BitBltOperations.performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Create new buffered image containing horizontal yellow gradient and then perform basic BitBlt test. * * @param image From ptisnovs at icedtea.classpath.org Mon Mar 17 10:54:07 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 17 Mar 2014 10:54:07 +0000 Subject: /hg/rhino-tests: Two new tests added into CompiledScriptClassTes... Message-ID: changeset e21fefd231df in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=e21fefd231df author: Pavel Tisnovsky date: Mon Mar 17 11:54:49 2014 +0100 Two new tests added into CompiledScriptClassTest test suite. diffstat: ChangeLog | 5 +++++ src/org/RhinoTests/CompiledScriptClassTest.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diffs (40 lines): diff -r 39b90cb1bd47 -r e21fefd231df ChangeLog --- a/ChangeLog Fri Mar 14 13:14:58 2014 +0100 +++ b/ChangeLog Mon Mar 17 11:54:49 2014 +0100 @@ -1,3 +1,8 @@ +2014-03-17 Pavel Tisnovsky + + * src/org/RhinoTests/CompiledScriptClassTest.java: + Two new tests added into CompiledScriptClassTest test suite. + 2014-03-14 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r 39b90cb1bd47 -r e21fefd231df src/org/RhinoTests/CompiledScriptClassTest.java --- a/src/org/RhinoTests/CompiledScriptClassTest.java Fri Mar 14 13:14:58 2014 +0100 +++ b/src/org/RhinoTests/CompiledScriptClassTest.java Mon Mar 17 11:54:49 2014 +0100 @@ -2066,6 +2066,24 @@ } /** + * Test for method javax.script.CompiledScript.getClass().getResourceAsStreamPositiveTest() + */ + protected void testGetResourceAsStreamPositiveTest() { + Object stream; + stream = this.compiledScriptClass.getResourceAsStream("/org/RhinoTests/AbstractScriptEngineClassTest.class"); + assertNotNull(stream, "getResourceAsStream(\"/org/RhinoTests/AbstractScriptEngineClassTest.class\") returns null"); + } + + /** + * Test for method javax.script.CompiledScript.getClass().toString() + */ + protected void testToString() { + String asString; + asString = this.compiledScriptClass.toString(); + assertEquals("class javax.script.CompiledScript", asString, "wrong toString() return value"); + } + + /** * Test for instanceof operator applied to a class javax.script.CompiledScript */ @SuppressWarnings("cast") From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 10:54:31 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 10:54:31 +0000 Subject: [Bug 1467] Java emits Concurrency Exception when PulseAudio is called to emit sound In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1467 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/heapstats?cmd=changeset;node=48dc7c3ceee5 author: Yasumasa Suenaga date: Mon Mar 17 19:52:20 2014 +0900 Bug 1467: Full mode log archiving does not work when using fifo pipe for gc log reviewed-by: ykubota, shintak -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 10:54:53 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 10:54:53 +0000 Subject: [Bug 1467] Java emits Concurrency Exception when PulseAudio is called to emit sound In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1467 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/heapstats-1.1?cmd=changeset;node=6086194b2867 author: Yasumasa Suenaga date: Mon Mar 17 19:52:45 2014 +0900 Bug 1467: Full mode log archiving does not work when using fifo pipe for gc log reviewed-by: ykubota, shintak -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:19:02 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:19:02 +0000 Subject: [Bug 1710] New: Crash SIGSEGV in C2 Compilerthread when compiling one specific method Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 Bug ID: 1710 Summary: Crash SIGSEGV in C2 Compilerthread when compiling one specific method Product: IcedTea Version: 6-1.13.1 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: stefan at huehner.org CC: unassigned at icedtea.classpath.org Since a openjdk/icedtea update in an ubuntu 10.04 instance from version 6b27-1.12.6-1ubuntu0.10.04.4 to version 6b30-1.13.1-1ubuntu2~0.10.04.1 we are seeing a jvm crash always when exporting one specific JasperReports report with some dataset to HTMl. Attached is a extracted small code which reliably triggers the crash. The crash can be observed on: Ubuntu 10.04 (6b30-1.13.1-1ubuntu2~0.10.04.1 ) OpenJDK Runtime Environment (IcedTea6 1.13.1) (6b30-1.13.1-1ubuntu2~0.10.04.1) Ubuntu 12.04 OpenJDK Runtime Environment (IcedTea6 1.13.1) (6b30-1.13.1-1ubuntu2~0.12.04.1) Debian/unstable OpenJDK Runtime Environment (IcedTea6 1.13.1) (6b30-1.13.1-1) OpenJDK Runtime Environment (IcedTea 2.4.5) (7u51-2.4.5-2) Java(TM) SE Runtime Environment (build 1.7.0_51-b13) (oracle binary jdk) Using the following versions the crash cannot be triggered with the code below: OpenJDK Runtime Environment (IcedTea6 1.12.6) (6b27-1.12.6-1ubuntu0.10.04.4) OpenJDK Runtime Environment (IcedTea6 1.12.6) (6b27-1.12.6-1ubuntu0.12.04.4) Also the crash can be worked around by specifying the following extra parameter for the jvm: -XX:CompileCommand=exclude,net/sf/jasperreports/engine/export/JRGridLayout,horizontallyMergeEmptyCells As the jvm internal c++ stacktrace is a bit different in those cases crash logs of each case are attached below. How to call reproducer: java -cp lib/runtime/*:build/classes/ org.openbravo.JasperC2CompilerCrash The triggering method net.sf.jasperreports.engine.export.JRGridLayout::horizontallyMergeEmptyCells is inside the jasperreports library. The sourcecode for that library (if needed) can be downloaded here: net.sf.jasperreports.engine.export.JRGridLayout::horizontallyMergeEmptyCells -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:21:36 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:21:36 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #1 from Stefan Huehner --- Created attachment 1046 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1046&action=edit Crashlog: ubuntu 10.04 openjdk6, 6b30, 1.13.1 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:22:00 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:22:00 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #2 from Stefan Huehner --- Created attachment 1047 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1047&action=edit Crashlog: ubuntu 12.04 openjdk6, 6b30, 1.13.1 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:22:38 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:22:38 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #3 from Stefan Huehner --- Created attachment 1048 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1048&action=edit Crashlog: debian/unstable openjdk6, 6b30, 1.13.1 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:23:15 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:23:15 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #4 from Stefan Huehner --- Created attachment 1049 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1049&action=edit Crashlog: debian/unstable openjdk7, 7u51-2.4.5 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:23:42 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:23:42 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #5 from Stefan Huehner --- Created attachment 1050 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1050&action=edit Crashlog: debian/unstable oracle-binary jdk 7u51 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:25:54 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:25:54 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 Stefan Huehner changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |http://huehner.org/temp/ice | |dtea-bug-1710/bugreport-rep | |roducer.tar.gz --- Comment #6 from Stefan Huehner --- Reproducer contains copy of binary jar of jasperreports as it too big (3.4MB) for an attachment here. Find it at this url : http://huehner.org/temp/icedtea-bug-1710/bugreport-reproducer.tar.gz -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aph at redhat.com Mon Mar 17 11:42:11 2014 From: aph at redhat.com (Andrew Haley) Date: Mon, 17 Mar 2014 11:42:11 +0000 Subject: Re-enable ARM32 JIT compiler Message-ID: <5326DF93.7080003@redhat.com> The bug was actually in the asm interpreter, but it broke the JIT. Here: @@ -870,7 +873,7 @@ SLOW_ENTRY empty_entry: - ldrh r3, [r0, #42] + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] This code adjusts the stack pointer after an empty method is called. 42 is wrong: it should be the field offset of methodOopDesc::_size_of_parameters. While I was at it I found a couple more literals and changed them to symbolic names. I also took the opportunity to fix a few bugs. I made the tracing code more robust, and commented out some debugging calls that slow down the interpreter. I also fixed a bug in the helper routines that were using a static local to hold the address of the card table base: this is pointlessly slower than using a non-static local. Andrew. # HG changeset patch # User aph # Date 1395056000 0 # Node ID 2de808a5820a68b390d05ab56934dbca8dbd9dcf # Parent 720c95f2266397040d878e255015b638d63c8c56 Re-enable ARM32 JIT compiler. Replace literal offsets for METHOD_SIZEOFPARAMETERS and ISTATE_NEXT_FRAME with correct symbolic names. Fix trace code not to dereference null pointers. Correct Helper_aputfield and helper_aastore not to use static _byte_map_base. Comment-out calls to TRACE. Make sure that ISTATE_METHOD and ISTATE_SELF_LINK are set even when JITting fails. diff -r 720c95f22663 -r 2de808a5820a src/cpu/zero/vm/asm_helper.cpp --- a/src/cpu/zero/vm/asm_helper.cpp Thu Feb 20 15:02:19 2014 +0000 +++ b/src/cpu/zero/vm/asm_helper.cpp Mon Mar 17 11:33:20 2014 +0000 @@ -378,22 +378,16 @@ goto handle_exception; } } - oop* elem_loc = (oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)); - // *(oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)) = value; - *elem_loc = value; - // Mark the card - BarrierSet* bs = Universe::heap()->barrier_set(); - static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); - OrderAccess::release_store(&_byte_map_base[(uintptr_t)elem_loc >> CardTableModRefBS::card_shift], 0); + ((objArrayOopDesc *) arrayref)->obj_at_put(index, value); } handle_exception: return istate->thread()->pending_exception(); } -extern "C" void Helper_aputfield(oop obj) +extern "C" void Helper_aputfield(oop obj, oop val, int offset) { BarrierSet* bs = Universe::heap()->barrier_set(); - static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); + jbyte* _byte_map_base = (((CardTableModRefBS*)bs)->byte_map_base); OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0); } diff -r 720c95f22663 -r 2de808a5820a src/cpu/zero/vm/cppInterpreter_arm.S --- a/src/cpu/zero/vm/cppInterpreter_arm.S Thu Feb 20 15:02:19 2014 +0000 +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Mon Mar 17 11:33:20 2014 +0000 @@ -526,10 +526,13 @@ mrs r4, cpsr mov r0, jpc ldr r1, [thread, #THREAD_TOP_ZERO_FRAME] + cmp r1, #0 sub r1, r1, #ISTATE_NEXT_FRAME + beq 0f + DECACHE_JPC ldr r2, =my_trace blx r2 - msr cpsr, r4 +0: msr cpsr, r4 ldmfd sp!, {r0, r1, r2, r3, r4, ip, lr} .endm @@ -551,7 +554,7 @@ .elseif dispatch_state == 4 DISPATCH_4 .endif - TRACE +@ TRACE moveq pc, ip ldrb r1, [jpc, lr] bic ip, ip, #7 @@ -561,7 +564,7 @@ .endm .macro DISPATCH_BYTECODE - TRACE +@ TRACE @ ldrb r1, [jpc, #2] ldr ip, [dispatch, r0, lsl #2] ldrb r2, [jpc, #1] @@ -870,7 +873,7 @@ SLOW_ENTRY empty_entry: - ldrh r3, [r0, #42] + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] ldr r1, [r2, #THREAD_JAVA_SP] add r1, r1, r3, lsl #2 str r1, [r2, #THREAD_JAVA_SP] @@ -879,7 +882,7 @@ FAST_ENTRY fast_empty_entry: - ldrh r3, [r0, #42] + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] ldr r1, [thread, #THREAD_JAVA_SP] add r1, r1, r3, lsl #2 str r1, [thread, #THREAD_JAVA_SP] @@ -1081,7 +1084,7 @@ ldr r1, [thread, #THREAD_STACK_SIZE] ldr r3, [thread, #THREAD_STACK_BASE] - add r0, r9, #72 + add r0, r9, #ISTATE_NEXT_FRAME rsb r3, r1, r3 rsb r3, r3, arm_sp @@ -1104,7 +1107,7 @@ str r5, [thread, #THREAD_LAST_JAVA_FP] ldr r5, [thread, #THREAD_JAVA_SP] str r5, [thread, #THREAD_LAST_JAVA_SP] - ldr r11, [r11, #-72 + ISTATE_METHOD] + ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD] cmp r1, #0 bne .fast_native_entry_exception ldr r5, [r11, #METHOD_SIGNATUREHANDLER] @@ -1127,7 +1130,7 @@ ldr r11, [thread, #THREAD_TOP_ZERO_FRAME] ldr r1, [thread, #THREAD_PENDING_EXC] mov r3, #0 - ldr r11, [r11, #-72 + ISTATE_METHOD] + ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD] cmp r1, #0 str r3, [thread, #THREAD_LAST_JAVA_SP] str r3, [thread, #THREAD_LAST_JAVA_FP] @@ -3353,12 +3356,12 @@ str locals, [istate, #ISTATE_LOCALS] USEC cmp r3, lr str constpool, [istate, #ISTATE_CONSTANTS] + str tmp1, [istate, #ISTATE_METHOD] + str istate, [istate, #ISTATE_SELF_LINK] USEC bcs method_entry_freq_count_overflow DISPATCH_NEXT DISPATCH_NEXT DISPATCH_NEXT - str tmp1, [istate, #ISTATE_METHOD] - str istate, [istate, #ISTATE_SELF_LINK] @ mov lr, #0 @ str lr, [istate, #ISTATE_PREV_LINK] @ str lr, [istate, #ISTATE_CALLEE] From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 11:46:05 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 11:46:05 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 --- Comment #7 from Stefan Huehner --- The following jdk8 early access build does NOT trigger the crash with the attached reproducer /opt/jvm/jdk1.8.0_b132/bin/java -version java version "1.8.0" Java(TM) SE Runtime Environment (build 1.8.0-b132) Java HotSpot(TM) 64-Bit Server VM (build 25.0-b70, mixed mode) -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 12:00:35 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 12:00:35 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com Assignee|gnu.andrew at redhat.com |aph at redhat.com -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu.andrew at redhat.com Mon Mar 17 12:31:38 2014 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 17 Mar 2014 08:31:38 -0400 (EDT) Subject: Re-enable ARM32 JIT compiler In-Reply-To: <5326DF93.7080003@redhat.com> References: <5326DF93.7080003@redhat.com> Message-ID: <36733603.442504.1395059498388.JavaMail.zimbra@redhat.com> ----- Original Message ----- > The bug was actually in the asm interpreter, but it broke the JIT. > Here: > > @@ -870,7 +873,7 @@ > > SLOW_ENTRY > empty_entry: > - ldrh r3, [r0, #42] > + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] > > This code adjusts the stack pointer after an empty method is called. > 42 is wrong: it should be the field offset of > methodOopDesc::_size_of_parameters. While I was at it I found a > couple more literals and changed them to symbolic names. > > I also took the opportunity to fix a few bugs. I made the tracing > code more robust, and commented out some debugging calls that slow > down the interpreter. I also fixed a bug in the helper routines that > were using a static local to hold the address of the card table base: > this is pointlessly slower than using a non-static local. > > Andrew. > > > # HG changeset patch > # User aph > # Date 1395056000 0 > # Node ID 2de808a5820a68b390d05ab56934dbca8dbd9dcf > # Parent 720c95f2266397040d878e255015b638d63c8c56 > Re-enable ARM32 JIT compiler. > > Replace literal offsets for METHOD_SIZEOFPARAMETERS and > ISTATE_NEXT_FRAME with correct symbolic names. > Fix trace code not to dereference null pointers. > Correct Helper_aputfield and helper_aastore not to use static > _byte_map_base. > Comment-out calls to TRACE. > Make sure that ISTATE_METHOD and ISTATE_SELF_LINK are set even when > JITting fails. > > diff -r 720c95f22663 -r 2de808a5820a src/cpu/zero/vm/asm_helper.cpp > --- a/src/cpu/zero/vm/asm_helper.cpp Thu Feb 20 15:02:19 2014 +0000 > +++ b/src/cpu/zero/vm/asm_helper.cpp Mon Mar 17 11:33:20 2014 +0000 > @@ -378,22 +378,16 @@ > goto handle_exception; > } > } > - oop* elem_loc = (oop*)(((address) arrayref->base(T_OBJECT)) + index * > sizeof(oop)); > - // *(oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)) > = value; > - *elem_loc = value; > - // Mark the card > - BarrierSet* bs = Universe::heap()->barrier_set(); > - static volatile jbyte* _byte_map_base = (volatile > jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); > - OrderAccess::release_store(&_byte_map_base[(uintptr_t)elem_loc >> > CardTableModRefBS::card_shift], 0); > + ((objArrayOopDesc *) arrayref)->obj_at_put(index, value); > } > handle_exception: > return istate->thread()->pending_exception(); > } > > -extern "C" void Helper_aputfield(oop obj) > +extern "C" void Helper_aputfield(oop obj, oop val, int offset) > { > BarrierSet* bs = Universe::heap()->barrier_set(); > - static volatile jbyte* _byte_map_base = (volatile > jbyte*)(((CardTableModRefBS*)bs)->byte_map_base); > + jbyte* _byte_map_base = (((CardTableModRefBS*)bs)->byte_map_base); > OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> > CardTableModRefBS::card_shift], 0); > } > > diff -r 720c95f22663 -r 2de808a5820a src/cpu/zero/vm/cppInterpreter_arm.S > --- a/src/cpu/zero/vm/cppInterpreter_arm.S Thu Feb 20 15:02:19 2014 +0000 > +++ b/src/cpu/zero/vm/cppInterpreter_arm.S Mon Mar 17 11:33:20 2014 +0000 > @@ -526,10 +526,13 @@ > mrs r4, cpsr > mov r0, jpc > ldr r1, [thread, #THREAD_TOP_ZERO_FRAME] > + cmp r1, #0 > sub r1, r1, #ISTATE_NEXT_FRAME > + beq 0f > + DECACHE_JPC > ldr r2, =my_trace > blx r2 > - msr cpsr, r4 > +0: msr cpsr, r4 > ldmfd sp!, {r0, r1, r2, r3, r4, ip, lr} > .endm > > @@ -551,7 +554,7 @@ > .elseif dispatch_state == 4 > DISPATCH_4 > .endif > - TRACE > +@ TRACE > moveq pc, ip > ldrb r1, [jpc, lr] > bic ip, ip, #7 > @@ -561,7 +564,7 @@ > .endm > > .macro DISPATCH_BYTECODE > - TRACE > +@ TRACE > @ ldrb r1, [jpc, #2] > ldr ip, [dispatch, r0, lsl #2] > ldrb r2, [jpc, #1] > @@ -870,7 +873,7 @@ > > SLOW_ENTRY > empty_entry: > - ldrh r3, [r0, #42] > + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] > ldr r1, [r2, #THREAD_JAVA_SP] > add r1, r1, r3, lsl #2 > str r1, [r2, #THREAD_JAVA_SP] > @@ -879,7 +882,7 @@ > > FAST_ENTRY > fast_empty_entry: > - ldrh r3, [r0, #42] > + ldrh r3, [r0, #METHOD_SIZEOFPARAMETERS] > ldr r1, [thread, #THREAD_JAVA_SP] > add r1, r1, r3, lsl #2 > str r1, [thread, #THREAD_JAVA_SP] > @@ -1081,7 +1084,7 @@ > > ldr r1, [thread, #THREAD_STACK_SIZE] > ldr r3, [thread, #THREAD_STACK_BASE] > - add r0, r9, #72 > + add r0, r9, #ISTATE_NEXT_FRAME > > rsb r3, r1, r3 > rsb r3, r3, arm_sp > @@ -1104,7 +1107,7 @@ > str r5, [thread, #THREAD_LAST_JAVA_FP] > ldr r5, [thread, #THREAD_JAVA_SP] > str r5, [thread, #THREAD_LAST_JAVA_SP] > - ldr r11, [r11, #-72 + ISTATE_METHOD] > + ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD] > cmp r1, #0 > bne .fast_native_entry_exception > ldr r5, [r11, #METHOD_SIGNATUREHANDLER] > @@ -1127,7 +1130,7 @@ > ldr r11, [thread, #THREAD_TOP_ZERO_FRAME] > ldr r1, [thread, #THREAD_PENDING_EXC] > mov r3, #0 > - ldr r11, [r11, #-72 + ISTATE_METHOD] > + ldr r11, [r11, #-ISTATE_NEXT_FRAME + ISTATE_METHOD] > cmp r1, #0 > str r3, [thread, #THREAD_LAST_JAVA_SP] > str r3, [thread, #THREAD_LAST_JAVA_FP] > @@ -3353,12 +3356,12 @@ > str locals, [istate, #ISTATE_LOCALS] > USEC cmp r3, lr > str constpool, [istate, #ISTATE_CONSTANTS] > + str tmp1, [istate, #ISTATE_METHOD] > + str istate, [istate, #ISTATE_SELF_LINK] > USEC bcs method_entry_freq_count_overflow > DISPATCH_NEXT > DISPATCH_NEXT > DISPATCH_NEXT > - str tmp1, [istate, #ISTATE_METHOD] > - str istate, [istate, #ISTATE_SELF_LINK] > @ mov lr, #0 > @ str lr, [istate, #ISTATE_PREV_LINK] > @ str lr, [istate, #ISTATE_CALLEE] > Committed: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/rev/ee50fa9e8791 For some reason, this came through inline, so I had to manually copy and paste it over. It also didn't apply cleanly, but the code seems identical, from manual examination. I didn't spot that the longer Changelog had got missed until later. Sorry. I'll make sure to include it in the release notes instead, so it isn't lost. Thanks for fixing this, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From aph at redhat.com Mon Mar 17 12:48:30 2014 From: aph at redhat.com (Andrew Haley) Date: Mon, 17 Mar 2014 12:48:30 +0000 Subject: Re-enable ARM32 JIT compiler In-Reply-To: <36733603.442504.1395059498388.JavaMail.zimbra@redhat.com> References: <5326DF93.7080003@redhat.com> <36733603.442504.1395059498388.JavaMail.zimbra@redhat.com> Message-ID: <5326EF1E.2050408@redhat.com> On 03/17/2014 12:31 PM, Andrew Hughes wrote: > I didn't spot that the longer Changelog had got missed until later. Sorry. I'll > make sure to include it in the release notes instead, so it isn't lost. Can't you just roll it back and commit it properly? Andrew. From gnu.andrew at redhat.com Mon Mar 17 13:16:00 2014 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 17 Mar 2014 09:16:00 -0400 (EDT) Subject: Re-enable ARM32 JIT compiler In-Reply-To: <5326EF1E.2050408@redhat.com> References: <5326DF93.7080003@redhat.com> <36733603.442504.1395059498388.JavaMail.zimbra@redhat.com> <5326EF1E.2050408@redhat.com> Message-ID: <792746557.508835.1395062160216.JavaMail.zimbra@redhat.com> ----- Original Message ----- > On 03/17/2014 12:31 PM, Andrew Hughes wrote: > > I didn't spot that the longer Changelog had got missed until later. Sorry. > > I'll > > make sure to include it in the release notes instead, so it isn't lost. > > Can't you just roll it back and commit it properly? > > Andrew. > > Sure. Done: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/rev/e34b923512cc -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 13:29:11 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 13:29:11 +0000 Subject: [Bug 1584] Commvault console fails to start due to error in JNLP file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1584 Simone Lazzaris changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |simone.lazzaris at qcom.it Version|unspecified |1.4 --- Comment #2 from Simone Lazzaris --- I'm experiencing the very same problem, with the same application (commvault console). My platform is a Linux (archlinux) 64bit. The oracle jre works fine on the same machine. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Mon Mar 17 14:25:55 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:25:55 +0000 Subject: /hg/release/icedtea7-forest-2.4: PR1679: Allow OpenJDK to build ... Message-ID: changeset b028e58c1b77 in /hg/release/icedtea7-forest-2.4 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b028e58c1b77 author: andrew date: Wed Feb 19 21:07:59 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels diffstat: make/Defs-internal.gmk | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 0af208754134 -r b028e58c1b77 make/Defs-internal.gmk --- a/make/Defs-internal.gmk Wed Jan 29 10:01:15 2014 +0000 +++ b/make/Defs-internal.gmk Wed Feb 19 21:07:59 2014 +0000 @@ -303,6 +303,16 @@ ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist endif +# Command to PaX mark the VM +ifndef PAX_COMMAND + PAX_COMMAND = /usr/sbin/paxmark.sh +endif +ifeq ($(ARCH), i586) + PAX_COMMAND_ARGS="-msp" +else + PAX_COMMAND_ARGS="-m" +endif + # Common make arguments (supplied to all component builds) COMMON_BUILD_ARGUMENTS = \ JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ @@ -323,7 +333,9 @@ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ - STATIC_CXX=$(STATIC_CXX) + STATIC_CXX=$(STATIC_CXX) \ + PAX_COMMAND=$(PAX_COMMAND) \ + PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 14:26:01 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:26:01 +0000 Subject: [Bug 1679] [IcedTea7] Allow OpenJDK to build on PaX-enabled kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1679 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4?cmd=changeset;node=b028e58c1b77 author: andrew date: Wed Feb 19 21:07:59 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Mon Mar 17 14:26:32 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:26:32 +0000 Subject: /hg/release/icedtea7-forest-2.4/hotspot: 46 new changesets Message-ID: changeset 5ad2c8650812 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5ad2c8650812 author: dsamersoff date: Thu Aug 29 21:48:23 2013 +0400 8009062: poor performance of JNI AttachCurrentThread after fix for 7017193 Summary: don't re-evaluate stack bounds for main thread before install guard page Reviewed-by: coleenp, dholmes, dlong changeset 195056251b69 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=195056251b69 author: aph date: Thu Mar 15 07:56:24 2012 -0400 Add patches/arm.patch from IcedTea 6 changeset 8f0c2e1287f5 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8f0c2e1287f5 author: aph date: Thu Mar 15 07:57:19 2012 -0400 Add patches/arm-debug.patch from IcedTea 6 changeset 1053216103e0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1053216103e0 author: andrew date: Fri Jul 12 20:03:52 2013 +0100 Add patches/arm-hsdis.patch from IcedTea 6 changeset 3dc977fbd5d1 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3dc977fbd5d1 author: aph date: Thu Mar 15 07:53:52 2012 -0400 Add arm_port from IcedTea 6 changeset b7beff851ea6 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b7beff851ea6 author: aph date: Thu Mar 15 08:54:12 2012 -0400 Move arm-port files to the correct place changeset 2e40cd792106 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2e40cd792106 author: aph date: Fri Jul 12 20:10:45 2013 +0100 Changes for HSX22 changeset 1998ca2209d4 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1998ca2209d4 author: aph date: Fri Mar 16 08:36:04 2012 -0400 Use unified syntax for thumb code. 2012-03-16 Andrew Haley * hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax for thumb code. changeset de4a0e6323f9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=de4a0e6323f9 author: aph date: Tue Mar 27 09:40:08 2012 -0400 ARM: First cut of invokedynamic changeset aa1f60fceb35 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aa1f60fceb35 author: aph date: Fri Mar 30 11:53:01 2012 -0400 invokedynamic and aldc for JIT changeset 7c433abda0ff in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c433abda0ff author: aph date: Fri Mar 30 13:34:30 2012 -0400 ARM: JIT-compilation of ldc methodHandle changeset aad627c854be in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aad627c854be author: aph date: Tue Apr 10 12:22:01 2012 -0400 Tidy up, minor comment changes. changeset 0cfce4cddb95 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0cfce4cddb95 author: aph date: Wed Apr 11 09:22:39 2012 -0400 Minor review cleanups. changeset 31c0b70bdafe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=31c0b70bdafe author: adinn date: Fri Jul 12 20:17:38 2013 +0100 added jvmti event generation for dynamic_generate and compiled_method_load events to ARM JIT compiler changeset 5952f579380f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5952f579380f author: adinn date: Fri Jul 12 20:20:10 2013 +0100 patched method handle adapter code to deal with failures in TCK changeset f056bda687ee in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f056bda687ee author: adinn date: Wed May 16 11:21:07 2012 +0100 modified safepoint check to rely on memory protect signal instead of polling changeset 185c8d8de125 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=185c8d8de125 author: aph date: Thu May 17 13:45:50 2012 -0400 RTC Thumb2 JIT enhancements. 2012-05-16 Andrew Haley * src/cpu/zero/vm/thumb2.cpp: Throughout: T2EE_PRINT_* renamed to T2_PRINT_*. Route all debug info to stderr. We now do frameless compilation, so do all frame accesses relative to SP. Remove zombie detection pass. Remove dead code. Add OSPACE option. (H_LDC_W) (H_INVOKESTATIC_RESOLVED, H_INVOKESPECIAL_RESOLVED) (H_INVOKEVIRTUAL_RESOLVED, H_INVOKEVFINAL, H_MONITORENTER) (H_MONITOREXIT): New. (T2_* macros): Rename from T2EE_*. (SLOW_ENTRY_OFFSET, FAST_ENTRY_OFFSET): New. (THUMB2_CODEBUF_SIZE): Make this depend on PRODUCT. (H_GETSTATIC, H_PUTSTATIC, H_JSR, H_ZOMBIE, H_MONITOR): Delete. (H_DEADCODE, H_LDC_W, H_INVOKESTATIC_RESOLVED) (H_INVOKESPECIAL_RESOLVED, H_INVOKEVIRTUAL_RESOLVED) (H_INVOKEVFINAL): New. (DebugSwitch): New. (JAZ_V6): New local register. (Thumb2_pass1): Count reads and writes for register allocator. Delete zombie detection pass. (Thumb2_RegAlloc): New. (out_align, out_align_offset, nop_16, nop_32): New. (fullBarrier, storeBarrier): Chaeck for an MP OS. (load_local, store_local): Check for an istate reg. (load_istate, store_istate): New. (Thumb2_Load, Thumb2_LoadX2): Remove monitor stack adj. (Thumb2_Store, Thumb2_StoreX2): Likewise. (Debug): New. (Thumb2_save_locals, Thumb2_restore_locals, Thumb2_invoke_save) (Thumb2_invoke_restore, Thumb2_Exit): Remove monitor stackdepth adj. Move here from below. (Thumb2_Accessor): Rewrite for new method header layout. (Thumb2_Enter): Likewise. Do frameless setup. (Thumb2_load_long): Use a single ldrexd instruction. (Thumb2_codegen): Align branches. Call Debug if we're about to enter a synchronized method. (opc_jsr) Add handler. (opc_monitorenter, opc_monitorexit): Call handler instead of generating code. (Thumb2_Initialize): Disassmble ARM and Thumb code separately. * src/cpu/zero/vm/cppInterpreter_arm.S: Throughout: the thread pointer is now in a register, so use it everywhere. Set the thread pointer register at every entry point to the interpreter. Throughout: use the macros SLOW_ENTRY and FAST_ENTRY rather than ALIGN_CODE. Throughout: register tmp2 is no longer available, use other registers as appropriate. (T2JIT): Rename from THUMB2EE. (call_thumb2): Load all the thumb2 registers that have been allocated to locals. (accessor_entry): Check for stack overflow. (.fast_accessor_*): Delete dead code. (LOAD_FRAME): New. (Thumb2_invokevfinalresolved_stub) (Thumb2_invokevirtualresolved_stub): New. (Thumb2_invokestaticresolved_stub): New. (Thumb2_invokespecialresolved_stub): New. (Thumb2 stubs): Use FRAME_* rather than ISTATE_*; the frame pointer is no longer in a fixed register. (JAZ_REGSET, JAZ_*): Move delaration of JAZ registers here. (Thumb2_monitorenter): New. (normal_entry_synchronized): Rearrange so that we can load the thread pointer without exceeding the number of instructions that we can fit into the gap between SLOW_ENTRY and FAST_ENTRY. (normal_entry): Likewise. (MP_COMPILE_THRESHOLD, UP_COMPILE_THRESHOLD): Adjust. (TBIT): New. (FRAME_METHOD, FRAME_CONSTANTS, FRAME_BCP, FRAME_STACK_LIMIT) (FRAME_LOCALS, FRAME_STACK): New. (SLOW_ENTRY, FAST_ENTRY, SLOW_ENTRY_OFFSET, FAST_ENTRY_OFFSET): New. (LOAD_ISTATE): New. (DECACHE_STACK_USING_FRAME, DECACHE_JPC_USING_FRAME): New. (TRACE): Save and restore IP. Pass istate to my_trace(). (Opcode monitorenter): Remove all the assembler code and replace it with a call to Helper_monitorenter. * src/cpu/zero/vm/bytecodes_arm.def: Throughout: register tmp2 is no longer available, use other registers as appropriate. (lgetfield): Use ldrexd to load a jlong rather than an ldrexd/strexd loop. * src/cpu/zero/vm/asm_helper.cpp (ARCH_THUMB2): Renamed from ARCH_THUMBEE. (my_trace): New. (Helper_monitorenter): New. (Helper_monitorexit): New. changeset d77793023b14 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d77793023b14 author: aph date: Mon May 28 08:01:18 2012 -0400 Use ldrexd for atomic reads on ARMv7. 2012-05-28 Andrew Haley * os_linux_zero.hpp (atomic_copy64): Use ldrexd for atomic reads on ARMv7. changeset 4888872c21be in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4888872c21be author: aph date: Mon May 28 08:48:42 2012 -0400 Adjust saved SP when safepointing. 2012-05-28 Andrew Haley * thumb2.cpp (Thumb2_Safepoint): Adjust saved SP when safepointing. changeset 76900149f3f0 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=76900149f3f0 author: aph date: Tue May 29 10:11:11 2012 -0400 Phase 1 changeset 3bb197ceab24 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3bb197ceab24 author: aph date: Tue May 29 11:06:21 2012 -0400 Phase 2 changeset f8dd5ae19039 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f8dd5ae19039 author: aph date: Fri Jul 12 20:26:41 2013 +0100 Don't save locals at a return. changeset a644c3ec2b16 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a644c3ec2b16 author: aph date: Fri Jul 12 20:27:35 2013 +0100 Back out mistaken checkin of debug code. changeset 70e201bcbb24 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=70e201bcbb24 author: adinn date: Thu Jun 07 17:49:46 2012 +0100 corrected call from fast_method_handle_entry to CppInterpreter::method_handle_entry so that thread is loaded into r2 changeset a214ebebbdcb in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a214ebebbdcb author: aph date: Wed Jun 06 10:09:22 2012 -0400 Fix JIT bug that miscompiles org.eclipse.ui.internal.contexts.ContextAuthority.sourceChanged 2012-06-06 Andrew Haley * thumb2.cpp (Thumb2_Compile): Ask the CompilerOracle if we should compile this method. (Thumb2_iOp): Use a temporary to hold the shift count. changeset 16446d9fa65e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=16446d9fa65e author: aph date: Fri Jun 08 09:11:52 2012 -0400 ARM: Rename a bunch of misleadingly-named functions 2012-06-08 Andrew Haley * thumb2.cpp: Rename some functions: Thumb2_save_locals -> Thumb2_save_local_refs Thumb2_restore_locals -> Thumb2_restore_local_refs Thumb2_invoke_save -> Thumb2_save_all_locals Thumb2_invoke_restore -> Thumb2_restore_all_locals changeset 1ee2f45db8bc in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1ee2f45db8bc author: aph date: Fri Jun 08 10:25:37 2012 -0400 Fix call to handle_special_method(). Fix compareAndSwapLong. 2012-06-08 Andrew Haley * thumb2.cpp (Thumb2_codegen): Move call to handle_special_method() outside test. (handle_special_method: _compareAndSwapLong): Save/restore all locals, not just locals of ref type. changeset ce4008a48588 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ce4008a48588 author: chrisphi date: Thu Aug 30 11:53:27 2012 -0400 ARM: Fix trashed thread ptr after recursive re-entry from asm jit. changeset 92d450da7626 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=92d450da7626 author: chrisphi date: Thu Mar 21 11:17:13 2013 -0400 PR1363: Fedora 19 / rawhide FTBFS SIGILL Changed thumb2 PUSH & POP to inline functions, Added detection of reg alloc failure, fails compile of method. changeset 521adb51d083 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=521adb51d083 author: andrew date: Wed Aug 29 17:23:23 2012 +0100 PR1101: Undefined symbols on GNU/Linux SPARC changeset f541c1d41ba7 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f541c1d41ba7 author: Xerxes Ranby date: Tue May 28 19:43:58 2013 +0200 PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel Summary: The POPF1 macro used wrong destination register r0 instead of r1 on ARM armel causing issues with the frem bytecode. The frem bytecode was the only bytecode using the defect macro. changeset fef21600239c in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fef21600239c author: chrisphi date: Fri Jul 12 20:56:23 2013 +0100 Changes for HSX23 changeset 60dbdc6b0859 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=60dbdc6b0859 author: andrew date: Fri Jul 12 21:41:06 2013 +0100 Remove fragment from method that has been removed changeset 297a0304a568 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=297a0304a568 author: andrew date: Wed Jul 17 13:52:07 2013 +0100 Use $(CC) to compile mkbc instead of $(CC_COMPILE) to avoid C++-only flags changeset d54091fd1092 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d54091fd1092 author: andrew date: Wed Jul 17 17:30:04 2013 +0100 Remove C++ flags from CC_COMPILE and fix usage in zeroshark.make. changeset 1ad36c6cff31 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1ad36c6cff31 author: andrew date: Wed Jul 17 19:14:46 2013 +0100 Add note about use of $(CFLAGS)/$(CXXFLAGS)/$(CPPFLAGS) at present. changeset 4a989c763452 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4a989c763452 author: andrew date: Thu Dec 26 19:52:09 2013 +0000 Add Shark definitions from 8003868 changeset 4049b8278e88 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4049b8278e88 author: andrew date: Thu Dec 26 19:52:45 2013 +0000 Drop compile_method argument removed in 7083786 from sharkCompiler.cpp changeset e9721d827f31 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e9721d827f31 author: simonis date: Mon Mar 17 13:40:34 2014 +0000 Re-enable the 'gamma' test at the end of the HotSpot build, but only for HotSpot based bootstrap JDKs. The 'gamma' launcher only works with HotSpot based bootstrap JDKs because it uses the freshly build libjvm.so in the context and together with the class library of the boot JDK which was used to build it. This combination will not work for other JDKs. changeset 9b1cdb2b44fa in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9b1cdb2b44fa author: andrew date: Mon Mar 17 13:43:56 2014 +0000 Backout earlier RH1015432 fix changeset 9600c7d61f8f in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9600c7d61f8f author: andrew date: Fri Jan 31 21:14:06 2014 +0000 RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix) Contributed-by: chphilli at redhat.com changeset 78628ff1b2a8 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=78628ff1b2a8 author: chrisphi date: Tue Feb 18 20:45:28 2014 +0000 ARM32 assembler update for hsx24. Use ARM32JIT to turn it on/off. changeset 8e7b2661433e in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8e7b2661433e author: andrew date: Wed Feb 19 21:08:04 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels changeset eff103ee6cbe in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=eff103ee6cbe author: andrew date: Thu Feb 20 03:38:40 2014 +0000 Override automatic detection of source language for bytecodes_arm.def changeset c200cfd0bd8d in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c200cfd0bd8d author: andrew date: Fri Jul 26 11:31:42 2013 +0100 Include $(CFLAGS) in assembler stage changeset 00478c5bf5e9 in /hg/release/icedtea7-forest-2.4/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=00478c5bf5e9 author: aph date: Mon Mar 17 13:15:25 2014 +0000 Replace literal offsets for METHOD_SIZEOFPARAMETERS and ISTATE_NEXT_FRAME with correct symbolic names. Fix trace code not to dereference null pointers. Correct Helper_aputfield and helper_aastore not to use static _byte_map_base. Comment-out calls to TRACE. Make sure that ISTATE_METHOD and ISTATE_SELF_LINK are set even when JITting fails. diffstat: make/linux/makefiles/buildtree.make | 16 + make/linux/makefiles/gcc.make | 2 + make/linux/makefiles/rules.make | 5 +- make/linux/makefiles/vm.make | 2 +- make/linux/makefiles/zeroshark.make | 37 + src/cpu/zero/vm/arm_cas.S | 31 + src/cpu/zero/vm/asm_helper.cpp | 745 + src/cpu/zero/vm/bytecodes_arm.def | 7850 ++++++++++++++++ src/cpu/zero/vm/bytecodes_zero.cpp | 52 +- src/cpu/zero/vm/bytecodes_zero.hpp | 41 +- src/cpu/zero/vm/cppInterpreter_arm.S | 7384 +++++++++++++++ src/cpu/zero/vm/cppInterpreter_zero.cpp | 49 + src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 + src/cpu/zero/vm/methodHandles_zero.hpp | 6 +- src/cpu/zero/vm/thumb2.cpp | 7985 +++++++++++++++++ src/cpu/zero/vm/vm_version_zero.hpp | 11 + src/os/linux/vm/os_linux.cpp | 131 +- src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 31 +- src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 14 + src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 47 +- src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 6 + src/share/tools/hsdis/Makefile | 10 +- src/share/tools/hsdis/hsdis.c | 5 + src/share/vm/prims/jvmtiExport.cpp | 41 + src/share/vm/prims/jvmtiExport.hpp | 7 + src/share/vm/runtime/os.cpp | 38 - src/share/vm/runtime/os.hpp | 4 - src/share/vm/shark/sharkCompiler.cpp | 1 - src/share/vm/shark/shark_globals.hpp | 10 + src/share/vm/utilities/vmError.cpp | 13 + src/share/vm/utilities/vmError.hpp | 8 + test/runtime/InitialThreadOverflow/DoOverflow.java | 41 + test/runtime/InitialThreadOverflow/invoke.cxx | 70 + test/runtime/InitialThreadOverflow/testme.sh | 73 + tools/mkbc.c | 607 + 35 files changed, 25245 insertions(+), 130 deletions(-) diffs (truncated from 25866 to 500 lines): diff -r 2c97070e5af4 -r 00478c5bf5e9 make/linux/makefiles/buildtree.make --- a/make/linux/makefiles/buildtree.make Wed Jan 29 10:01:21 2014 +0000 +++ b/make/linux/makefiles/buildtree.make Mon Mar 17 13:15:25 2014 +0000 @@ -408,6 +408,7 @@ DATA_MODE/sparcv9 = 64 DATA_MODE/amd64 = 64 DATA_MODE/ia64 = 64 +DATA_MODE/ppc64 = 64 DATA_MODE/zero = $(ARCH_DATA_MODEL) JAVA_FLAG/32 = -d32 @@ -416,6 +417,9 @@ WRONG_DATA_MODE_MSG = \ echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK." +WRONG_JDK_MSG = \ + echo "JAVA_HOME must point to a HotSpot based JDK \\$genuine Sun/Oracle or OpenJDK\\$." + CROSS_COMPILING_MSG = \ echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run." @@ -452,6 +456,14 @@ echo " exit 0"; \ echo "fi"; \ echo ""; \ + echo "# 'gamma' only runs with HotSpot based JDKs (genuine Sun/Oracle or OpenJDK)"; \ + echo ""; \ + echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -version 2>&1 | grep -E 'OpenJDK|HotSpot' > /dev/null"; \ + echo "if [ \$$? -ne 0 ]; then "; \ + echo " $(WRONG_JDK_MSG)"; \ + echo " exit 0"; \ + echo "fi"; \ + echo ""; \ echo "# Use gamma_g if it exists"; \ echo ""; \ echo "GAMMA_PROG=gamma"; \ @@ -459,6 +471,10 @@ echo " GAMMA_PROG=gamma_g"; \ echo "fi"; \ echo ""; \ + echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \ + echo " $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \ + echo "fi"; \ + echo ""; \ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ diff -r 2c97070e5af4 -r 00478c5bf5e9 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Wed Jan 29 10:01:21 2014 +0000 +++ b/make/linux/makefiles/gcc.make Mon Mar 17 13:15:25 2014 +0000 @@ -241,6 +241,7 @@ FASTDEBUG_CFLAGS/amd64 = -g FASTDEBUG_CFLAGS/arm = -g FASTDEBUG_CFLAGS/ppc = -g + FASTDEBUG_CFLAGS/zero = -g FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) FASTDEBUG_CFLAGS += -gstabs @@ -250,6 +251,7 @@ OPT_CFLAGS/amd64 = -g OPT_CFLAGS/arm = -g OPT_CFLAGS/ppc = -g + OPT_CFLAGS/zero = -g OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) OPT_CFLAGS += -gstabs diff -r 2c97070e5af4 -r 00478c5bf5e9 make/linux/makefiles/rules.make --- a/make/linux/makefiles/rules.make Wed Jan 29 10:01:21 2014 +0000 +++ b/make/linux/makefiles/rules.make Mon Mar 17 13:15:25 2014 +0000 @@ -31,7 +31,10 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++). -CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) +# FIXME: $(CXXFLAGS) currently only includes preprocessor flags while +# $(CFLAGS) includes C and C++ flags. Ideally, there should be three +# variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS). +CC_COMPILE = $(CC) $(CXXFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) AS.S = $(AS) $(ASFLAGS) diff -r 2c97070e5af4 -r 00478c5bf5e9 make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Wed Jan 29 10:01:21 2014 +0000 +++ b/make/linux/makefiles/vm.make Mon Mar 17 13:15:25 2014 +0000 @@ -226,7 +226,7 @@ # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. define findsrc $(notdir $(shell find $(1)/. ! -name . -prune \ - -a $ -name \*.c -o -name \*.cpp -o -name \*.s $ \ + -a $ -name \*.c -o -name \*.cpp -o -name \*.s -o -name \*.S $ \ -a ! $ -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) $)) endef diff -r 2c97070e5af4 -r 00478c5bf5e9 make/linux/makefiles/zeroshark.make --- a/make/linux/makefiles/zeroshark.make Wed Jan 29 10:01:21 2014 +0000 +++ b/make/linux/makefiles/zeroshark.make Mon Mar 17 13:15:25 2014 +0000 @@ -25,6 +25,43 @@ # Setup common to Zero (non-Shark) and Shark versions of VM +ifeq ($(ZERO_LIBARCH),arm) +# check to see if we are building the assembler jit or just zero. +ifeq ($(ARM32JIT),true) +Obj_Files += asm_helper.o +Obj_Files += cppInterpreter_arm.o +Obj_Files += thumb2.o + +CFLAGS += -DHOTSPOT_ASM + +cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s +thumb2.o: offsets_arm.s + +offsets_arm.s: mkoffsets + @echo Generating assembler offsets + ./mkoffsets > $@ + +bytecodes_arm.s: bytecodes_arm.def mkbc + @echo Generating ARM assembler bytecode sequences + $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) + +mkbc: $(GAMMADIR)/tools/mkbc.c + @echo Compiling mkbc tool + $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) + +mkoffsets: asm_helper.cpp + @echo Compiling offset generator + $(QUIETLY) $(REMOVE_TARGET) + $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + +endif +endif + +%.o: %.S + @echo Assembling $< + $(QUIETLY) $(REMOVE_TARGET) + $(COMPILE.CC) $(CFLAGS) -o $@ $< $(COMPILE_DONE) + # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized diff -r 2c97070e5af4 -r 00478c5bf5e9 src/cpu/zero/vm/arm_cas.S --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/arm_cas.S Mon Mar 17 13:15:25 2014 +0000 @@ -0,0 +1,31 @@ +#ifdef __ARM_ARCH_7A__ +@ jlong +@ arm_val_compare_and_swap_long(volatile void *ptr, +@ jlong oldval, +@ jlong newval) { + .pushsection .text + .global arm_val_compare_and_swap_long +#ifdef __thumb__ + .syntax unified + .thumb_func +#endif + .type arm_val_compare_and_swap_long, %function +arm_val_compare_and_swap_long: + stmfd sp!, {r4, r5, r6, r7} + ldrd r4, [sp, #16] + dmb sy +0: ldrexd r6, [r0] + cmp r6, r2 + it eq + cmpeq r7, r3 + bne 1f + strexd r1, r4, [r0] + cmp r1, #0 + bne 0b + dmb sy +1: mov r0, r6 + mov r1, r7 + ldmfd sp!, {r4, r5, r6, r7} + bx lr + .popsection +#endif // __ARM_ARCH_7A__ diff -r 2c97070e5af4 -r 00478c5bf5e9 src/cpu/zero/vm/asm_helper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/zero/vm/asm_helper.cpp Mon Mar 17 13:15:25 2014 +0000 @@ -0,0 +1,745 @@ +/* + * Copyright 2009, 2010 Edward Nevill + * Copyright 2011, Red Hat + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef __arm__ + +#define ARCH_THUMB2 (1<<16) +#define ARCH_VFP (1<<17) +#define ARCH_CLZ (1<<18) + +/* A workaround for private and protected fields */ +#define private public +#define protected public + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interp_masm_zero.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/klassOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/frame.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" + + +#ifndef STATIC_OFFSETS + +#include +#include + +#define VECBUFF_SIZE 64 + +static char valuebuf[128]; + +// Return the name of the current method. Not multi-thread safe. +extern "C" char* +meth(interpreterState istate) { + istate->method()->name_and_sig_as_C_string(valuebuf, sizeof valuebuf); + char *p = valuebuf + strlen(valuebuf); + sprintf(p, ": " PTR_FORMAT " (bci %d)", + (intptr_t) istate->bcp(), + istate->method()->bci_from(istate->bcp())); + return valuebuf; +} + +// Used for debugging the interpreter. The macro TRACE in +// cppInterpreter_arm.S calls this routine, and you can trap on a +// particular method. +#define NAME1 "sun.nio.ch.FileChannelImpl$Unmapper.run()V" +#define EQ(S1, S2) (S1 && (strncmp(S1, S2, strlen(S2)) == 0)) +extern "C" void my_trace(void *jpc, interpreterState istate) +{ + JavaThread *jt = istate->thread(); + if (jt->zero_stack()->sp() && jt->top_zero_frame()) { + bool has_last_Java_frame = jt->has_last_Java_frame(); + if (!has_last_Java_frame) + jt->set_last_Java_frame(); + + StackFrameStream sfs(jt); + for(int i = 0; !sfs.is_done(); sfs.next(), i++) { + } + + // Reset the frame anchor if necessary + if (!has_last_Java_frame) + jt->reset_last_Java_frame(); + } +} + +extern "C" unsigned hwcap(void) +{ + int fd; + unsigned vecs[VECBUFF_SIZE]; + unsigned *p; + int i, n; + unsigned rc = 0; + unsigned arch = 4; + + fd = open("/proc/self/auxv", O_RDONLY); + if (fd < 0) return 0; + do { + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); + p = vecs; + i = n/8; + while (--i >= 0) { + unsigned tag = *p++; + unsigned value = *p++; + if (tag == 0) goto fini; + if (tag == AT_HWCAP) { + if (value & HWCAP_THUMBEE) rc |= ARCH_THUMB2; + if (value & HWCAP_VFP) rc |= ARCH_VFP; + } else if (tag == AT_PLATFORM) { + const char *s = (const char *)value; + int c; + + if (*s++ == 'v') { + arch = 0; + while ((isdigit)(c = *s++)) arch = arch * 10 + c - '0'; + } + } + } + } while (n == VECBUFF_SIZE * sizeof(unsigned)); +fini: + close(fd); +// printf("arch = %d, rc = 0x%08x\n", arch, rc); + if (arch >= 5) rc |= ARCH_CLZ; + if (arch >= 7) rc |= ARCH_THUMB2; + return rc | (1<is_lock_owned(r1); +} + +extern "C" HeapWord **CollectedHeap_top_addr(CollectedHeap *r0) +{ + return r0->top_addr(); +} + +extern "C" HeapWord **CollectedHeap_end_addr(CollectedHeap *r0) +{ + return r0->end_addr(); +} + +extern "C" char *SharedRuntime_generate_class_cast_message(const char *name, const char *klass) +{ + return SharedRuntime::generate_class_cast_message(name, klass); +} + +#define HELPER_THROW(thread, name, msg) Exceptions::_throw_msg(thread, __FILE__, __LINE__, name, msg) + +class VMStructs { +public: + static inline klassOop klass_at_addr(constantPoolOop constants, u2 index) { + return (klassOop) *constants->obj_at_addr_raw(index); + } +}; + +extern "C" oop Helper_new(interpreterState istate, unsigned index) +{ + JavaThread *thread = istate->thread(); + + constantPoolOop constants = istate->method()->constants(); + oop result = NULL; + if (!constants->tag_at(index).is_unresolved_klass()) { + // Make sure klass is initialized and doesn't have a finalizer + oop entry = VMStructs::klass_at_addr(constants, index); + klassOop k_entry = (klassOop) entry; + instanceKlass* ik = (instanceKlass*) k_entry->klass_part(); + if ( ik->is_initialized() && ik->can_be_fastpath_allocated() ) { + size_t obj_size = ik->size_helper(); + // If the TLAB isn't pre-zeroed then we'll have to do it + bool need_zero = !ZeroTLAB; + if (UseTLAB) { + result = (oop) thread->tlab().allocate(obj_size); + } + if (result == NULL && !CMSIncrementalMode) { + need_zero = true; + // Try allocate in shared eden + retry: + HeapWord* compare_to = *Universe::heap()->top_addr(); + HeapWord* new_top = compare_to + obj_size; + if (new_top <= *Universe::heap()->end_addr()) { + if (Atomic::cmpxchg_ptr(new_top, Universe::heap()->top_addr(), compare_to) != compare_to) { + goto retry; + } + result = (oop) compare_to; + } + } + if (result != NULL) { + // Initialize object (if nonzero size and need) and then the header + if (need_zero ) { + HeapWord* to_zero = (HeapWord*) result + sizeof(oopDesc) / oopSize; + obj_size -= sizeof(oopDesc) / oopSize; + if (obj_size > 0 ) { + memset(to_zero, 0, obj_size * HeapWordSize); + } + } + if (UseBiasedLocking) { + result->set_mark(ik->prototype_header()); + } else { + result->set_mark(markOopDesc::prototype()); + } + result->set_klass_gap(0); + result->set_klass(k_entry); + return result; + } + } + } + // Slow case allocation + InterpreterRuntime::_new(thread, istate->method()->constants(), index); + result = thread->vm_result(); + thread->set_vm_result(NULL); + return result; +} + +extern "C" int Helper_instanceof(interpreterState istate, unsigned index, oop tos) +{ + if (tos == NULL) return 0; + + // Constant pool may have actual klass or unresolved klass. If it is + // unresolved we must resolve it + if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) { + InterpreterRuntime::quicken_io_cc(istate->thread()); + if (istate->thread()->has_pending_exception()) return 0; + } + klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index); + klassOop objKlassOop = tos->klass(); + // + // Check for compatibilty. This check must not GC!! + // Seems way more expensive now that we must dispatch + // + return objKlassOop == klassOf || objKlassOop->klass_part()->is_subtype_of(klassOf); +} + +extern "C" oop Helper_checkcast(interpreterState istate, unsigned index, oop tos) +{ + if (tos == NULL) return NULL; + + // Constant pool may have actual klass or unresolved klass. If it is + // unresolved we must resolve it + if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) { + oop except_oop; + InterpreterRuntime::quicken_io_cc(istate->thread()); + if (except_oop = istate->thread()->pending_exception()) return except_oop; + } + klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index); + klassOop objKlassOop = tos->klass(); //ebx + // + // Check for compatibilty. This check must not GC!! + // Seems way more expensive now that we must dispatch + // + if (objKlassOop != klassOf && !objKlassOop->klass_part()->is_subtype_of(klassOf)) { + ResourceMark rm(istate->thread()); + const char* objName = Klass::cast(objKlassOop)->external_name(); + const char* klassName = Klass::cast(klassOf)->external_name(); + char* message = SharedRuntime::generate_class_cast_message(objName, klassName); + ThreadInVMfromJava trans(istate->thread()); + HELPER_THROW(istate->thread(), vmSymbols::java_lang_ClassCastException(), message); + } + return istate->thread()->pending_exception(); +} + +extern "C" oop Helper_monitorenter(interpreterState istate, oop lockee) +{ + BasicObjectLock* limit = istate->monitor_base(); + BasicObjectLock* most_recent = (BasicObjectLock*) istate->stack_base(); + BasicObjectLock* entry = NULL; + markOop displaced; + JavaThread *thread = istate->thread(); + + if (lockee == NULL) { + HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), ""); + goto handle_exception; + } + while (most_recent != limit ) { + if (most_recent->obj() == NULL) entry = most_recent; + else if (most_recent->obj() == lockee) break; + most_recent++; + } + if (entry == NULL) { + int monitor_words = frame::interpreter_frame_monitor_size(); + ZeroStack *stack = thread->zero_stack(); + + if (monitor_words > stack->available_words()) { + InterpreterRuntime::throw_StackOverflowError(thread); + goto handle_exception; + } else { + stack->alloc(monitor_words * wordSize); + + for (intptr_t *p = istate->stack() + 1; p < istate->stack_base(); p++) + *(p - monitor_words) = *p; + + istate->set_stack_limit(istate->stack_limit() - monitor_words); + istate->set_stack(istate->stack() - monitor_words); + istate->set_stack_base(istate->stack_base() - monitor_words); + + entry = (BasicObjectLock *) istate->stack_base(); + } + } + entry->set_obj(lockee); + displaced = lockee->mark()->set_unlocked(); + entry->lock()->set_displaced_header(displaced); + if (Atomic::cmpxchg_ptr(entry, lockee->mark_addr(), displaced) != displaced) { + // Is it simple recursive case? + if (thread->is_lock_owned((address) displaced->clear_lock_bits())) { + entry->lock()->set_displaced_header(NULL); + } else { + InterpreterRuntime::monitorenter(thread, entry); + } From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 14:26:40 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:26:40 +0000 Subject: [Bug 1363] [IcedTea7] Fedora 19 / rawhide FTBFS SIGILL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1363 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=92d450da7626 author: chrisphi date: Thu Mar 21 11:17:13 2013 -0400 PR1363: Fedora 19 / rawhide FTBFS SIGILL Changed thumb2 PUSH & POP to inline functions, Added detection of reg alloc failure, fails compile of method. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 14:27:08 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:27:08 +0000 Subject: [Bug 1679] [IcedTea7] Allow OpenJDK to build on PaX-enabled kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1679 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8e7b2661433e author: andrew date: Wed Feb 19 21:08:04 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Mon Mar 17 14:27:17 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:27:17 +0000 Subject: /hg/release/icedtea7-forest-2.4/jdk: 2 new changesets Message-ID: changeset a2c172404305 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a2c172404305 author: andrew date: Wed Feb 05 11:24:21 2014 +0000 Link against $(LIBDL) if SYSTEM_CUPS is not true changeset f582aad1fce8 in /hg/release/icedtea7-forest-2.4/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f582aad1fce8 author: andrew date: Wed Feb 19 21:08:02 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels diffstat: make/com/sun/jmx/Makefile | 10 ++++++++-- make/sun/awt/mawt.gmk | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diffs (45 lines): diff -r e44a1aa00614 -r f582aad1fce8 make/com/sun/jmx/Makefile --- a/make/com/sun/jmx/Makefile Mon Feb 03 14:10:39 2014 +0900 +++ b/make/com/sun/jmx/Makefile Wed Feb 19 21:08:02 2014 +0000 @@ -114,13 +114,19 @@ endif ifeq ($(CROSS_COMPILE_ARCH),) -RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main +RMIC_VM = $(RMIC_JAVA) else -RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main +RMIC_VM = $(BOOT_JAVA_CMD) endif +RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class $(prep-target) + if [ -x $(PAX_COMMAND) ] ; then \ + if [ -w $(RMIC_VM) ] ; then \ + $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \ + fi ; \ + fi $(RMIC) -classpath "$(CLASSDESTDIR)" \ -d $(CLASSDESTDIR) \ -v1.2 \ diff -r e44a1aa00614 -r f582aad1fce8 make/sun/awt/mawt.gmk --- a/make/sun/awt/mawt.gmk Mon Feb 03 14:10:39 2014 +0900 +++ b/make/sun/awt/mawt.gmk Wed Feb 19 21:08:02 2014 +0000 @@ -192,6 +192,8 @@ ifdef USE_SYSTEM_CUPS OTHER_LDLIBS += $(CUPS_LIBS) +else + OTHER_LDLIBS += $(LIBDL) endif ifdef USE_SYSTEM_FONTCONFIG @@ -219,7 +221,6 @@ ifdef USE_SYSTEM_CUPS CPPFLAGS += -DUSE_SYSTEM_CUPS - LDFLAGS += $(CUPS_LIBS) else CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps endif From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 14:27:24 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 14:27:24 +0000 Subject: [Bug 1679] [IcedTea7] Allow OpenJDK to build on PaX-enabled kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1679 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f582aad1fce8 author: andrew date: Wed Feb 19 21:08:02 2014 +0000 PR1679: Allow OpenJDK to build on PaX-enabled kernels -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 15:21:23 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 15:21:23 +0000 Subject: [Bug 1679] [IcedTea7] Allow OpenJDK to build on PaX-enabled kernels In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1679 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com --- Comment #7 from Andrew Haley --- Shouldn't this patch be upstream? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Mar 17 15:39:34 2014 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 17 Mar 2014 15:39:34 +0000 Subject: [Bug 1710] Crash SIGSEGV in C2 Compilerthread when compiling one specific method In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1710 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #8 from Andrew Haley --- It looks to me like this is going to require a HosSpot update. The code in question has been substantially rewritten, so there's no easy way to pick out a bug fix. I have rasied this issue at jdk7u-dev at openjdk.java.net. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From stefan.reich.maker.of.eye at googlemail.com Mon Mar 17 16:29:12 2014 From: stefan.reich.maker.of.eye at googlemail.com (Stefan Reich) Date: Mon, 17 Mar 2014 17:29:12 +0100 Subject: EXTREME weirdness - applet writing without permissions Message-ID: Hi folks, here is something really really weird. I have this applet: http://tinybrain.de:8080/tb-applet/chat-applet.php with this source code (you can verify!):