Index: src/test/java/info/magnolia/cms/util/SimpleUrlPatternTest.java
===================================================================
--- src/test/java/info/magnolia/cms/util/SimpleUrlPatternTest.java (revision 35979)
+++ src/test/java/info/magnolia/cms/util/SimpleUrlPatternTest.java (working copy)
@@ -45,6 +45,11 @@
*/
public class SimpleUrlPatternTest extends TestCase {
+ public void testDotDoPattern() {
+ final SimpleUrlPattern sup = new SimpleUrlPattern("*.do");
+ assertFalse(sup.match("/.resources/enterprise-css/registration.css"));
+ }
+
/**
* Test without wildcards.
*/
@@ -128,14 +133,14 @@
public void testWildcardsMatch() {
assertTrue(new SimpleUrlPattern("/*/num?page.html").match("/*/num2page.html"));
}
-
+
/**
* Test with the *
and ?
wildcards.
*/
public void testWildcardsWithSpecialChars() {
assertTrue(new SimpleUrlPattern("/*").match("/*/page‘.html"));
}
-
+
/**
* Test with the *
and ?
wildcards.
*/
@@ -179,9 +184,9 @@
assertTrue(new SimpleUrlPattern("/*").match(NFC));
assertTrue(new SimpleUrlPattern("/*").match(NFD));
assertTrue(new SimpleUrlPattern("/*").match(MACROMAN));
-
+
assertTrue(new SimpleUrlPattern("/*").match("/£"));
-
+
}
}
Index: src/main/java/info/magnolia/cms/util/SimpleUrlPattern.java
===================================================================
--- src/main/java/info/magnolia/cms/util/SimpleUrlPattern.java (revision 35979)
+++ src/main/java/info/magnolia/cms/util/SimpleUrlPattern.java (working copy)
@@ -56,7 +56,7 @@
/**
* Any char, newline included.
*/
- public static final String URL_CHAR_PATTERN = "(.*\\n*)"; //$NON-NLS-1$
+ public static final String URL_CHAR_PATTERN = "."; //$NON-NLS-1$
/**
* Regexp pattern used for the simple keyword *
. Matches 0 or more characters.
@@ -90,7 +90,7 @@
*/
public SimpleUrlPattern(String string) {
this.length = StringUtils.removeEnd(string, "*").length();
- this.pattern = Pattern.compile(getEncodedString(string));
+ this.pattern = Pattern.compile(getEncodedString(string), Pattern.DOTALL);
this.patternString = string;
}