feat: prioritize cached results if DNS resolver returns many results #6045
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
link2xt
force-pushed
the
link2xt/merge-dns-cache
branch
from
5ce2d8b to
f7db6e9
Compare
iequidoo
approved these changes
Oct 16, 2024
| for addr in cache.into_iter().chain(rest.into_iter()) { | ||
| if !resolved_addrs.contains(&addr) { | ||
| resolved_addrs.push(addr); | ||
| } |
There was a problem hiding this comment.
if resolved_addrs.len() >= 10 {
break;
}instead of truncate(), otherwise it's O(n^2)
src/net/dns.rs
Outdated
| } | ||
|
|
||
| // If cache contains address that is not in resolution results, | ||
| // it is appended in the end. |
There was a problem hiding this comment.
Cache is "inserted in the middle", it is only append here because resolved_addrs is short
src/net/dns.rs
Outdated
| ); | ||
| } | ||
|
|
||
| // If DNS resolvers returns a lot of incorrect results, |
There was a problem hiding this comment.
Suggested change
| // If DNS resolvers returns a lot of incorrect results, | |
| // If DNS resolvers returns a lot of results, |
Or "possibly incorrect" because we don't actually check them
This ensures we do not get stuck trying DNS resolver results when we have a known to work IP address in the cache and DNS resolver returns garbage either because it is a captive portal or if it maliciously wants to get us stuck trying a long list of unresponsive IP addresses. This also limits the number of results we try to 10 overall. If there are more results, we will retry later with new resolution results.
link2xt
force-pushed
the
link2xt/merge-dns-cache
branch
from
f7db6e9 to
a509ee9
Compare
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.
This ensures we do not get stuck trying DNS resolver results when we have a known to work IP address in the cache and DNS resolver returns garbage
either because it is a captive portal
or if it maliciously wants to get us stuck
trying a long list of unresponsive IP addresses.
This also limits the number of results we try to 10 overall. If there are more results, we will retry later
with new resolution results.
Closes #5918