fix: NPM ipv6/CIDR validation #1401
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
| ipDetails := strings.Split(ip, ",") | ||
| if util.IsIPV4(ipDetails[0]) { | ||
| return true | ||
| err := ValidateIPBlock(ipDetails[0]) |
Contributor
There was a problem hiding this comment.
should we validate the whole ip like we used to?
Contributor
Author
There was a problem hiding this comment.
I had to change this because it would fail in the case of tcp since that method splits on a space and tcp has a comma. That method only validates CIDR so sending it already split seemed to make sense in this case
| } | ||
| } | ||
|
|
||
| func TestValidateIPSetMemberIP(t *testing.T) { |
Contributor
There was a problem hiding this comment.
nit: let's put this code next to the other validate ip block tests
rbtr
reviewed
May 26, 2022
npm/util/util.go
Outdated
Comment on lines
358
to
359
| ipOnly := strings.Split(ip, "/") | ||
| return net.ParseIP(ipOnly[0]).To4() != nil |
Collaborator
There was a problem hiding this comment.
consider using the netip package (here but really everywhere)
rbtr
reviewed
Jun 10, 2022
npm/util/util.go
Outdated
| _, _, err = net.ParseCIDR(ip) | ||
| return (err == nil && address.Is4()) | ||
| _, _, err2 := net.ParseCIDR(ip) | ||
| return (err == nil && err2 == nil && address.Is4()) |
Collaborator
There was a problem hiding this comment.
check err where it is assigned and you don't have to avoid reassigning it and checking so many things here.
huntergregory
approved these changes
Jun 13, 2022
matmerr
pushed a commit
to matmerr/azure-container-networking
that referenced
this pull request
Jun 29, 2022
* updated validation method and added unit tests * moved unit test * updated isIPV4 to use netip * fixed bool issue * fixed ipblock issue * refactored code * updated error handling * updated error handling
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.
Reason for Change:
Issue Fixed:
Requirements:
Notes: