Ignore subdomain for soa queries #27801
Merged
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
kesselb
commented
Jul 5, 2021
| $dnsResponses = dns_get_record($target, $dnsType); | ||
| $canHaveCnameRecord = true; | ||
| if (count($dnsResponses) > 0) { | ||
| foreach ($dnsResponses as $key => $dnsResponse) { |
Contributor
Author
There was a problem hiding this comment.
Code cleanup: As $key is unused and may overwrite $key from the outer loop.
kesselb
commented
Jul 5, 2021
| foreach ($dnsTypes as $key => $dnsType) { | ||
| foreach ($dnsTypes as $dnsType) { | ||
| if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) { | ||
| unset($dnsTypes[$key]); |
Contributor
Author
There was a problem hiding this comment.
As $dnsTypes is not used it's fine to not unset the value and just continue.
kesselb
commented
Jul 5, 2021
| $second = array_pop($labels); | ||
|
|
||
| $hostname = $second . '.' . $top; | ||
| return dns_get_record($hostname, DNS_SOA); |
Contributor
Author
There was a problem hiding this comment.
$ host -t SOA www.nextcloud.com
www.nextcloud.com has no SOA record
$ host -t SOA nextcloud.com
nextcloud.com has SOA record ns.inwx.de. hostmaster.inwx.de. 2021033001 10800 3600 604800 3600
LukasReschke
approved these changes
Jul 5, 2021
Member
|
phpcs is complaining |
Member
|
/backport to stable22 |
kesselb
force-pushed
the
enh/noid/hardening-dns-pin-middleware
branch
from
a513014 to
1903ced
Compare
blizzz
reviewed
Jul 5, 2021
| $dnsNegativeTtl = null; | ||
| } | ||
| $soaDnsEntry = $this->soaRecord($target); | ||
| $dnsNegativeTtl = $soaDnsEntry[0]['minimum-ttl'] ?? null; |
Member
There was a problem hiding this comment.
according to the php doc $soaDnsEntry can be false. Perhaps you can turn false to null and add it as return type hint.
Signed-off-by: Daniel Kesselberg <[email protected]>
kesselb
force-pushed
the
enh/noid/hardening-dns-pin-middleware
branch
from
b24e105 to
b6530e5
Compare
Pytal
approved these changes
Jul 5, 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.
No description provided.