dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-03-30 22:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to IETF draft-07

Browse Source
This commit is contained in:
Star Brilliant
2018-04-13 02:46:03 +08:00
parent 07db7ba200
commit 83f20767ea
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doh-server/ietf.go
View File

@@ -45,7 +45,7 @@ func (s *Server) parseRequestIETF(w http.ResponseWriter, r *http.Request) *DNSRe
errtext: fmt.Sprintf("Invalid argument value: \"dns\" = %q", requestBase64),
}
}
if len(requestBinary) == 0 && (r.Header.Get("Content-Type") == "message/dns" || r.Header.Get("Content-Type") == "application/dns-udpwireformat") {
if len(requestBinary) == 0 && (r.Header.Get("Content-Type") == "application/dns-message" || r.Header.Get("Content-Type") == "application/dns-udpwireformat") {
requestBinary, err = ioutil.ReadAll(r.Body)
if err != nil {
return &DNSRequest{
@@ -144,7 +144,7 @@ func (s *Server) generateResponseIETF(w http.ResponseWriter, r *http.Request, re
return
}
w.Header().Set("Content-Type", "message/dns")
w.Header().Set("Content-Type", "application/dns-message")
now := time.Now().UTC().Format(http.TimeFormat)
w.Header().Set("Date", now)
w.Header().Set("Last-Modified", now)

18
doh-server/server.go
View File

@@ -98,7 +98,7 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
if r.FormValue("name") != "" {
contentType = "application/dns-json"
} else if r.FormValue("dns") != "" {
contentType = "message/dns"
contentType = "application/dns-message"
}
}
var responseType string
@@ -108,10 +108,10 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
responseType = "application/json"
break
} else if responseCandidate == "application/dns-udpwireformat" {
responseType = "message/dns"
responseType = "application/dns-message"
break
} else if responseCandidate == "message/dns" {
responseType = "message/dns"
} else if responseCandidate == "application/dns-message" {
responseType = "application/dns-message"
break
}
}
@@ -119,17 +119,17 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
// Guess response Content-Type based on request Content-Type
if contentType == "application/dns-json" {
responseType = "application/json"
} else if contentType == "message/dns" {
responseType = "message/dns"
} else if contentType == "application/dns-message" {
responseType = "application/dns-message"
} else if contentType == "application/dns-udpwireformat" {
responseType = "message/dns"
responseType = "application/dns-message"
}
}
var req *DNSRequest
if contentType == "application/dns-json" {
req = s.parseRequestGoogle(w, r)
} else if contentType == "message/dns" {
} else if contentType == "application/dns-message" {
req = s.parseRequestIETF(w, r)
} else if contentType == "application/dns-udpwireformat" {
req = s.parseRequestIETF(w, r)
@@ -151,7 +151,7 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
if responseType == "application/json" {
s.generateResponseGoogle(w, r, req)
} else if responseType == "message/dns" {
} else if responseType == "application/dns-message" {
s.generateResponseIETF(w, r, req)
} else {
panic("Unknown response Content-Type")