fix: fix net.is_IP_in_CIDR with IPv6
#1908
Merged
Conversation
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
Signed-off-by: 黑怕 <[email protected]>
|
cc @johngmyers 😄 |
Pull Request Test Coverage Report for Build 14196324909Details
💛 - Coveralls |
johngmyers
suggested changes
Apr 2, 2025
| return None; | ||
| } | ||
| let ip = IpAddr::from_str(parts[0]).ok()?; | ||
| let mask_bits = parts[1].parse::<u32>().ok(); |
There was a problem hiding this comment.
This incorrectly succeeds if ip has bits set beyond mask_bits. For example, 10.11.0.0/8.
| IpAddr::from_str(ip).map_err(|_| ()) | ||
| } | ||
|
|
||
| fn _check_ipv4_cidr(ip: Ipv4Addr, cidr_ip: Ipv4Addr, mask_bits: u32) -> bool { |
There was a problem hiding this comment.
Why not use the cidr crate? I was just working on reimplementing net.parse_cidr using it.
| } | ||
|
|
||
| fn _check_ipv4_cidr(ip: Ipv4Addr, cidr_ip: Ipv4Addr, mask_bits: u32) -> bool { | ||
| let mask = !((1u32 << (32 - mask_bits)) - 1); |
There was a problem hiding this comment.
Does this not overflow for 0.0.0.0/0?
| @@ -5,3 +5,4 @@ cidr1 = net.hosts_in_CIDR("192.168.1.0/24") | |||
| cidr2 = net.subnets_from_CIDR("192.168.1.0/24") | |||
| cidr3 = net.is_IP_in_CIDR("192.168.1.1", "192.168.1.0/24") | |||
| cidr4 = net.is_IP_in_CIDR("192.168.0.1", "192.168.1.0/24") | |||
| cidr5 = net.is_IP_in_CIDR('2001:db8::1', "2001:db8::/64") | |||
There was a problem hiding this comment.
There should be a LOT more tests:
- First in CIDR
- Last in CIDR
- One before first in CIDR
- One after last in CIDR
0.0.0.0/0and::/0- IPv4 in
::/0 - IPv4 in IPv6 CIDR and vice versa
- Invalid CIDRs
- Invalid IPs
- IPv4 /32 and IPv6 /128
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
1. Does this PR affect any open issues?(Y/N) and add issue references (e.g. "fix #123", "re #123".):
2. What is the scope of this PR (e.g. component or file name):
3. Provide a description of the PR(e.g. more details, effects, motivations or doc link):
4. Are there any breaking changes?(Y/N) and describe the breaking changes(e.g. more details, motivations or doc link):
5. Are there test cases for these changes?(Y/N) select and add more details, references or doc links: