Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-10 03:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Escaping regex special chars (esp. '\') in delimiter matching

Browse Source 
Uncovered by 370194b
This commit is contained in:
Andrew Phillips 2014-07-22 10:25:51 -04:00
parent 365ac21f1e
commit 5732bdcd94
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java
View File

@ -33,6 +33,7 @@ import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.regex.Pattern;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.inject.Inject; import javax.inject.Inject;
@ -332,7 +333,7 @@ public class LocalAsyncBlobStore extends BaseAsyncBlobStore {
// ensure we don't accidentally append twice // ensure we don't accidentally append twice
String toMatch = prefix.endsWith("/") ? prefix : prefix + delimiter; String toMatch = prefix.endsWith("/") ? prefix : prefix + delimiter;
if (metadata.getName().startsWith(toMatch)) { if (metadata.getName().startsWith(toMatch)) {
String unprefixedName = metadata.getName().replaceFirst(toMatch, ""); String unprefixedName = metadata.getName().replaceFirst(Pattern.quote(toMatch), "");
if (unprefixedName.equals("")) { if (unprefixedName.equals("")) {
// we are the prefix in this case, return false // we are the prefix in this case, return false
return false; return false;
@ -359,7 +360,7 @@ public class LocalAsyncBlobStore extends BaseAsyncBlobStore {
// ensure we don't accidentally append twice // ensure we don't accidentally append twice
String toMatch = prefix.endsWith("/") ? prefix : prefix + delimiter; String toMatch = prefix.endsWith("/") ? prefix : prefix + delimiter;
if (working.startsWith(toMatch)) { if (working.startsWith(toMatch)) {
working = working.replaceFirst(toMatch, ""); working = working.replaceFirst(Pattern.quote(toMatch), "");
} }
} }
if (working.contains(delimiter)) { if (working.contains(delimiter)) {