Allow new documentation ranges in the validation of IPs #2529
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
jsoriano
approved these changes
Apr 9, 2025
docs/howto/ingest_geoip.md
Outdated
| @@ -2,7 +2,19 @@ | |||
|
|
|||
| Elasticsearch provides default GeoIP databases that can be downloaded in runtime and which weights ~70 MB. This can be | |||
| a root cause of flakiness of package tests, so elastic-package embeds small samples of GeoIP databases, that can identify | |||
| accurately only few ranges of IP addresses included [here](../../internal/fields/_static/allowed_geo_ips.txt) | |||
| accurately only few ranges of IP addresses included [here](../../internal/fields/_static/allowed_geo_ips.txt). | |||
There was a problem hiding this comment.
We want to eventually use documentation IP ranges only. I think we can remove the mention to allowed_geo_ips.txt in docs.
There was a problem hiding this comment.
I've updated this doc to remove that reference.
Could you check if that makes sense ? thanks!
mrodm
commented
Apr 9, 2025
Comment on lines
+1285
to
1288
| return len(ip) == net.IPv6len && | ||
| (ip[0] == 32 && ip[1] == 1 && ip[2] == 13 && ip[3] == 184) || | ||
| (ip[0] == 63 && ip[1] == 255 && ip[2] <= 15) | ||
| } |
There was a problem hiding this comment.
Got these values from this code
package main
import (
"fmt"
"log"
"net"
)
func main() {
showBlocks("3fff:0000:0000:0000:0000:0000:0000:0000")
showBlocks("3fff:0fff:ffff:ffff:ffff:ffff:ffff:ffff")
fmt.Println()
showBlocks("2001:0db8:0000:0000:0000:0000:0000:0000")
showBlocks("2001:0db8:ffff:ffff:ffff:ffff:ffff:ffff")
}
func showBlocks(s string) {
ip := net.ParseIP(s)
if ip == nil {
log.Fatalf("wrong ip: %s", s)
}
for i, k := range ip {
fmt.Printf("ip[%d] == %d\n", i, k)
}
}
💚 Build Succeeded
History
cc @mrodm |
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.
This PR adds the required ranges to the
isDocumentationso they can be validated successfully inelastic-packagetests.If these ranges a test including for instance
3fff::1would fail with this error:But, that IP should be allowed since it is part of the documentation range
3fff::/20(RFC9637)How to test this PR locally
Test package
apachenow includes a log line including an IPv6 from range3fff::/20:Relates #2476