replace deprecated method

This commit is contained in:
Charles Xu
2023-09-18 10:16:48 +00:00
parent 03721e8c7e
commit 7833ca8bc6
11 changed files with 19 additions and 22 deletions

View File

@ -1,7 +1,7 @@
package ssh package ssh
import ( import (
"io/ioutil" "os"
"time" "time"
mdata "github.com/go-gost/core/metadata" 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 != "" { if key := mdutil.GetString(md, privateKeyFile); key != "" {
data, err := ioutil.ReadFile(key) data, err := os.ReadFile(key)
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,7 +1,7 @@
package sshd package sshd
import ( import (
"io/ioutil" "os"
"time" "time"
mdata "github.com/go-gost/core/metadata" 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 != "" { if key := mdutil.GetString(md, privateKeyFile); key != "" {
data, err := ioutil.ReadFile(key) data, err := os.ReadFile(key)
if err != nil { if err != nil {
return err return err
} }

View File

@ -10,7 +10,6 @@ import (
"fmt" "fmt"
"hash/crc32" "hash/crc32"
"io" "io"
"io/ioutil"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -149,7 +148,7 @@ func (h *http2Handler) roundTrip(ctx context.Context, w http.ResponseWriter, req
ProtoMajor: 2, ProtoMajor: 2,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{},
Body: ioutil.NopCloser(bytes.NewReader([]byte{})), Body: io.NopCloser(bytes.NewReader([]byte{})),
} }
if !h.authenticate(ctx, w, req, resp, log) { if !h.authenticate(ctx, w, req, resp, log) {

View File

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net" "net"
"time" "time"
@ -77,7 +76,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, log logger
t := time.Now() t := time.Now()
log.Debugf("%s <-> %s", conn.RemoteAddr(), cc.LocalAddr()) 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)}). log.WithFields(map[string]any{"duration": time.Since(t)}).
Debugf("%s >-< %s", conn.RemoteAddr(), cc.LocalAddr()) Debugf("%s >-< %s", conn.RemoteAddr(), cc.LocalAddr())

View File

@ -3,7 +3,6 @@ package ss
import ( import (
"context" "context"
"io" "io"
"io/ioutil"
"net" "net"
"time" "time"
@ -92,7 +91,7 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H
addr := &gosocks5.Addr{} addr := &gosocks5.Addr{}
if _, err := addr.ReadFrom(conn); err != nil { if _, err := addr.ReadFrom(conn); err != nil {
log.Error(err) log.Error(err)
io.Copy(ioutil.Discard, conn) io.Copy(io.Discard, conn)
return err return err
} }

View File

@ -4,7 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "os"
"github.com/go-gost/core/auth" "github.com/go-gost/core/auth"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
@ -58,7 +58,7 @@ func PublicKeyCallback(keys map[string]bool) PublicKeyCallbackFunc {
// ParseSSHAuthorizedKeysFile parses ssh authorized keys file. // ParseSSHAuthorizedKeysFile parses ssh authorized keys file.
func ParseAuthorizedKeysFile(name string) (map[string]bool, error) { func ParseAuthorizedKeysFile(name string) (map[string]bool, error) {
authorizedKeysBytes, err := ioutil.ReadFile(name) authorizedKeysBytes, err := os.ReadFile(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -4,8 +4,8 @@ import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"errors" "errors"
"io/ioutil"
"net" "net"
"os"
"time" "time"
"github.com/go-gost/core/logger" "github.com/go-gost/core/logger"
@ -114,7 +114,7 @@ func loadCA(caFile string) (cp *x509.CertPool, err error) {
return return
} }
cp = x509.NewCertPool() cp = x509.NewCertPool()
data, err := ioutil.ReadFile(caFile) data, err := os.ReadFile(caFile)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"encoding/base64" "encoding/base64"
"errors" "errors"
"io/ioutil" "io"
"net" "net"
"net/http" "net/http"
"strings" "strings"
@ -164,7 +164,7 @@ func (l *dnsListener) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
buf, err = ioutil.ReadAll(r.Body) buf, err = io.ReadAll(r.Body)
if err != nil { if err != nil {
l.logger.Error(err) l.logger.Error(err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)

View File

@ -1,7 +1,7 @@
package ssh package ssh
import ( import (
"io/ioutil" "os"
mdata "github.com/go-gost/core/metadata" mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util" 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 != "" { if key := mdutil.GetString(md, privateKeyFile); key != "" {
data, err := ioutil.ReadFile(key) data, err := os.ReadFile(key)
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,7 +1,7 @@
package ssh package ssh
import ( import (
"io/ioutil" "os"
mdata "github.com/go-gost/core/metadata" mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util" 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 != "" { if key := mdutil.GetString(md, privateKeyFile); key != "" {
data, err := ioutil.ReadFile(key) data, err := os.ReadFile(key)
if err != nil { if err != nil {
return err return err
} }

View File

@ -5,7 +5,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io/ioutil" "io"
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
@ -172,7 +172,7 @@ func (ex *exchanger) dohExchange(ctx context.Context, msg []byte) ([]byte, error
} }
// Read wireformat response from the body // Read wireformat response from the body
buf, err := ioutil.ReadAll(resp.Body) buf, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read the response body: %w", err) return nil, fmt.Errorf("failed to read the response body: %w", err)
} }