-
Notifications
You must be signed in to change notification settings - Fork 126
Fix for issue #1074 - add IsDocumentation function #2408
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1256,6 +1256,25 @@ func (v *Validator) parseSingleElementValue(key string, definition FieldDefiniti | |
return nil | ||
} | ||
|
||
// IsDocumentation reports whether ip is a reserved address for documentation, | ||
// according to RFC 5737 (IPv4 Address Blocks Reserved for Documentation) and | ||
// RFC 3849 (IPv6 Address Prefix Reserved for Documentation). | ||
func IsDocumentation(ip net.IP) bool { | ||
Comment on lines
+1259
to
+1262
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit. Consider adding some test case in |
||
if ip4 := ip.To4(); ip4 != nil { | ||
// Following RFC 5737, Section 3. Documentation Address Blocks which says: | ||
// The blocks 192.0.2.0/24 (TEST-NET-1), 198.51.100.0/24 (TEST-NET-2), | ||
// and 203.0.113.0/24 (TEST-NET-3) are provided for use in | ||
// documentation. | ||
return ((ip4[0] == 192 && ip4[1] == 0 && ip4[2] == 2) || | ||
(ip4[0] == 198 && ip4[1] == 51 && ip4[2] == 100) || | ||
(ip4[0] == 203 && ip4[1] == 0 && ip4[2] == 113)) | ||
} | ||
// Following RFC 3849, Section 2. Documentation IPv6 Address Prefix which | ||
// says: | ||
// The prefix allocated for documentation purposes is 2001:DB8::/32 | ||
return len(ip) == net.IPv6len && ip[0] == 32 && ip[1] == 1 && ip[2] == 13 && ip[3] == 184 | ||
} | ||
|
||
// isAllowedIPValue checks if the provided IP is allowed for testing | ||
// The set of allowed IPs are: | ||
// - private IPs as described in RFC 1918 & RFC 4193 | ||
|
@@ -1276,6 +1295,7 @@ func (v *Validator) isAllowedIPValue(s string) bool { | |
|
||
if ip.IsUnspecified() || | ||
ip.IsPrivate() || | ||
IsDocumentation(ip) || | ||
ip.IsLoopback() || | ||
ip.IsLinkLocalUnicast() || | ||
ip.IsLinkLocalMulticast() || | ||
|
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.
Nit.