From 4e54b331710269c584f8c328fbb395789b4a5502 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 27 Nov 2013 14:20:25 +0100 Subject: Reverted "fix to ManifestedJar1Test cases", better manifestedjar tests, added srtict test * netx/net/sourceforge/jnlp/Parser.java: added indentation, fixes condition in strict base check * netx/net/sourceforge/jnlp/ResourcesDesc.java: revertedt recently added throw * tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java: (manifestedJar1main2mainNoAppDesc) adapted and (manifestedJar1main2mainNoAppDescStrict) added --- netx/net/sourceforge/jnlp/Parser.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'netx/net/sourceforge/jnlp/Parser.java') diff --git a/netx/net/sourceforge/jnlp/Parser.java b/netx/net/sourceforge/jnlp/Parser.java index 310b306..4043fa6 100644 --- a/netx/net/sourceforge/jnlp/Parser.java +++ b/netx/net/sourceforge/jnlp/Parser.java @@ -250,13 +250,13 @@ class Parser { Node resources[] = getChildNodes(parent, "resources"); // ensure that there are at least one information section present - if (resources.length == 0 && !j2se) + if (resources.length == 0 && !j2se) { throw new ParseException(R("PNoResources")); - + } // create objects from the resources sections - for (int i = 0; i < resources.length; i++) + for (int i = 0; i < resources.length; i++) { result.add(getResourcesDesc(resources[i], j2se)); - + } return result; } @@ -302,9 +302,11 @@ class Parser { // check for duplicate main entries if (jar.isMain()) { - if (mainFlag == true) - if (strict) + if (mainFlag == true) { + if (strict) { throw new ParseException(R("PTwoMains")); + } + } mainFlag = true; } @@ -1073,10 +1075,11 @@ class Parser { URL result = new URL(base, href); // check for going above the codebase - if (!result.toString().startsWith(base.toString())) - if (strict) + if (!result.toString().startsWith(base.toString()) && !base.toString().startsWith(result.toString())){ + if (strict) { throw new ParseException(R("PUrlNotInCodebase", node.getNodeName(), href, base)); - + } + } return result; } -- cgit v1.2.3