Repository: wicket Updated Branches: refs/heads/wicket-7.x 8d78d00ca -> 3db582cfe
WICKET-6290 fix CssUrlReplacer so it does not mangle data URIs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3db582cf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3db582cf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3db582cf Branch: refs/heads/wicket-7.x Commit: 3db582cfe3ef755707aace9029b0c2ba9f46a706 Parents: 8d78d00 Author: Carl-Eric Menzel <cmen...@apache.org> Authored: Mon Nov 28 14:27:40 2016 +0100 Committer: Carl-Eric Menzel <cmen...@apache.org> Committed: Mon Nov 28 14:58:34 2016 +0100 ---------------------------------------------------------------------- .../apache/wicket/resource/CssUrlReplacer.java | 7 +++++++ .../wicket/resource/CssUrlReplacerTest.java | 21 +++++++++++--------- .../java/org/apache/wicket/request/Url.java | 11 ++++++++++ 3 files changed, 30 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3db582cf/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java index ab0f45f..a19fe2e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java @@ -108,6 +108,11 @@ public class CssUrlReplacer implements IScopeAwareTextResourceProcessor, ICssCom { processedUrl = imageCandidateUrl.toString(); } + else if (imageCandidateUrl.isDataUrl()) + { + embedded = true; + processedUrl = imageCandidateUrl.toString(); + } else { // relativize against the url for the containing CSS file @@ -139,6 +144,8 @@ public class CssUrlReplacer implements IScopeAwareTextResourceProcessor, ICssCom } } + + // embedded data urls don't need single quotes, but regular urls do: matcher.appendReplacement(output, embedded ? "url(" + processedUrl + ")" : "url('" + processedUrl + "')"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/3db582cf/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java index 63b2b38..675c665 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/CssUrlReplacerTest.java @@ -27,11 +27,8 @@ import org.apache.wicket.request.resource.caching.IStaticCacheableResource; import org.apache.wicket.request.resource.caching.ResourceUrl; import org.apache.wicket.request.resource.caching.version.MessageDigestResourceVersion; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; import org.junit.Test; -import java.util.Locale; - public class CssUrlReplacerTest extends WicketTestCase { @@ -60,17 +57,23 @@ public class CssUrlReplacerTest extends WicketTestCase } }; } - - @Before - public void before() + + @Test + public void doNotProcessFullUrls() { - tester.getSession().setLocale(Locale.ENGLISH); + String input = ".class {background-image: url('http://example.com/some.img');}"; + Class<?> scope = CssUrlReplacerTest.class; + String cssRelativePath = "res/css/some.css"; + CssUrlReplacer replacer = new CssUrlReplacer(); + + String processed = replacer.process(input, scope, cssRelativePath); + assertThat(processed, is(input)); } @Test - public void doNotProcessFullUrls() + public void doNotProcessDataUrls_WICKET_6290() { - String input = ".class {background-image: url('http://example.com/some.img');}"; + String input = ".class {background-image: url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHH);}"; Class<?> scope = CssUrlReplacerTest.class; String cssRelativePath = "res/css/some.css"; CssUrlReplacer replacer = new CssUrlReplacer(); http://git-wip-us.apache.org/repos/asf/wicket/blob/3db582cf/wicket-request/src/main/java/org/apache/wicket/request/Url.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java index be49640..4a078df 100755 --- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java @@ -493,6 +493,17 @@ public class Url implements Serializable } /** + * Returns whether the Url is a CSS data uri. Data uris start with '{@literal data:}'. + * + * @return <code>true</code> if Url starts with 'data:', <code>false</code> otherwise. + */ + public boolean isDataUrl() + { + return (getProtocol() != null && getProtocol().equals("data")) || (!getSegments().isEmpty() && getSegments() + .get(0).startsWith("data")); + } + + /** * Returns whether the Url has a <em>host</em> attribute. * The scheme is optional because the url may be <code>//host/path</code>. * The port is also optional because there are defaults for the different protocols.
