From b9bf6e80f444861a37cc6e5293d26633ab7cc60f Mon Sep 17 00:00:00 2001
From: GreyXor <greyxor@protonmail.com>
Date: Sat, 29 Oct 2022 11:35:22 +0200
Subject: [PATCH] fix: io and os instead of deprecated ioutil

Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details.
https://pkg.go.dev/io/ioutil
---
 doh-client/google.go | 4 ++--
 doh-client/ietf.go   | 4 ++--
 doh-client/main.go   | 3 +--
 doh-server/ietf.go   | 6 +++---
 doh-server/main.go   | 3 +--
 doh-server/server.go | 3 +--
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/doh-client/google.go b/doh-client/google.go
index 5fecf00..e7a8db9 100644
--- a/doh-client/google.go
+++ b/doh-client/google.go
@@ -27,7 +27,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -140,7 +140,7 @@ func (c *Client) parseResponseGoogle(ctx context.Context, w dns.ResponseWriter,
 		}
 	}
 
-	body, err := ioutil.ReadAll(req.response.Body)
+	body, err := io.ReadAll(req.response.Body)
 	if err != nil {
 		log.Println(err)
 		req.reply.Rcode = dns.RcodeServerFailure
diff --git a/doh-client/ietf.go b/doh-client/ietf.go
index a474922..30baf50 100644
--- a/doh-client/ietf.go
+++ b/doh-client/ietf.go
@@ -28,7 +28,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -178,7 +178,7 @@ func (c *Client) parseResponseIETF(ctx context.Context, w dns.ResponseWriter, r
 		}
 	}
 
-	body, err := ioutil.ReadAll(req.response.Body)
+	body, err := io.ReadAll(req.response.Body)
 	if err != nil {
 		log.Printf("read error from upstream %s: %v\n", req.currentUpstream, err)
 		req.reply.Rcode = dns.RcodeServerFailure
diff --git a/doh-client/main.go b/doh-client/main.go
index e739a22..ec8a569 100644
--- a/doh-client/main.go
+++ b/doh-client/main.go
@@ -27,7 +27,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"runtime"
@@ -40,7 +39,7 @@ func checkPIDFile(pidFile string) (bool, error) {
 retry:
 	f, err := os.OpenFile(pidFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
 	if os.IsExist(err) {
-		pidStr, err := ioutil.ReadFile(pidFile)
+		pidStr, err := os.ReadFile(pidFile)
 		if err != nil {
 			return false, err
 		}
diff --git a/doh-server/ietf.go b/doh-server/ietf.go
index 1d5d93d..8b29255 100644
--- a/doh-server/ietf.go
+++ b/doh-server/ietf.go
@@ -28,7 +28,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -50,7 +50,7 @@ func (s *Server) parseRequestIETF(ctx context.Context, w http.ResponseWriter, r
 		}
 	}
 	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)
+		requestBinary, err = io.ReadAll(r.Body)
 		if err != nil {
 			return &DNSRequest{
 				errcode: 400,
@@ -215,4 +215,4 @@ func (s *Server) patchDNSCryptProxyReqID(w http.ResponseWriter, r *http.Request,
 		return true
 	}
 	return false
-}
\ No newline at end of file
+}
diff --git a/doh-server/main.go b/doh-server/main.go
index 813bee5..51a2304 100644
--- a/doh-server/main.go
+++ b/doh-server/main.go
@@ -27,7 +27,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"runtime"
@@ -38,7 +37,7 @@ func checkPIDFile(pidFile string) (bool, error) {
 retry:
 	f, err := os.OpenFile(pidFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
 	if os.IsExist(err) {
-		pidStr, err := ioutil.ReadFile(pidFile)
+		pidStr, err := os.ReadFile(pidFile)
 		if err != nil {
 			return false, err
 		}
diff --git a/doh-server/server.go b/doh-server/server.go
index e1d4955..bd7420c 100644
--- a/doh-server/server.go
+++ b/doh-server/server.go
@@ -28,7 +28,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"net"
@@ -114,7 +113,7 @@ func (s *Server) Start() error {
 	var clientCAPool *x509.CertPool
 	if s.conf.TLSClientAuth {
 		if s.conf.TLSClientAuthCA != "" {
-			clientCA, err := ioutil.ReadFile(s.conf.TLSClientAuthCA)
+			clientCA, err := os.ReadFile(s.conf.TLSClientAuthCA)
 			if err != nil {
 				log.Fatalf("Reading certificate for client authentication has failed: %v", err)
 			}