Fix deprecated functions

Longjoe76 · Aug 12, 2022 · ccd9e31 · ccd9e31
1 parent e18ad6c
commit ccd9e31
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -50,7 +50,7 @@ func run(ctx context.Context, logger *logrus.Logger) error {
 	}
 
 	if quiet {
-		logger.SetOutput(ioutil.Discard)
+		logger.SetOutput(io.Discard)
 	}
 	logger.SetLevel(logLevel)
 

diff --git a/internal/report/html.go b/internal/report/html.go
@@ -5,7 +5,6 @@ import (
 	_ "embed"
 	"html/template"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -333,7 +332,7 @@ func exportFullReportToHtml(
 		return "", errors.Wrap(err, "couldn't execute template")
 	}
 
-	file, err := ioutil.TempFile("", "gotestwaf_report_*.html")
+	file, err := os.CreateTemp("", "gotestwaf_report_*.html")
 	if err != nil {
 		return "", errors.Wrap(err, "couldn't create a temporary file")
 	}

diff --git a/internal/scanner/http_client.go b/internal/scanner/http_client.go
@@ -3,7 +3,7 @@ package scanner
 import (
 	"context"
 	"crypto/tls"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -128,7 +128,7 @@ func (c *HTTPClient) SendPayload(
 	}
 	defer resp.Body.Close()
 
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", 0, errors.Wrap(err, "reading response body")
 	}
@@ -173,7 +173,7 @@ func (c *HTTPClient) SendRequest(req *http.Request, testHeaderValue string) (
 	}
 	defer resp.Body.Close()
 
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, "", 0, errors.Wrap(err, "reading response body")
 	}

diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"regexp"
@@ -574,7 +573,7 @@ func (s *Scanner) updateDB(
 			RequestValidationInput: inputReuqestValidation,
 			Status:                 respStatusCode,
 			Header:                 respHeaders,
-			Body:                   ioutil.NopCloser(strings.NewReader(respBody)),
+			Body:                   io.NopCloser(strings.NewReader(respBody)),
 			Options: &openapi3filter.Options{
 				IncludeResponseStatus: true,
 			},

diff --git a/tests/integration/waf/placeholder.go b/tests/integration/waf/placeholder.go
@@ -3,7 +3,7 @@ package waf
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"regexp"
 
@@ -28,7 +28,7 @@ func getPayloadFromHeader(r *http.Request) (string, error) {
 }
 
 func getPayloadFromHTMLForm(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't get payload from form body: %v", err)
 	}
@@ -59,15 +59,15 @@ func getPayloadFromHTMLMultipartForm(r *http.Request) (string, error) {
 }
 
 func getPayloadFromJSONBody(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't get payload from JSON body: %v", err)
 	}
 	return string(body), nil
 }
 
 func getPayloadFromJSONRequest(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't read request body: %v", err)
 	}
@@ -81,15 +81,15 @@ func getPayloadFromJSONRequest(r *http.Request) (string, error) {
 }
 
 func getPayloadFromRequestBody(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't get payload from request body: %v", err)
 	}
 	return string(body), nil
 }
 
 func getPayloadFromSOAPBody(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't read request body: %v", err)
 	}
@@ -122,7 +122,7 @@ func getPayloadFromURLPath(r *http.Request) (string, error) {
 }
 
 func getPayloadFromXMLBody(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", fmt.Errorf("couldn't get payload from XML body: %v", err)
 	}