You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2013/04/01 03:39:22 UTC
git commit: WICKET-5126 allow webfonts in secure resource guard
Updated Branches:
refs/heads/master 5aed41d63 -> 82f71abde
WICKET-5126 allow webfonts in secure resource guard
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/82f71abd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/82f71abd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/82f71abd
Branch: refs/heads/master
Commit: 82f71abde9a7caca8b7247f853daa09edd691a2a
Parents: 5aed41d
Author: Igor Vaynberg <ig...@gmail.com>
Authored: Sun Mar 31 18:39:16 2013 -0700
Committer: Igor Vaynberg <ig...@gmail.com>
Committed: Sun Mar 31 18:39:16 2013 -0700
----------------------------------------------------------------------
.../markup/html/SecurePackageResourceGuard.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/82f71abd/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
index a19d709..03cf606 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
@@ -94,10 +94,10 @@ public class SecurePackageResourceGuard extends PackageResourceGuard
/**
* Constructor.
- *
+ *
* @param cache
- * the internal cache that will hold the results for all already checked resources.
- * Use {@code null} to disable caching.
+ * the internal cache that will hold the results for all already checked resources.
+ * Use {@code null} to disable caching.
*/
public SecurePackageResourceGuard(final ConcurrentMap<String, Boolean> cache)
{
@@ -121,6 +121,12 @@ public class SecurePackageResourceGuard extends PackageResourceGuard
addPattern("+*.swf");
addPattern("+*.bmp");
addPattern("+*.svg");
+
+ // allow web fonts
+ addPattern("+*.eot");
+ addPattern("+*.ttf");
+ addPattern("+*.woff");
+
}
/**