Author: brett
Date: Thu Mar 19 14:12:57 2009
New Revision: 756012
URL: http://svn.apache.org/viewvc?rev=756012&view=rev
Log:
[MRM-1147] handling leading / on whitelists is ambiguous
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=756012&r1=756011&r2=756012&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Thu Mar 19 14:12:57 2009
@@ -958,8 +958,18 @@
return false;
}
+ if ( !path.startsWith( "/" ) )
+ {
+ path = "/" + path;
+ }
+
for ( String pattern : patterns )
{
+ if ( !pattern.startsWith( "/" ) )
+ {
+ pattern = "/" + pattern;
+ }
+
if ( SelectorUtils.matchPath( pattern, path, false ) )
{
return true;