From 4d742bd15ebe3592c7cb1ba7448c31b83ad88372 Mon Sep 17 00:00:00 2001 From: Chris Hills Date: Wed, 31 Oct 2018 23:40:33 +0000 Subject: [PATCH 1/2] doh-server: change to google.go Allow the "cd" parameter to be case insensitive to work with some clients that send True/False instead of true/false such as gDNS. --- doh-server/google.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doh-server/google.go b/doh-server/google.go index ee742aa..9765a66 100644 --- a/doh-server/google.go +++ b/doh-server/google.go @@ -71,9 +71,9 @@ func (s *Server) parseRequestGoogle(w http.ResponseWriter, r *http.Request) *DNS cdStr := r.FormValue("cd") cd := false - if cdStr == "1" || cdStr == "true" { + if cdStr == "1" || strings.ToUpper(cdStr) == "TRUE" { cd = true - } else if cdStr == "0" || cdStr == "false" || cdStr == "" { + } else if cdStr == "0" || strings.ToUpper(cdStr) == "FALSE" || cdStr == "" { } else { return &DNSRequest{ errcode: 400, From ef2c6bbdc82add48d75c3886040481d4e0400999 Mon Sep 17 00:00:00 2001 From: Chris Hills Date: Thu, 1 Nov 2018 20:12:28 +0000 Subject: [PATCH 2/2] Update google.go Make "cd" check case-insensitive. --- doh-server/google.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doh-server/google.go b/doh-server/google.go index 9765a66..96bd7ba 100644 --- a/doh-server/google.go +++ b/doh-server/google.go @@ -71,9 +71,9 @@ func (s *Server) parseRequestGoogle(w http.ResponseWriter, r *http.Request) *DNS cdStr := r.FormValue("cd") cd := false - if cdStr == "1" || strings.ToUpper(cdStr) == "TRUE" { + if cdStr == "1" || strings.EqualFold(cdStr, "true") { cd = true - } else if cdStr == "0" || strings.ToUpper(cdStr) == "FALSE" || cdStr == "" { + } else if cdStr == "0" || strings.EqualFold(cdStr, "false") || cdStr == "" { } else { return &DNSRequest{ errcode: 400,