From 5b461529451efdff6f8df2f578037adc4ad6b1c9 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 5 Mar 2021 18:16:24 +0300 Subject: [PATCH] Remove shadowsocks dependency --- go.mod | 7 ++-- go.sum | 16 +------- mtglib/network/shadowsocks.go | 75 ----------------------------------- 3 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 mtglib/network/shadowsocks.go diff --git a/go.mod b/go.mod index da2a623..e6dd6ce 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,11 @@ module github.com/9seconds/mtg/v2 go 1.16 require ( - github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect + github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 github.com/libp2p/go-reuseport v0.0.2 - github.com/mccutchen/go-httpbin v1.1.1 // indirect + github.com/mccutchen/go-httpbin v1.1.1 github.com/pelletier/go-toml v1.8.1 - github.com/shadowsocks/go-shadowsocks2 v0.1.4 - github.com/stretchr/testify v1.7.0 // indirect + github.com/stretchr/testify v1.7.0 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 ) diff --git a/go.sum b/go.sum index 4da8844..1563bf5 100644 --- a/go.sum +++ b/go.sum @@ -15,34 +15,20 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= -github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s= -github.com/shadowsocks/go-shadowsocks2 v0.1.4 h1:4VzajPL7RwwmImysBSvI+lm/UaegDGQq3hr42dYo3gs= -github.com/shadowsocks/go-shadowsocks2 v0.1.4/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/mtglib/network/shadowsocks.go b/mtglib/network/shadowsocks.go deleted file mode 100644 index ffad8aa..0000000 --- a/mtglib/network/shadowsocks.go +++ /dev/null @@ -1,75 +0,0 @@ -package network - -import ( - "context" - "encoding/base64" - "fmt" - "net" - "net/url" - "strings" - "time" - - shadowsocks "github.com/shadowsocks/go-shadowsocks2/core" - "golang.org/x/net/proxy" -) - -type shadowsocksDialer struct { - Dialer - - cipher shadowsocks.StreamConnCipher -} - -func (s *shadowsocksDialer) Dial(network, address string) (net.Conn, error) { - return s.DialContext(context.Background(), network, address) -} - -func (s *shadowsocksDialer) DialContext(ctx context.Context, - network, address string) (net.Conn, error) { - conn, err := s.Dialer.DialContext(ctx, network, address) - if err != nil { - return nil, err // nolint: wrapcheck - } - - return s.cipher.StreamConn(conn), nil -} - -func NewShadowsocksDialer(proxyURL *url.URL, - timeout time.Duration, bufferSize int) (Dialer, error) { - username := proxyURL.User.Username() - - decoded, err := base64.RawURLEncoding.DecodeString(username) - if err != nil { - return nil, fmt.Errorf("cannot decode payload: %w", err) - } - - chunks := strings.SplitN(string(decoded), ":", 2) - if len(chunks) != 2 { - return nil, fmt.Errorf("incorrect payload %s", username) - } - - cipher, err := shadowsocks.PickCipher(chunks[0], nil, chunks[1]) - if err != nil { - return nil, fmt.Errorf("cannot initialize shadowsocks cipher: %w", err) - } - - socks5URL := *proxyURL - socks5URL.Scheme = "socks5" - socks5URL.User = nil - - dialer, err := NewDefaultDialer(timeout, bufferSize) - if err != nil { - return nil, fmt.Errorf("cannot initialize a base dialer: %w", err) - } - - ssDialer := &shadowsocksDialer{ - Dialer: dialer, - cipher: cipher, - } - - rv, err := proxy.FromURL(&socks5URL, ssDialer) - if err != nil { - return nil, fmt.Errorf("cannot initialize ss proxy dialer: %w", err) - } - - return rv.(Dialer), nil -}