upkeep/216: Add support for IPv6 #217
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
cadic
suggested changes
Oct 13, 2022
There was a problem hiding this comment.
Thanks @Sidsector9, the code looks good. I left a couple suggestions.
It also seems like we need to update push-deploy.yml script: include composer install --no-dev to add vendor with the new IPLib dependency. And Looks like PHPUnit needs to be moved to require-dev then.
composer.json
Outdated
| @@ -29,6 +29,7 @@ | |||
| } | |||
| }, | |||
| "require": { | |||
| "phpunit/phpunit": "9.4.4" | |||
| "phpunit/phpunit": "9.4.4", | |||
There was a problem hiding this comment.
I know it was here before, but do we really need PHPUnit in the require and include it to the release together with IPLib?
tests/php/test-ip-addresses.php
Outdated
| $this->assertTrue( $rsa::ip_in_range( '172.10.23.4', '172.10.23.*' ) ); | ||
| $this->assertTrue( $rsa::ip_in_range( '172.10.23.4', '172.10.*.*' ) ); | ||
|
|
||
| // IPv6 not in pattern range. |
There was a problem hiding this comment.
Suggested change
| // IPv6 not in pattern range. | |
| // IPv4 not in pattern range. |
restricted_site_access.php
Outdated
|
|
||
| if ( $parsed_range instanceof \IPLib\Range\Single ) { | ||
| $in_range = $user_address->matches( $parsed_range ); | ||
| } else if ( $parsed_range instanceof \IPLib\Range\Subnet || $parsed_range instanceof \IPLib\Range\Pattern ) { |
There was a problem hiding this comment.
Suggested change
| } else if ( $parsed_range instanceof \IPLib\Range\Subnet || $parsed_range instanceof \IPLib\Range\Pattern ) { | |
| } elseif ( $parsed_range instanceof \IPLib\Range\Subnet || $parsed_range instanceof \IPLib\Range\Pattern ) { |
2609f5d to
93204a3
Compare
6 tasks
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.
Closes #216
Description of the Change
This PR adds support for IPv6 addresses.
In addition to that, both IPv4 and IPv6 addresses can be added in the following formats:
Single address
172.10.23.4,2001:0db8:85a3:0000:0000:8a2e:0370:7334,2001:0db8:3333:4444::0000, etcSubnet range
172.10.23.4/33,2001:0db8:3333:4444:0000:0000:0000:0000/64, etcPattern
172.10.*.5,172.10.*.*,2001:db8:3333:4444:5555:6666:*:*, etcVerification Process
Checklist:
Changelog