From ecbe3fce913d7906b0b1bc3dc644eddfb1c113aa Mon Sep 17 00:00:00 2001
From: vladimir <vladimir@safing.io>
Date: Thu, 24 Nov 2022 18:14:40 +0200
Subject: [PATCH] Fix DoH base64 encoding

---
 resolver/resolver-https.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resolver/resolver-https.go b/resolver/resolver-https.go
index b0ce489b..cbf86ae8 100644
--- a/resolver/resolver-https.go
+++ b/resolver/resolver-https.go
@@ -70,9 +70,9 @@ func (hr *HTTPSResolver) Query(ctx context.Context, q *Query) (*RRCache, error)
 	if err != nil {
 		return nil, err
 	}
-	b64dns := base64.RawStdEncoding.EncodeToString(buf)
+	b64dns := base64.RawURLEncoding.EncodeToString(buf)
 
-	// Build and execute http reuqest
+	// Build and execute http request
 	url := &url.URL{
 		Scheme:     "https",
 		Host:       hr.resolver.ServerAddress,
@@ -94,6 +94,10 @@ func (hr *HTTPSResolver) Query(ctx context.Context, q *Query) (*RRCache, error)
 		_ = resp.Body.Close()
 	}()
 
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("http response code %s", resp.Status)
+	}
+
 	// Try to read the result
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {