make CoreDNS DoH Server #1619

miekg · 2018-03-18T12:26:12Z

1. What does this pull request do?

Add experimental DoH support.

2. Which issues (if any) are related?

3. Which documentation changes (if any) need to be made?

codecov-io · 2018-03-18T14:06:35Z

Codecov Report

Merging #1619 into master will decrease coverage by 0.89%.
The diff coverage is 6.52%.

@@            Coverage Diff            @@
##           master    #1619     +/-   ##
=========================================
- Coverage   53.44%   52.55%   -0.9%     
=========================================
  Files         186      191      +5     
  Lines        9392     9590    +198     
=========================================
+ Hits         5020     5040     +20     
- Misses       3989     4164    +175     
- Partials      383      386      +3

Impacted Files	Coverage Δ
plugin/normalize.go	`76.27% <0%> (-2.68%)`	⬇️
core/dnsserver/doh/responsewriter.go	`0% <0%> (ø)`
core/dnsserver/address.go	`58.57% <0%> (-6.51%)`	⬇️
core/dnsserver/register.go	`23.42% <0%> (-1.11%)`	⬇️
core/dnsserver/server_https.go	`0% <0%> (ø)`
core/dnsserver/doh/https.go	`75% <75%> (ø)`
core/dnsserver/server_grpc.go	`8.1% <0%> (ø)`
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1822354...50d4655. Read the comment docs.

miekg · 2018-03-18T15:02:20Z

Also need a way to for http/2

and the forward and maybe proxy plugin should start speaking it.

chantra

Nice!

chantra · 2018-03-18T17:36:22Z

core/dnsserver/doh/https.go

+// MimeType is the DoH mimetype that should be used.
+const MimeType = "application/dns-udpwireformat"
+
+// RequestToMsg extra the dns message from the request body.


typo: s/extra/extract/

chantra · 2018-03-18T17:36:22Z

core/dnsserver/doh/https.go

+
+	buf, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return nil, nil


shouldn't this return the error?

chantra · 2018-03-18T17:36:22Z

core/dnsserver/server_https.go

+	}
+
+	w.Header().Set("Content-Type", doh.MimeType)
+	w.Header().Set("Cache-Control", "max-age=0")


maybe a FIXME to implement cache-control later?

chantra · 2018-03-18T17:36:22Z

core/dnsserver/doh/https.go

