Repository: jclouds
Updated Branches:
refs/heads/master 1103a778d -> 82ab88d58
tighten the isUrlEncoded check
ideally we shouldn't need this function and instead never double
encode strings, but auditing for that is beyond what I have time
for. currently, putBlob(" ") and putBlob("%20") behave the same
way which is arguably incorrect
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/82ab88d5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/82ab88d5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/82ab88d5
Branch: refs/heads/master
Commit: 82ab88d5896a6628f3fbb42a3c4bce39ce843fa1
Parents: 1103a77
Author: Ka-Hing Cheung <[email protected]>
Authored: Wed May 27 16:12:11 2015 -0700
Committer: Andrew Gaul <[email protected]>
Committed: Wed May 27 16:48:30 2015 -0700
----------------------------------------------------------------------
.../main/java/org/jclouds/util/Strings2.java | 28 +++++++++++++++++---
.../java/org/jclouds/util/Strings2Test.java | 4 +++
2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/82ab88d5/core/src/main/java/org/jclouds/util/Strings2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Strings2.java
b/core/src/main/java/org/jclouds/util/Strings2.java
index 2081c3d..25f44ad 100644
--- a/core/src/main/java/org/jclouds/util/Strings2.java
+++ b/core/src/main/java/org/jclouds/util/Strings2.java
@@ -90,11 +90,33 @@ public class Strings2 {
public static boolean isCidrFormat(String in) {
return CIDR_PATTERN.matcher(in).matches();
}
-
- private static final Pattern URL_ENCODED_PATTERN =
Pattern.compile(".*%[a-fA-F0-9][a-fA-F0-9].*");
+
+ // taken from
https://docs.oracle.com/javase/7/docs/api/java/net/URI.html#legal-chars
+ private static final Pattern URL_VALID_PATTERN =
Pattern.compile("[a-zA-Z0-9_\\-!.~'()*,;:$&+=?/\\[\\]@%]+");
+
+ private static boolean isHexadecimal(char ch) {
+ return (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f') || (ch >=
'0' && ch <= '9');
+ }
public static boolean isUrlEncoded(String in) {
- return URL_ENCODED_PATTERN.matcher(in).matches();
+ if (!URL_VALID_PATTERN.matcher(in).matches()) {
+ return false;
+ }
+
+ // ensure that all % are followed by 2 hexadecimal characters
+ int percentIdx = 0;
+ while ((percentIdx = in.indexOf('%', percentIdx)) != -1) {
+ if (percentIdx + 2 >= in.length()) {
+ return false;
+ }
+ if (!isHexadecimal(in.charAt(percentIdx + 1)) ||
+ !isHexadecimal(in.charAt(percentIdx + 2))) {
+ return false;
+ }
+ percentIdx += 2;
+ }
+
+ return true;
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/82ab88d5/core/src/test/java/org/jclouds/util/Strings2Test.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/util/Strings2Test.java
b/core/src/test/java/org/jclouds/util/Strings2Test.java
index 84fc776..f1901b6 100644
--- a/core/src/test/java/org/jclouds/util/Strings2Test.java
+++ b/core/src/test/java/org/jclouds/util/Strings2Test.java
@@ -30,6 +30,10 @@ public class Strings2Test {
public void testIsEncoded() {
assert Strings2.isUrlEncoded("/read-tests/%73%6f%6d%65%20%66%69%6c%65");
assert !Strings2.isUrlEncoded("/read-tests/ tep");
+ assert !Strings2.isUrlEncoded("/read-tests/dealde%2Fl04 011e%204c8df");
+ assert !Strings2.isUrlEncoded("/read-tests/%/");
+ assert !Strings2.isUrlEncoded("/read-tests/%ZZ");
+ assert Strings2.isUrlEncoded("/read-tests/%20");
}
public void testNoDoubleEncode() {
