From 7833ca8bc6f2135cdfc0560b5ac5c029a2a5ef73 Mon Sep 17 00:00:00 2001 From: Charles Xu <6831013+char8x@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:16:48 +0000 Subject: [PATCH] replace deprecated method --- dialer/ssh/metadata.go | 4 ++-- dialer/sshd/metadata.go | 4 ++-- handler/http2/handler.go | 3 +-- handler/socks/v5/udp.go | 3 +-- handler/ss/handler.go | 3 +-- internal/util/ssh/ssh.go | 4 ++-- internal/util/tls/tls.go | 4 ++-- listener/dns/listener.go | 4 ++-- listener/ssh/metadata.go | 4 ++-- listener/sshd/metadata.go | 4 ++-- resolver/exchanger/exchanger.go | 4 ++-- 11 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dialer/ssh/metadata.go b/dialer/ssh/metadata.go index 3ed5fca..2fa8315 100644 --- a/dialer/ssh/metadata.go +++ b/dialer/ssh/metadata.go @@ -1,7 +1,7 @@ package ssh import ( - "io/ioutil" + "os" "time" mdata "github.com/go-gost/core/metadata" @@ -26,7 +26,7 @@ func (d *sshDialer) parseMetadata(md mdata.Metadata) (err error) { ) if key := mdutil.GetString(md, privateKeyFile); key != "" { - data, err := ioutil.ReadFile(key) + data, err := os.ReadFile(key) if err != nil { return err } diff --git a/dialer/sshd/metadata.go b/dialer/sshd/metadata.go index 62fef81..4a9b484 100644 --- a/dialer/sshd/metadata.go +++ b/dialer/sshd/metadata.go @@ -1,7 +1,7 @@ package sshd import ( - "io/ioutil" + "os" "time" mdata "github.com/go-gost/core/metadata" @@ -26,7 +26,7 @@ func (d *sshdDialer) parseMetadata(md mdata.Metadata) (err error) { ) if key := mdutil.GetString(md, privateKeyFile); key != "" { - data, err := ioutil.ReadFile(key) + data, err := os.ReadFile(key) if err != nil { return err } diff --git a/handler/http2/handler.go b/handler/http2/handler.go index 6b1bc19..960067c 100644 --- a/handler/http2/handler.go +++ b/handler/http2/handler.go @@ -10,7 +10,6 @@ import ( "fmt" "hash/crc32" "io" - "io/ioutil" "net" "net/http" "net/http/httputil" @@ -149,7 +148,7 @@ func (h *http2Handler) roundTrip(ctx context.Context, w http.ResponseWriter, req ProtoMajor: 2, ProtoMinor: 0, Header: http.Header{}, - Body: ioutil.NopCloser(bytes.NewReader([]byte{})), + Body: io.NopCloser(bytes.NewReader([]byte{})), } if !h.authenticate(ctx, w, req, resp, log) { diff --git a/handler/socks/v5/udp.go b/handler/socks/v5/udp.go index 5a6cfa1..1a4506c 100644 --- a/handler/socks/v5/udp.go +++ b/handler/socks/v5/udp.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "time" @@ -77,7 +76,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, log logger t := time.Now() log.Debugf("%s <-> %s", conn.RemoteAddr(), cc.LocalAddr()) - io.Copy(ioutil.Discard, conn) + io.Copy(io.Discard, conn) log.WithFields(map[string]any{"duration": time.Since(t)}). Debugf("%s >-< %s", conn.RemoteAddr(), cc.LocalAddr()) diff --git a/handler/ss/handler.go b/handler/ss/handler.go index 4ee10c7..2f219cc 100644 --- a/handler/ss/handler.go +++ b/handler/ss/handler.go @@ -3,7 +3,6 @@ package ss import ( "context" "io" - "io/ioutil" "net" "time" @@ -92,7 +91,7 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H addr := &gosocks5.Addr{} if _, err := addr.ReadFrom(conn); err != nil { log.Error(err) - io.Copy(ioutil.Discard, conn) + io.Copy(io.Discard, conn) return err } diff --git a/internal/util/ssh/ssh.go b/internal/util/ssh/ssh.go index 8671372..a52b235 100644 --- a/internal/util/ssh/ssh.go +++ b/internal/util/ssh/ssh.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "os" "github.com/go-gost/core/auth" "golang.org/x/crypto/ssh" @@ -58,7 +58,7 @@ func PublicKeyCallback(keys map[string]bool) PublicKeyCallbackFunc { // ParseSSHAuthorizedKeysFile parses ssh authorized keys file. func ParseAuthorizedKeysFile(name string) (map[string]bool, error) { - authorizedKeysBytes, err := ioutil.ReadFile(name) + authorizedKeysBytes, err := os.ReadFile(name) if err != nil { return nil, err } diff --git a/internal/util/tls/tls.go b/internal/util/tls/tls.go index 9ae4de2..131f94f 100644 --- a/internal/util/tls/tls.go +++ b/internal/util/tls/tls.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "crypto/x509" "errors" - "io/ioutil" "net" + "os" "time" "github.com/go-gost/core/logger" @@ -114,7 +114,7 @@ func loadCA(caFile string) (cp *x509.CertPool, err error) { return } cp = x509.NewCertPool() - data, err := ioutil.ReadFile(caFile) + data, err := os.ReadFile(caFile) if err != nil { return nil, err } diff --git a/listener/dns/listener.go b/listener/dns/listener.go index 53d8d3e..e5048e9 100644 --- a/listener/dns/listener.go +++ b/listener/dns/listener.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/base64" "errors" - "io/ioutil" + "io" "net" "net/http" "strings" @@ -164,7 +164,7 @@ func (l *dnsListener) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - buf, err = ioutil.ReadAll(r.Body) + buf, err = io.ReadAll(r.Body) if err != nil { l.logger.Error(err) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) diff --git a/listener/ssh/metadata.go b/listener/ssh/metadata.go index 6c4ac19..61044f9 100644 --- a/listener/ssh/metadata.go +++ b/listener/ssh/metadata.go @@ -1,7 +1,7 @@ package ssh import ( - "io/ioutil" + "os" mdata "github.com/go-gost/core/metadata" mdutil "github.com/go-gost/core/metadata/util" @@ -28,7 +28,7 @@ func (l *sshListener) parseMetadata(md mdata.Metadata) (err error) { ) if key := mdutil.GetString(md, privateKeyFile); key != "" { - data, err := ioutil.ReadFile(key) + data, err := os.ReadFile(key) if err != nil { return err } diff --git a/listener/sshd/metadata.go b/listener/sshd/metadata.go index 154073b..d9644e2 100644 --- a/listener/sshd/metadata.go +++ b/listener/sshd/metadata.go @@ -1,7 +1,7 @@ package ssh import ( - "io/ioutil" + "os" mdata "github.com/go-gost/core/metadata" mdutil "github.com/go-gost/core/metadata/util" @@ -28,7 +28,7 @@ func (l *sshdListener) parseMetadata(md mdata.Metadata) (err error) { ) if key := mdutil.GetString(md, privateKeyFile); key != "" { - data, err := ioutil.ReadFile(key) + data, err := os.ReadFile(key) if err != nil { return err } diff --git a/resolver/exchanger/exchanger.go b/resolver/exchanger/exchanger.go index 89ad775..105fc7c 100644 --- a/resolver/exchanger/exchanger.go +++ b/resolver/exchanger/exchanger.go @@ -5,7 +5,7 @@ import ( "context" "crypto/tls" "fmt" - "io/ioutil" + "io" "net" "net/http" "net/url" @@ -172,7 +172,7 @@ func (ex *exchanger) dohExchange(ctx context.Context, msg []byte) ([]byte, error } // Read wireformat response from the body - buf, err := ioutil.ReadAll(resp.Body) + buf, err := io.ReadAll(resp.Body) if err != nil { return nil, fmt.Errorf("failed to read the response body: %w", err) }