WICKET-5851 Fix PackageResourceTest and PackageResourceGuardTest under Windows
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2ed52c01 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2ed52c01 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2ed52c01 Branch: refs/heads/wicket-6.x Commit: 2ed52c012c5d84c9dfcb5ffb571b9541c0575073 Parents: 830776e Author: Alexander Morozov <[email protected]> Authored: Fri Mar 6 23:51:13 2015 +0600 Committer: Alexander Morozov <[email protected]> Committed: Fri Mar 6 23:51:13 2015 +0600 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/PackageResourceGuard.java | 3 ++- .../apache/wicket/markup/html/PackageResourceGuardTest.java | 7 ++++++- .../org/apache/wicket/markup/html/PackageResourceTest.java | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2ed52c01/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java index be9bb43..db1aeb6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java @@ -85,7 +85,8 @@ public class PackageResourceGuard implements IPackageResourceGuard int len = path.length(); final String ext; if (ixExtension <= 0 || ixExtension == len || - (path.lastIndexOf(File.separator) + 1) == ixExtension) + (path.lastIndexOf('/') + 1) == ixExtension || + (path.lastIndexOf('\\') + 1) == ixExtension) { ext = null; } http://git-wip-us.apache.org/repos/asf/wicket/blob/2ed52c01/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java index 70dd39b..9807cae 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java @@ -54,16 +54,21 @@ public class PackageResourceGuardTest extends WicketTestCase guard.setAllowAccessToRootResources(false); assertTrue(guard.acceptAbsolutePath("/test/test.js")); + assertTrue(guard.acceptAbsolutePath("/test/.java")); assertFalse(guard.acceptAbsolutePath("/test.js")); - if ("\\".equals(File.pathSeparator)) + if ("\\".equals(File.separator)) { + assertTrue(guard.acceptAbsolutePath("c:\\test\\org\\apache\\.java")); + assertTrue(guard.acceptAbsolutePath("\\test\\org\\apache\\.java")); assertTrue(guard.acceptAbsolutePath("c:\\test\\org\\apache\\test.js")); assertTrue(guard.acceptAbsolutePath("\\test\\org\\apache\\test.js")); assertFalse(guard.acceptAbsolutePath("c:\\test.js")); assertFalse(guard.acceptAbsolutePath("\\test.js")); // java also generates file paths with '/' on windows + assertTrue(guard.acceptAbsolutePath("c:/test/org/apache/.java")); + assertTrue(guard.acceptAbsolutePath("/test/org/apache/.java")); assertTrue(guard.acceptAbsolutePath("c:/test/org/apache/test.js")); assertTrue(guard.acceptAbsolutePath("/test/org/apache/test.js")); assertFalse(guard.acceptAbsolutePath("c:/test.js")); http://git-wip-us.apache.org/repos/asf/wicket/blob/2ed52c01/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java index a995e4e..765f44d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java @@ -86,6 +86,8 @@ public class PackageResourceTest extends WicketTestCase assertTrue(guard.accept(PackageResourceTest.class, Packages.absolutePath(PackageResourceTest.class, ".Bar"))); assertTrue(guard.accept(PackageResourceTest.class, + Packages.absolutePath(PackageResourceTest.class, "foo/.java"))); + assertTrue(guard.accept(PackageResourceTest.class, Packages.absolutePath(PackageResourceTest.class, ".java"))); assertFalse(guard.accept(PackageResourceTest.class, Packages.absolutePath(PackageResourceTest.class, "Bar.java")));
