You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2017/01/10 20:35:18 UTC
jclouds git commit: Allow ipv6 address blocks
Repository: jclouds
Updated Branches:
refs/heads/master 61d0920f1 -> eda96a0ab
Allow ipv6 address blocks
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/eda96a0a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/eda96a0a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/eda96a0a
Branch: refs/heads/master
Commit: eda96a0ab940fc94ce5c8ef4dd5ae8442b21dcac
Parents: 61d0920
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Jan 3 16:53:18 2017 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Tue Jan 10 14:33:36 2017 -0600
----------------------------------------------------------------------
.../main/java/org/jclouds/util/Strings2.java | 39 ++++++++++++++++----
.../java/org/jclouds/util/Strings2Test.java | 18 ++++++++-
2 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eda96a0a/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 28ba26c..27fd545 100644
--- a/core/src/main/java/org/jclouds/util/Strings2.java
+++ b/core/src/main/java/org/jclouds/util/Strings2.java
@@ -41,6 +41,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Multimap;
import com.google.common.io.CharStreams;
+import com.google.common.net.InetAddresses;
import com.google.common.primitives.Chars;
public class Strings2 {
@@ -67,7 +68,7 @@ public class Strings2 {
throw new IllegalStateException("error creating pattern: " + in, e);
}
}
-
+
private static final LoadingCache<Character, String> CHAR_TO_ENCODED = CacheBuilder.newBuilder()
.<Character, String> build(new CacheLoader<Character, String>() {
@Override
@@ -79,19 +80,43 @@ public class Strings2 {
}
}
});
-
+
private static final String IP_ADDRESS = "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})";
private static final String SLASH_FORMAT = IP_ADDRESS + "/(\\d{1,3})";
private static final Pattern ADDRESS_PATTERN = Pattern.compile(IP_ADDRESS);
private static final Pattern CIDR_PATTERN = Pattern.compile(SLASH_FORMAT);
public static boolean isCidrFormat(String in) {
- return CIDR_PATTERN.matcher(in).matches();
+ return CIDR_PATTERN.matcher(in).matches() || isIPv6CIDR(in);
+ }
+
+ public static boolean isIPv6CIDR(String in) {
+ // ensure IPv6 notation (as opposed to parsing for IPv4)
+ if ( !in.contains(":"))
+ return false;
+ String[] parts = in.split("/");
+ if ( parts.length != 2 ) {
+ if (parts.length == 1)
+ return InetAddresses.isInetAddress(in);
+ else
+ return false;
+ }
+ // no leading zero
+ if ( parts[1].length() > 1 && parts[1].startsWith("0"))
+ return false;
+ int mask;
+ try {
+ mask = Integer.parseInt(parts[1]);
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ if (mask < 0 || mask > 128) return false;
+ return InetAddresses.isInetAddress(parts[0]);
}
/**
* url decodes the input param, if set.
- *
+ *
* @param in
* nullable
* @return null if input was null
@@ -124,12 +149,12 @@ public class Strings2 {
/**
* replaces tokens that are expressed as <code>{token}</code>
- *
+ *
* <p/>
* ex. if input is "hello {where}"<br/>
* and replacements is "where" -> "world" <br/>
* then replaceTokens returns "hello world"
- *
+ *
* @param input
* source to replace
* @param replacements
@@ -151,7 +176,7 @@ public class Strings2 {
builder.append(input, i, input.length());
return builder.toString();
}
-
+
private static final Pattern TOKEN_PATTERN = Pattern.compile("\\{(.+?)\\}");
public static String replaceTokens(String input, Multimap<String, ?> tokenValues) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/eda96a0a/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 bbfbfee..2acdd35 100644
--- a/core/src/test/java/org/jclouds/util/Strings2Test.java
+++ b/core/src/test/java/org/jclouds/util/Strings2Test.java
@@ -42,9 +42,25 @@ public class Strings2Test {
public void testIsCidrFormat() {
assert Strings2.isCidrFormat("1.2.3.4/5");
assert Strings2.isCidrFormat("0.0.0.0/0");
+ assert Strings2.isCidrFormat("fe80::/64");
+ assert Strings2.isCidrFormat("fdcf:11a8:b89f::/64");
+ assert Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af");
+
+ for (int n = 0; n <= 128; n = n + 1) {
+ assert Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/" + n);
+ }
+
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/129");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/b");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/*");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/@");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/00");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/01");
+ assert !Strings2.isCidrFormat("fe80:fd6d:96a8:b89f:abcd:11aa:1234:15af/");
+
assert !Strings2.isCidrFormat("banana");
assert !Strings2.isCidrFormat("1.2.3.4");
assert !Strings2.isCidrFormat("500.500.500.500/2423");
}
-
+
}