+const MimeType = "application/dns-udpwireformat"
+
+// RequestToMsg extra the dns message from the request body.
+func RequestToMsg(req *http.Request) (*dns.Msg, error) {


note that this only handle POST.
For GET use case, the content-type should be taken from the query parameter ct and the dns payload will be base64safeurl encoded (with trailing = removed) in the dns query parameter. Maybe worth a FIXME/TODO comment.

miekg · 2018-03-18T22:05:47Z

@chantra thanks for reviewing. yes error handling needs to be done - the draft is also light on this. I'll fix things after -04 is released.

miekg · 2018-05-19T09:30:02Z

@chantra PTAL, address all comments and implemented -08 of the draft.

miekg · 2018-05-19T16:03:02Z

/cc @johnbelamaric

johnbelamaric

minor issues, looks good

johnbelamaric · 2018-05-21T18:11:03Z

core/dnsserver/https.go

+		return nil, fmt.Errorf("no 'dns' query parameter found")
+	}
+	if len(b64) != 1 {
+		return nil, fmt.Errorf("multipe 'dns' query values found")


nit: s/multipe/multiple/

johnbelamaric · 2018-05-21T18:11:03Z

core/dnsserver/server-https.go

+	buf, _ := dw.Msg.Pack()
+
+	w.Header().Set("Content-Type", mimeTypeDOH)
+	w.Header().Set("Cache-Control", "max-age=128") // Minttl as done in cache.


No control over this?

proper bug filed: #1823
The draft is still debating the exact requirements here, but it is clear what needs to be done. Left TODO with issue number.

chantra · 2018-05-23T06:13:52Z

Great stuff!

The DoH work (#1619) made changes to pkg/nonwriter.Writer that in hindsight were not backwards compatible; it added override for the LocalAddr() and RemoteAddr(). Instead of rolling back that PR, this PR reverts those changes and creates a DoHWriter for use in the https-server.go side of things. This was only caught in the integration test making this hard to catch, so we add a upstream_file_test.go that tries (doesn't work yet) to test this in the unit tests as well. Esp. helpful when 'git bisecting'. Fixes #1826

* WIP: make CoreDNS DoH Server * It works * Fix tests * Review from Tom - on diff. PR * correct mime type * Cleanups and use the pkg/nonwriter * rename and updates * implement get * implement GET * Code review comments * correct context * tweaks * code review

The DoH work (coredns#1619) made changes to pkg/nonwriter.Writer that in hindsight were not backwards compatible; it added override for the LocalAddr() and RemoteAddr(). Instead of rolling back that PR, this PR reverts those changes and creates a DoHWriter for use in the https-server.go side of things. This was only caught in the integration test making this hard to catch, so we add a upstream_file_test.go that tries (doesn't work yet) to test this in the unit tests as well. Esp. helpful when 'git bisecting'. Fixes coredns#1826

chantra reviewed Mar 18, 2018

View changes

miekg mentioned this pull request Apr 1, 2018

Add support for CloudFlare's new 1.1.1.1 DNS-over-HTTPS service #1650

Closed

miekg added 10 commits Mar 18, 2018

WIP: make CoreDNS DoH Server

2c8e4c7

It works

271f924

Fix tests

c1bdbfd

Review from Tom - on diff. PR

22aa279

correct mime type

52579c8

Cleanups and use the pkg/nonwriter

fa85433

rename and updates

3448b84

implement get

6be082e

implement GET

dc01924

Code review comments

Loading status checks…

f43a950

miekg force-pushed the doh1 branch from 00ecfcb to f43a950 May 19, 2018

correct context

Loading status checks…

55784d8

miekg changed the title ~~WIP: make CoreDNS DoH Server~~ make CoreDNS DoH Server May 19, 2018

tweaks

Loading status checks…

2cb652e

johnbelamaric requested changes May 21, 2018

View changes

code review

Loading status checks…

8cf3abf

johnbelamaric approved these changes May 21, 2018

View changes

miekg deleted the doh1 branch May 21, 2018

miekg mentioned this pull request May 23, 2018

Revert pkg/nonwriter changes #1829

Merged

jmhodges mentioned this pull request Sep 7, 2018

net: support DNS-over-HTTPS golang/go#27552

Open

coredns / coredns

make CoreDNS DoH Server #1619

make CoreDNS DoH Server #1619

miekg commented Mar 18, 2018

codecov-io commented Mar 18, 2018 •

edited

miekg commented Mar 18, 2018

chantra left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

miekg commented Mar 18, 2018

miekg commented May 19, 2018

miekg commented May 19, 2018

johnbelamaric left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

chantra commented May 23, 2018

coredns / coredns

make CoreDNS DoH Server #1619

make CoreDNS DoH Server #1619

Conversation

miekg commented Mar 18, 2018

1. What does this pull request do?

2. Which issues (if any) are related?

3. Which documentation changes (if any) need to be made?

codecov-io commented Mar 18, 2018 • edited

Codecov Report

miekg commented Mar 18, 2018

chantra left a comment

This comment has been minimized.

chantra Mar 18, 2018 Contributor

This comment has been minimized.

chantra Mar 18, 2018 Contributor

This comment has been minimized.

chantra Mar 18, 2018 Contributor

This comment has been minimized.

chantra Mar 18, 2018 Contributor

miekg commented Mar 18, 2018

miekg commented May 19, 2018

miekg commented May 19, 2018

johnbelamaric left a comment

This comment has been minimized.

johnbelamaric May 21, 2018 Member

This comment has been minimized.

miekg May 21, 2018 Author Member

This comment has been minimized.

johnbelamaric May 21, 2018 Member

This comment has been minimized.

miekg May 21, 2018 Author Member

chantra commented May 23, 2018

codecov-io commented Mar 18, 2018 •

edited

chantra Mar 18, 2018
Contributor

chantra Mar 18, 2018
Contributor

chantra Mar 18, 2018
Contributor

chantra Mar 18, 2018
Contributor

johnbelamaric May 21, 2018
Member

miekg May 21, 2018
Author Member

johnbelamaric May 21, 2018
Member

miekg May 21, 2018
Author Member