Perform test locally instead of using a live dns resolution #13
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
marten-seemann
changed the title
resolver.go
Outdated
| @@ -32,7 +32,7 @@ type txtEntry struct { | |||
| } | |||
|
|
|||
| func NewResolver(url string) *Resolver { | |||
| if !strings.HasPrefix(url, "https://") { | |||
| if !(strings.HasPrefix(url, "https:") || strings.HasPrefix(url, "http:")) { | |||
There was a problem hiding this comment.
If I understand RFC 8484 correctly, DoH is only defined for HTTPS, not for HTTP. Or am I mistaken here?
There was a problem hiding this comment.
You are right. I have changed the test to modify the url field directly.
resolver_test.go
Outdated
|
|
||
| func mockDoHResolver(msgs map[uint16]*dns.Msg) *httptest.Server { | ||
| return httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { | ||
| body, _ := ioutil.ReadAll(req.Body) |
There was a problem hiding this comment.
Don't ignore error values. If this fails at some point in the future, this would be quite hard to debug.
Better: pass testing.T to mockDoHResolver, and check the returned error.
|
In the latest commit:
|
resolver_test.go
Outdated
| r.Unpack(body) | ||
| m := msgs[r.Question[0].Qtype] | ||
|
|
||
| b, _ := m.Pack() |
There was a problem hiding this comment.
There's another error return value here.
resolver_test.go
Outdated
| dns.TypeA: mockDNSAnswerA(dns.Fqdn(domain), net.IPv4(127, 0, 0, 1)), | ||
| dns.TypeAAAA: mockDNSAnswerAAAA(dns.Fqdn(domain), net.IPv6loopback), | ||
| }) | ||
| defer func() { resolver.Close() }() |
There was a problem hiding this comment.
Suggested change
| defer func() { resolver.Close() }() | |
| defer resolver.Close() |
resolver_test.go
Outdated
| resolver := mockDoHResolver(t, map[uint16]*dns.Msg{ | ||
| dns.TypeTXT: mockDNSAnswerTXT(dns.Fqdn(domain), []string{"dnslink=/ipns/example.com"}), | ||
| }) | ||
| defer func() { resolver.Close() }() |
There was a problem hiding this comment.
Suggested change
| defer func() { resolver.Close() }() | |
| defer resolver.Close() |
Tests were relying on an external domain to be configured properly. Especially, it needed to have both an A and AAAA record configured. It turns out this domain has changed and no longer has an AAAA record, making the tests to fail. This commit updates the tests to use a local DoH resolver, which can be configured to return deterministic answers. This way, the resolution does not depend on an external configuration.
marten-seemann
approved these changes
Oct 12, 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.
Fixes #11.
Tests were relying on an external domain to be configured properly.
Especially, it needed to have both an A and AAAA record configured. It
turns out this domain has changed and no longer has an AAAA record,
making the tests to fail.
This commit updates the tests to use a local DoH resolver, which can be
configured to return deterministic answers. This way, the resolution
does not depend on an external configuration.