Updated Branches: refs/heads/master bb4977fb1 -> 1ca30423a
WICKET-4427 possible to bypass PackageResourceGuard Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ca30423 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ca30423 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ca30423 Branch: refs/heads/master Commit: 1ca30423ac67afaa6cf72c11e3ad064578a891dd Parents: bb4977f Author: martin-g <[email protected]> Authored: Fri Feb 24 15:09:45 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 24 15:13:53 2012 +0100 ---------------------------------------------------------------------- .../wicket/markup/html/PackageResourceGuard.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1ca30423/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 88dd188..cfc73e2 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 @@ -91,7 +91,7 @@ public class PackageResourceGuard implements IPackageResourceGuard } else { - ext = path.substring(ixExtension + 1).toLowerCase(); + ext = path.substring(ixExtension + 1).toLowerCase().trim(); } if ("html".equals(ext) && @@ -167,6 +167,10 @@ public class PackageResourceGuard implements IPackageResourceGuard */ protected boolean acceptFile(String file) { + if (file != null) + { + file = file.trim(); + } return (!blockedFiles.contains(file)); }
