/hg/icedtea-web: PR898: signed applications with big jnlp-file d...
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu Mar 22 10:12:53 PDT 2012
changeset 14284e2041de in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14284e2041de
author: Omair Majid <omajid at redhat.com>
date: Thu Mar 22 13:12:44 2012 -0400
PR898: signed applications with big jnlp-file doesn't start
JNLPMatcher was using PipedInputStream and PipedOutputStream without threads
which was deadlocking on large files. Use ByteArrayOutputStream instead to
avoid this.
diffstat:
ChangeLog | 11 ++++
NEWS | 2 +
netx/net/sourceforge/jnlp/JNLPMatcher.java | 25 +++-----
tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java | 39 +++++++++++++-
4 files changed, 59 insertions(+), 18 deletions(-)
diffs (161 lines):
diff -r 89609d0a4e1c -r 14284e2041de ChangeLog
--- a/ChangeLog Mon Mar 19 14:37:03 2012 -0400
+++ b/ChangeLog Thu Mar 22 13:12:44 2012 -0400
@@ -1,3 +1,14 @@
+2012-03-21 Omair Majid <omajid at redhat.com>
+
+ * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java
+ (testIsMatchDoesNotHangOnLargeData): New method.
+
+2012-03-21 Lars Herschke <lhersch at dssgmbh.de>
+
+ PR898: signed applications with big jnlp-file doesn't start
+ * netx/net/sourceforge/jnlp/JNLPMatcher.java (JNLPMatcher): Handle large
+ files correctly.
+
2012-03-19 Danesh Dadachanji <ddadacha at redhat.com>
Fix failing unit test missing title/vendor tags in the JNLP stream.
diff -r 89609d0a4e1c -r 14284e2041de NEWS
--- a/NEWS Mon Mar 19 14:37:03 2012 -0400
+++ b/NEWS Thu Mar 22 13:12:44 2012 -0400
@@ -9,6 +9,8 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.3 (2012-XX-XX):
+* NetX
+ - PR898: signed applications with big jnlp-file doesn't start (webstart affect like "frozen")
* Plugin
- PR820: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp
- PR895: IcedTea-Web searches for missing classes on each loadClass or findClass
diff -r 89609d0a4e1c -r 14284e2041de netx/net/sourceforge/jnlp/JNLPMatcher.java
--- a/netx/net/sourceforge/jnlp/JNLPMatcher.java Mon Mar 19 14:37:03 2012 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPMatcher.java Thu Mar 22 13:12:44 2012 -0400
@@ -38,11 +38,12 @@
package net.sourceforge.jnlp;
import java.util.List;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
+import java.io.Reader;
+import java.io.StringReader;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
@@ -75,7 +76,7 @@
* if IOException, XMLParseException is thrown during parsing;
* Or launchJNLP/appTemplate is null
*/
- public JNLPMatcher(InputStreamReader appTemplate, InputStreamReader launchJNLP,
+ public JNLPMatcher(Reader appTemplate, Reader launchJNLP,
boolean isTemplate) throws JNLPMatcherException {
if (appTemplate == null && launchJNLP == null)
@@ -87,29 +88,25 @@
throw new JNLPMatcherException("Launching JNLP file is null.");
//Declare variables for signed JNLP file
- PipedInputStream pinTemplate= null;
- PipedOutputStream poutTemplate= null;
+ ByteArrayOutputStream poutTemplate= null;
//Declare variables for launching JNLP file
- PipedInputStream pinJNLPFile = null;
- PipedOutputStream poutJNLPFile = null;
+ ByteArrayOutputStream poutJNLPFile = null;
try {
XMLElement appTemplateXML = new XMLElement();
XMLElement launchJNLPXML = new XMLElement();
// Remove the comments and CDATA from the JNLP file
- pinTemplate = new PipedInputStream();
- poutTemplate = new PipedOutputStream(pinTemplate);
+ poutTemplate = new ByteArrayOutputStream();
appTemplateXML.sanitizeInput(appTemplate, poutTemplate);
- pinJNLPFile = new PipedInputStream();
- poutJNLPFile = new PipedOutputStream(pinJNLPFile);
+ poutJNLPFile = new ByteArrayOutputStream();
launchJNLPXML.sanitizeInput(launchJNLP, poutJNLPFile);
// Parse both files
- appTemplateXML.parseFromReader(new InputStreamReader(pinTemplate));
- launchJNLPXML.parseFromReader(new InputStreamReader(pinJNLPFile));
+ appTemplateXML.parseFromReader(new StringReader(poutTemplate.toString()));
+ launchJNLPXML.parseFromReader(new StringReader(poutJNLPFile.toString()));
// Initialize parent nodes
this.appTemplateNode = new Node(appTemplateXML);
@@ -122,10 +119,8 @@
e);
} finally {
// Close all stream
- closeInputStream(pinTemplate);
closeOutputStream(poutTemplate);
- closeInputStream(pinJNLPFile);
closeOutputStream(poutJNLPFile);
}
diff -r 89609d0a4e1c -r 14284e2041de tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java Mon Mar 19 14:37:03 2012 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java Thu Mar 22 13:12:44 2012 -0400
@@ -37,12 +37,13 @@
package net.sourceforge.jnlp;
-import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import junit.framework.Assert;
+import java.io.StringReader;
+import java.util.Random;
+
+import org.junit.Assert;
import org.junit.Test;
public class JNLPMatcherTest {
@@ -461,4 +462,36 @@
fileReader.close();
launchReader.close();
}
+
+ @Test (timeout=1000 /*ms*/)
+ public void testIsMatchDoesNotHangOnLargeData() throws JNLPMatcherException {
+ /* construct an alphabet containing characters 'a' to 'z' */
+ final int ALPHABET_SIZE = 26;
+ char[] alphabet = new char[ALPHABET_SIZE];
+ for (int i = 0; i < ALPHABET_SIZE; i++) {
+ alphabet[i] = (char)('a' + i);
+ }
+ /* generate a long but random string using the alphabet */
+ final Random r = new Random();
+ final int STRING_SIZE = 1024 * 1024; // 1 MB
+ StringBuilder descriptionBuilder = new StringBuilder(STRING_SIZE);
+ for (int i = 0; i < STRING_SIZE; i++) {
+ descriptionBuilder.append(alphabet[r.nextInt(ALPHABET_SIZE)]);
+ }
+ String longDescription = descriptionBuilder.toString();
+
+ String file =
+ "<jnlp>\n" +
+ " <information>\n" +
+ " <title>JNLPMatcher hanges on large file size</title>\n" +
+ " <vendor>IcedTea</vendor>\n" +
+ " <description>" + longDescription + "</description>\n" +
+ " </information>\n" +
+ "</jnlp>\n";
+
+ StringReader reader1 = new StringReader(file);
+ StringReader reader2 = new StringReader(file);
+ JNLPMatcher matcher = new JNLPMatcher(reader1, reader2, false);
+ Assert.assertTrue(matcher.isMatch());
+ }
}
More information about the distro-pkg-dev
mailing list