Improve IP address validation #7141
Merged
Conversation
This file contains 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
| @@ -83,6 +84,9 @@ public static long ipToLong(String ip) throws ElasticsearchIllegalArgumentExcept | |||
| if (octets.length != 4) { | |||
There was a problem hiding this comment.
Wondering why we need to keep that test. InetAddresses.isInetAddress() does not do it?
Another way for catching specifically your issue could be to control all octets size?
if (octets.length != 4 || octets[0].length() > 3 || octets[1].length() > 3 || octets[2].length() > 3 || octets[3].length() > 3) {
throw new ElasticsearchIllegalArgumentException("failed to parse ip [" + ip + "], not full ip address (4 dots)");
}
There was a problem hiding this comment.
I think that if InetAddresses does it already, we might as well rely just on it
|
@spinscale left a comment |
|
LGTM on my end, added a comment to @dadoonet |
|
We need the additional check as well, as the |
|
Ha! Thanks @spinscale |
Until now, IP addresses were only checked for four dots, which allowed invalid values like 127.0.0.111111 This adds an additional check for validation. Closes elastic#7131
clintongormley
changed the title
clintongormley
added
the
:Search/Mapping
clintongormley
changed the title
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.
Until now, IP addresses were only checked for four dots, which
allowed invalid values like 127.0.0.111111
This adds an additional check for validation.
Note: This does have a performance impact in the log file indexing case as it adds an additional parsing step. Maybe this was the reason, why it had not been implemented in the first case? We could potentially just reuse the code from guavas
InetAddresses.textToNumericFormatV4()which is unfortunately privateCloses #7131