/hg/icedtea-web: Empty "" codebase now behaves as "." codebase

[jvanek at icedtea.classpath.org]

changeset c6af2f50a95e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6af2f50a95e
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Oct 09 18:42:42 2014 +0200

	Empty "" codebase now behaves as "." codebase


diffstat:

 ChangeLog                                               |  12 ++++++
 netx/net/sourceforge/jnlp/Parser.java                   |  34 +++++++++++++----
 netx/net/sourceforge/jnlp/security/SecurityDialogs.java |   8 +++-
 tests/netx/unit/net/sourceforge/jnlp/ParserTest.java    |  26 +++++++++++++
 4 files changed, 71 insertions(+), 9 deletions(-)

diffs (138 lines):

diff -r 911729fab592 -r c6af2f50a95e ChangeLog
--- a/ChangeLog	Wed Oct 08 16:13:58 2014 -0400
+++ b/ChangeLog	Thu Oct 09 18:42:42 2014 +0200
@@ -1,3 +1,15 @@
+2014-10-09  Jiri Vanek  <jvanek at redhat.com>
+
+	Empty "" codebase now behaves as "." codebase
+	* file netx/net/sourceforge/jnlp/Parser.java: introduced CODEBASE constant
+	to avoid duplicated String getAttribute  split to getCleanAttribute, which
+	get the pure attribute, and remaining getAttribute keep adding null in case
+	of empty
+	* file netx/net/sourceforge/jnlp/security/SecurityDialogs.java: added 
+	workaround about possible null codebase
+	* file tests/netx/unit/net/sourceforge/jnlp/ParserTest.java: added test for
+	empty codebase
+
 2014-10-08  Lukasz Dracz  <ldracz at redhat.com>
 
 	Standardize all options to use hyphens
diff -r 911729fab592 -r c6af2f50a95e netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java	Wed Oct 08 16:13:58 2014 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java	Thu Oct 09 18:42:42 2014 +0200
@@ -39,6 +39,8 @@
  * @version $Revision: 1.13 $
  */
 class Parser {
+    
+    private static String CODEBASE = "codebase";
 
     // defines netx.jnlp.Node class if using Tiny XML or Nano XML
 
@@ -143,7 +145,7 @@
         this.spec = getVersion(root, "spec", "1.0+");
 
         try {
-            this.codebase = addSlash(getURL(root, "codebase", base));
+            this.codebase = addSlash(getURL(root, CODEBASE, base));
         } catch (ParseException e) {
             //If parsing fails, continue by overriding the codebase with the one passed in
         }
@@ -1065,10 +1067,20 @@
      * @throws ParseException if the JNLP file is invalid
      */
     public URL getURL(Node node, String name, URL base) throws ParseException {
-        String href = getAttribute(node, name, null);
-        if (href == null)
+        String href = null;
+        if (CODEBASE.equals(name)) {
+            href = getCleanAttribute(node, name);
+            //in case of null code can throw an exception later
+            //some bogus jnlps have codebase as "" and expect it behaving as "."
+            if (href != null && href.trim().isEmpty()) {
+                href = ".";
+            }
+        } else {
+            href = getAttribute(node, name, null);
+        }
+        if (href == null) {
             return null; // so that code can throw an exception if attribute was required
-
+        }
         try {
             if (base == null)
                 return new URL(href);
@@ -1254,11 +1266,17 @@
     public String getAttribute(Node node, String name, String defaultValue) {
         // SAX
         // String result = ((Element) node).getAttribute(name);
+        String result = getCleanAttribute(node, name);
+
+        if (result == null || result.length() == 0) {
+            return defaultValue;
+        }
+
+        return result;
+    }
+
+    private String getCleanAttribute(Node node, String name) {
         String result = node.getAttribute(name);
-
-        if (result == null || result.length() == 0)
-            return defaultValue;
-
         return result;
     }
 
diff -r 911729fab592 -r c6af2f50a95e netx/net/sourceforge/jnlp/security/SecurityDialogs.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java	Wed Oct 08 16:13:58 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java	Thu Oct 09 18:42:42 2014 +0200
@@ -285,7 +285,13 @@
 
         SecurityDialogMessage message = new SecurityDialogMessage();
         message.dialogType = DialogType.MISSING_ALACA;
-        message.extras = new Object[]{title, codeBase.toString(), UrlUtils.setOfUrlsToHtmlList(remoteUrls)};
+         String urlToShow = "unknown url";
+         if (codeBase != null) {
+             urlToShow = codeBase.toString();
+         } else {
+             OutputController.getLogger().log("Warning, null codebase wants to show in ALACA!");
+         }
+        message.extras = new Object[]{title, urlToShow, UrlUtils.setOfUrlsToHtmlList(remoteUrls)};
         Object selectedValue = getUserResponse(message);
         return getIntegerResponseAsBoolean(selectedValue);
     } 
diff -r 911729fab592 -r c6af2f50a95e tests/netx/unit/net/sourceforge/jnlp/ParserTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/ParserTest.java	Wed Oct 08 16:13:58 2014 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserTest.java	Thu Oct 09 18:42:42 2014 +0200
@@ -1413,4 +1413,30 @@
 
         Assert.assertEquals(overwrittenCodebase.toExternalForm(), parser.getCodeBase().toExternalForm());
     }
+    
+    
+    @Test
+    public void testEmptyCodebase() throws Exception {
+        String data = "<?xml version=\"1.0\"?>\n"
+                + "<jnlp spec=\"1.5+\"\n"
+                + "codebase=\"\"  aaa=\"\" "
+                + ">\n"
+                + "</jnlp>";
+
+        Node root = Parser.getRootNode(new ByteArrayInputStream(data.getBytes()), defaultParser);
+        Assert.assertEquals("Root name is not jnlp", "jnlp", root.getNodeName());
+        MockJNLPFile file = new MockJNLPFile(LANG_LOCALE);
+        Parser parser = new Parser(file, null, root, defaultParser, null);
+        ParseException eex = null;
+        //non codebase element is unaffected
+        URL u = parser.getURL(root, "aaa", null);
+        Assert.assertEquals(null, u);
+        try {
+            parser.getURL(root, "codebase", null);
+        } catch (ParseException ex) {
+            eex = ex;
+        }
+        Assert.assertEquals(true, eex != null);
+        Assert.assertEquals(true, eex instanceof ParseException);
+    }
 }