Add SubnetAddressTranslator #2013
+831
−69
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| package com.datastax.oss.driver.internal.core.addresstranslation; | ||
|
|
||
| import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; | ||
| import java.net.InetAddress; | ||
| import java.net.UnknownHostException; | ||
| import java.util.Arrays; | ||
|
|
||
| class Subnet { | ||
| private final byte[] subnet; | ||
| private final byte[] networkMask; | ||
| private final byte[] upper; | ||
| private final byte[] lower; | ||
|
|
||
| private Subnet(byte[] subnet, byte[] networkMask) { | ||
| this.subnet = subnet; | ||
| this.networkMask = networkMask; | ||
|
|
||
| byte[] upper = new byte[subnet.length]; | ||
| byte[] lower = new byte[subnet.length]; | ||
| for (int i = 0; i < subnet.length; i++) { | ||
| upper[i] = (byte) (subnet[i] | ~networkMask[i]); | ||
| lower[i] = (byte) (subnet[i] & networkMask[i]); | ||
| } | ||
| this.upper = upper; | ||
| this.lower = lower; | ||
| } | ||
|
|
||
| static Subnet parse(String subnetCIDR) throws UnknownHostException { | ||
| String[] parts = subnetCIDR.split("/"); | ||
| if (parts.length != 2) { | ||
| throw new IllegalArgumentException("Invalid subnet: " + subnetCIDR); | ||
| } | ||
|
|
||
| boolean isIPv6 = parts[0].contains(":"); | ||
| byte[] subnet = InetAddress.getByName(parts[0]).getAddress(); | ||
| if (isIPv4(subnet) && isIPv6) { | ||
| subnet = toIPv6(subnet); | ||
| } | ||
| int prefixLength = Integer.parseInt(parts[1]); | ||
| validatePrefixLength(subnet, prefixLength); | ||
|
|
||
| byte[] networkMask = toNetworkMask(subnet, prefixLength); | ||
| validateSubnetIsPrefixBlock(subnet, networkMask, subnetCIDR); | ||
| return new Subnet(subnet, networkMask); | ||
| } | ||
|
|
||
| private static byte[] toNetworkMask(byte[] subnet, int prefixLength) { | ||
| int fullBytes = prefixLength / 8; | ||
| int remainingBits = prefixLength % 8; | ||
| byte[] mask = new byte[subnet.length]; | ||
| Arrays.fill(mask, 0, fullBytes, (byte) 0xFF); | ||
| if (remainingBits > 0) { | ||
| mask[fullBytes] = (byte) (0xFF << (8 - remainingBits)); | ||
| } | ||
| return mask; | ||
| } | ||
|
|
||
| private static void validatePrefixLength(byte[] subnet, int prefixLength) { | ||
| int max_prefix_length = subnet.length * 8; | ||
| if (prefixLength < 0 || max_prefix_length < prefixLength) { | ||
| throw new IllegalArgumentException( | ||
| String.format( | ||
| "Prefix length %s must be within [0; %s]", prefixLength, max_prefix_length)); | ||
| } | ||
| } | ||
|
|
||
| private static void validateSubnetIsPrefixBlock( | ||
| byte[] subnet, byte[] networkMask, String subnetCIDR) { | ||
| byte[] prefixBlock = toPrefixBlock(subnet, networkMask); | ||
| if (!Arrays.equals(subnet, prefixBlock)) { | ||
| throw new IllegalArgumentException( | ||
| String.format("Subnet %s must be represented as a network prefix block", subnetCIDR)); | ||
| } | ||
| } | ||
|
|
||
| private static byte[] toPrefixBlock(byte[] subnet, byte[] networkMask) { | ||
| byte[] prefixBlock = new byte[subnet.length]; | ||
| for (int i = 0; i < subnet.length; i++) { | ||
| prefixBlock[i] = (byte) (subnet[i] & networkMask[i]); | ||
| } | ||
| return prefixBlock; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| byte[] getSubnet() { | ||
| return Arrays.copyOf(subnet, subnet.length); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| byte[] getNetworkMask() { | ||
| return Arrays.copyOf(networkMask, networkMask.length); | ||
| } | ||
|
|
||
| byte[] getUpper() { | ||
| return Arrays.copyOf(upper, upper.length); | ||
| } | ||
|
|
||
| byte[] getLower() { | ||
| return Arrays.copyOf(lower, lower.length); | ||
| } | ||
|
|
||
| boolean isIPv4() { | ||
| return isIPv4(subnet); | ||
| } | ||
|
|
||
| boolean isIPv6() { | ||
| return isIPv6(subnet); | ||
| } | ||
|
|
||
| boolean contains(byte[] ip) { | ||
| if (isIPv4() && !isIPv4(ip)) { | ||
| return false; | ||
| } | ||
| if (isIPv6() && isIPv4(ip)) { | ||
| ip = toIPv6(ip); | ||
| } | ||
| if (subnet.length != ip.length) { | ||
| throw new IllegalArgumentException( | ||
| "IP version is unknown: " + Arrays.toString(toZeroBasedByteArray(ip))); | ||
| } | ||
| for (int i = 0; i < subnet.length; i++) { | ||
| if (subnet[i] != (byte) (ip[i] & networkMask[i])) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| private static boolean isIPv4(byte[] ip) { | ||
| return ip.length == 4; | ||
| } | ||
|
|
||
| private static boolean isIPv6(byte[] ip) { | ||
| return ip.length == 16; | ||
| } | ||
|
|
||
| private static byte[] toIPv6(byte[] ipv4) { | ||
| byte[] ipv6 = new byte[16]; | ||
| ipv6[10] = (byte) 0xFF; | ||
| ipv6[11] = (byte) 0xFF; | ||
| System.arraycopy(ipv4, 0, ipv6, 12, 4); | ||
| return ipv6; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return Arrays.toString(toZeroBasedByteArray(subnet)); | ||
| } | ||
|
|
||
| private static int[] toZeroBasedByteArray(byte[] bytes) { | ||
| int[] res = new int[bytes.length]; | ||
| for (int i = 0; i < bytes.length; i++) { | ||
| res[i] = bytes[i] & 0xFF; | ||
| } | ||
| return res; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package com.datastax.oss.driver.internal.core.addresstranslation; | ||
|
|
||
| import java.net.InetSocketAddress; | ||
| import java.net.UnknownHostException; | ||
|
|
||
| class SubnetAddress { | ||
| private final Subnet subnet; | ||
| private final InetSocketAddress address; | ||
|
|
||
| SubnetAddress(String subnetCIDR, InetSocketAddress address) { | ||
| try { | ||
| this.subnet = Subnet.parse(subnetCIDR); | ||
| } catch (UnknownHostException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| this.address = address; | ||
| } | ||
|
|
||
| InetSocketAddress getAddress() { | ||
| return this.address; | ||
| } | ||
|
|
||
| boolean isOverlapping(SubnetAddress other) { | ||
| Subnet thisSubnet = this.subnet; | ||
| Subnet otherSubnet = other.subnet; | ||
| return thisSubnet.contains(otherSubnet.getLower()) | ||
| || thisSubnet.contains(otherSubnet.getUpper()) | ||
| || otherSubnet.contains(thisSubnet.getLower()) | ||
| || otherSubnet.contains(thisSubnet.getUpper()); | ||
| } | ||
|
|
||
| boolean contains(InetSocketAddress address) { | ||
| return subnet.contains(address.getAddress().getAddress()); | ||
| } | ||
|
|
||
| boolean isIPv4() { | ||
| return subnet.isIPv4(); | ||
| } | ||
|
|
||
| boolean isIPv6() { | ||
| return subnet.isIPv6(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "SubnetAddress[subnet=" + subnet + ", address=" + address + "]"; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could just continue here to next iteration of the outer for loop. You know addresses is the empty set at this point so there's no point iterating over it below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I look at this now it feels like we had to make this a bit more complicated because AddressUtils.extract() now throws exceptions in most cases rather than just logging errors and returning an empty set. Was there a particular reason for this change? It's not immediately clear the exceptions buy you much here.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously,
#extractcode was used only in this class and we logged errors together with reasons of these errors. Now the info about reasons is moved to util method, which is called from multiple places. In this class, I aimed to keep logging (as well as other functionality) as close to the origin as seemed possible to avoid opinionated refactoring, so I needed a way to get reasons of errors from the utility#extractto log them together with the context logs.Happy to agree on the way it should look like and change accordingly.