Fix NetUtils.matchIpExpression to correctly parse IPv4 address with port#16310
Closed
Ayasaz wants to merge 2 commits into
Closed
Fix NetUtils.matchIpExpression to correctly parse IPv4 address with port#16310Ayasaz wants to merge 2 commits into
Ayasaz wants to merge 2 commits into
Conversation
The method previously used 'address.endsWith(":")' to detect 'ip:port'
format, which would never match a valid IPv4 address with port (e.g.
'192.168.1.63:90').
Changed to use the existing isValidAddress() method which already
matches the ADDRESS_PATTERN regex '^\d{1,3}(\.\d{1,3}){3}\:\d{1,5}$',
thus correctly detecting IPv4 addresses with port numbers.
Fixes apache#16308
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 3.3 #16310 +/- ##
============================================
+ Coverage 60.77% 60.80% +0.02%
+ Complexity 11768 15 -11753
============================================
Files 1953 1953
Lines 89196 89196
Branches 13457 13457
============================================
+ Hits 54212 54233 +21
+ Misses 29418 29390 -28
- Partials 5566 5573 +7
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What is the purpose of the change
Fix
NetUtils.matchIpExpression(String pattern, String address)to correctly parse IPv4 addresses with port (e.g.192.168.1.63:90).Previously the method used
address.endsWith(":")to detect theip:portformat, which would never match a valid IPv4 address with port since the colon is in the middle, not at the end.Brief changelog
isValidAddress()method (which matchesADDRESS_PATTERNregex^\d{1,3}(\.\d{1,3}){3}\:\d{1,5}$) to detect IPv4 addresses with porttestMatchIpExpressionWithIpv4AddressAndPortcovering wildcard, subnet, and port-mismatch scenariosVerifying this change
*.*.*.*:90matching192.168.1.63:90192.168.1.*:90matching192.168.1.63:90192.168.1.*:80not matching192.168.1.63:90Fixes #16308