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

Remove X-Edns-Client-Subnet, that is not useful

Browse Source
This commit is contained in:
Star Brilliant
2017-10-04 14:23:39 +08:00
parent 3efaf6380f
commit 15e6ec1491
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doh-server/server.go
View File

@@ -81,7 +81,6 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=UTF-8")
w.Header().Set("Server", "DNS-over-HTTPS/1.0 (+https://github.com/m13253/dns-over-https)")
w.Header().Set("X-Powered-By", "DNS-over-HTTPS/1.0 (+https://github.com/m13253/dns-over-https)")
w.Header().Set("Vary", "X-Edns-Client-Subnet")
name := r.FormValue("name")
if name == "" {
@@ -205,9 +204,6 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "max-age=" + strconv.Itoa(int(respJson.LeastTTL)))
w.Header().Set("Expires", respJson.EarliestExpires.Format(time.RFC1123))
}
if respJson.EdnsClientSubnet != "" {
w.Header().Set("X-Edns-Client-Subnet", respJson.EdnsClientSubnet)
}
w.Write(respStr)
}

3
json-dns/marshal.go
View File

@@ -84,8 +84,7 @@ func Marshal(msg *dns.Msg) *Response {
} else if ipv4 := clientAddress.To4(); ipv4 != nil {
clientAddress = ipv4
}
scopeMask := net.CIDRMask(int(edns0.SourceScope), len(clientAddress) * 8)
resp.EdnsClientSubnet = clientAddress.Mask(scopeMask).String() + "/" + strconv.Itoa(int(edns0.SourceScope))
resp.EdnsClientSubnet = clientAddress.String() + "/" + strconv.Itoa(int(edns0.SourceScope))
}
}
continue