Fix isPrefixMatch() to not match extension based URls.

Bauke Scholtz · Bauke Scholtz · commit 84f674859b1a · 2015-12-01T10:16:47.000+01:00
diff --git a/src/main/java/org/omnifaces/config/WebXml.java b/src/main/java/org/omnifaces/config/WebXml.java
@@ -305,11 +305,11 @@ private static boolean isExactMatch(String urlPattern, String url) {
 	}
 
 	private static boolean isPrefixMatch(String urlPattern, String url) {
-		return urlPattern.endsWith("/*") ? url.startsWith(urlPattern.substring(0, urlPattern.length() - 2)) : false;
+		return urlPattern.endsWith("/*") && (url + "/").startsWith(urlPattern.substring(0, urlPattern.length() - 1));
 	}
 
 	private static boolean isSuffixMatch(String urlPattern, String url) {
-		return urlPattern.startsWith("*.") ? url.endsWith(urlPattern.substring(1)) : false;
+		return urlPattern.startsWith("*.") && url.endsWith(urlPattern.substring(1));
 	}
 
 	private static boolean isRoleMatch(Set<String> roles, String role) {

Original file line number	Diff line number	Diff line change
`@@ -305,11 +305,11 @@ private static boolean isExactMatch(String urlPattern, String url) {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`private static boolean isPrefixMatch(String urlPattern, String url) {`
`308`		`- return urlPattern.endsWith("/*") ? url.startsWith(urlPattern.substring(0, urlPattern.length() - 2)) : false;`
	`308`	`+ return urlPattern.endsWith("/*") && (url + "/").startsWith(urlPattern.substring(0, urlPattern.length() - 1));`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`private static boolean isSuffixMatch(String urlPattern, String url) {`
`312`		`- return urlPattern.startsWith("*.") ? url.endsWith(urlPattern.substring(1)) : false;`
	`312`	`+ return urlPattern.startsWith("*.") && url.endsWith(urlPattern.substring(1));`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`private static boolean isRoleMatch(Set<String> roles, String role) {`