For login allow list add support for IPv6 #18046
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
tsteur
commented
Sep 22, 2021
config/global.php
Outdated
| @@ -166,8 +166,15 @@ | |||
| $ipsResolved[] = $ip; | |||
| } else { | |||
| $ipFromHost = @gethostbyname($ip); | |||
| if (!empty($ipFromHost)) { | |||
| if (!empty($ipFromHost) | |||
There was a problem hiding this comment.
the extra filter var check is needed as ipFromHost will be the hostname if it couldn't resolve it.
tsteur
commented
Sep 22, 2021
| @@ -135,6 +135,12 @@ public function test_getAllowlistedLoginIps_shouldResolveIp() | |||
| $this->assertSame(['192.168.33.1', '185.31.40.177', '127.0.0.1'], $this->allowlist->getAllowlistedLoginIps()); | |||
| } | |||
|
|
|||
| public function test_getAllowlistedLoginIps_shouldResolveIpv6() | |||
| { | |||
| $this->setGeneralConfig('login_allowlist_ip', ['192.168.33.1', 'integration-test.matomo.org', '127.0.0.1']); | |||
There was a problem hiding this comment.
added this DNS entry specifically for this test
There was a problem hiding this comment.
can't think of any reason why that could be an issue
sgiehl
reviewed
Sep 22, 2021
config/global.php
Outdated
| $ipsResolved[] = $ipFromHost; | ||
| } elseif (function_exists('dns_get_record')) { |
There was a problem hiding this comment.
wouldn't it generally make sense to do always both. A lookup for IPv4 and IPv6. I guess a hostname could actually resolve both, right?
tsteur
commented
Sep 22, 2021
| public function test_getAllowlistedLoginIps_shouldResolveIpv6Only() | ||
| { | ||
| $this->setGeneralConfig('login_allowlist_ip', ['192.168.33.1', 'integration-test.matomo.org', '127.0.0.1']); | ||
| $this->assertSame(['192.168.33.1', 'integration-test.matomo.org', '::1', '127.0.0.1'], $this->allowlist->getAllowlistedLoginIps()); |
There was a problem hiding this comment.
it may not be expected that it returns the integration test hostname here, but it was already doing it before so it shouldn't be a problem. Only fixing the IPv6 part for now
sgiehl
approved these changes
Sep 23, 2021
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.
Description:
Not sure why we didn't add this directly. see also faq https://matomo.org/faq/how-to/faq_25543/
Review