git » dnss » commit ecb29d2

Update DoH references, point to RFC 8484

author Alberto Bertogli
2020-05-29 00:34:29 UTC
committer Alberto Bertogli
2020-05-29 01:02:50 UTC
parent 4081e911ef8de07e18bb5dc131635c5284dc868a
Update DoH references, point to RFC 8484

DoH is now a standard, published as RFC 8484. This patch updates the
references to it accordingly.
README.md +4 -4
internal/httpresolver/resolver.go +1 -1
internal/httpserver/server.go +3 -4 
diff --git a/README.md b/README.md
index 50ad5f7..4eabc81 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ want end to end control).
 
 ## Features
 
-* Supports the JSON-based protocol as implemented by
+* Supports the
+  [DNS Queries over HTTPS (DoH)](https://en.wikipedia.org/wiki/DNS_over_HTTPS)
+  standard ([RFC 8484](https://tools.ietf.org/html/rfc8484).
+* Supports the older JSON-based protocol as implemented by
   [dns.google](https://dns.google)
   ([reference](https://developers.google.com/speed/public-dns/docs/dns-over-https)).
-* Supports the [DNS Queries over HTTPS
-  (DoH)](https://tools.ietf.org/html/draft-ietf-doh-dns-over-https) proposed
-  standard (and implemented by [Cloudflare's 1.1.1.1](https://1.1.1.1/)).
 * Local cache (optional).
 * HTTP(s) proxy support, autodetected from the environment.
 * Monitoring HTTP server, with exported variables and tracing to help
diff --git a/internal/httpresolver/resolver.go b/internal/httpresolver/resolver.go
index 3019e03..b770a51 100644
--- a/internal/httpresolver/resolver.go
+++ b/internal/httpresolver/resolver.go
@@ -25,7 +25,7 @@ import (
 // server via DNS over HTTPS.
 //
 // It supports two modes: JSON (like https://dns.google) and DoH
-// (https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-12).
+// (https://en.wikipedia.org/wiki/DNS_over_HTTPS, RFC 8484).
 type httpsResolver struct {
 	Upstream *url.URL
 	CAFile   string
diff --git a/internal/httpserver/server.go b/internal/httpserver/server.go
index bbb1462..8cfe25e 100644
--- a/internal/httpserver/server.go
+++ b/internal/httpserver/server.go
@@ -6,8 +6,8 @@
 //    https://developers.google.com/speed/public-dns/docs/dns-over-https#api_specification.
 //    This is also implemented by Cloudflare's 1.1.1.1, as documented in:
 //    https://developers.cloudflare.com/1.1.1.1/dns-over-https/json-format/.
-//  - DNS Queries over HTTPS (DoH), as specified in:
-//    https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-12.
+//  - DNS Queries over HTTPS (DoH), as specified in RFC 8484:
+//    https://tools.ietf.org/html/rfc8484.
 package httpserver
 
 import (
@@ -325,8 +325,7 @@ func stringToBool(s string) (bool, error) {
 	return false, errInvalidCD
 }
 
-// Resolve DNS over HTTPS requests, as specified in
-// https://tools.ietf.org/html/draft-ietf-doh-dns-over-https-12.
+// Resolve DNS over HTTPS requests, as specified in RFC 8484.
 func (s *Server) resolveDoH(tr trace.Trace, w http.ResponseWriter, dnsQuery []byte) {
 	r := &dns.Msg{}
 	err := r.Unpack(dnsQuery)