Pārlūkot izejas kodu

Remove shadowsocks dependency

tags/v2.0.0-rc1
9seconds 5 gadus atpakaļ
vecāks
revīzija
5b46152945
3 mainītis faili ar 4 papildinājumiem un 94 dzēšanām
  1. 3
    4
      go.mod
  2. 1
    15
      go.sum
  3. 0
    75
      mtglib/network/shadowsocks.go

+ 3
- 4
go.mod Parādīt failu

3
 go 1.16
3
 go 1.16
4
 
4
 
5
 require (
5
 require (
6
-	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
6
+	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
7
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
7
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
8
 	github.com/libp2p/go-reuseport v0.0.2
8
 	github.com/libp2p/go-reuseport v0.0.2
9
-	github.com/mccutchen/go-httpbin v1.1.1 // indirect
9
+	github.com/mccutchen/go-httpbin v1.1.1
10
 	github.com/pelletier/go-toml v1.8.1
10
 	github.com/pelletier/go-toml v1.8.1
11
-	github.com/shadowsocks/go-shadowsocks2 v0.1.4
12
-	github.com/stretchr/testify v1.7.0 // indirect
11
+	github.com/stretchr/testify v1.7.0
13
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
12
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
14
 )
13
 )

+ 1
- 15
go.sum Parādīt failu

15
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
15
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
16
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
16
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
17
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
17
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
18
-github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
19
-github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
20
-github.com/shadowsocks/go-shadowsocks2 v0.1.4 h1:4VzajPL7RwwmImysBSvI+lm/UaegDGQq3hr42dYo3gs=
21
-github.com/shadowsocks/go-shadowsocks2 v0.1.4/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM=
22
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
23
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
18
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
24
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
25
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
19
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
26
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
20
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
27
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
21
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
28
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
29
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
30
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
31
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
32
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
22
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
33
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
23
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
34
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
35
 golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
24
 golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
36
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
37
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
25
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
38
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
26
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
39
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
40
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
27
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
41
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
42
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
28
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
43
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
29
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
30
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
44
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
31
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
45
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
46
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
32
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
47
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
33
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
48
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
34
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

+ 0
- 75
mtglib/network/shadowsocks.go Parādīt failu

1
-package network
2
-
3
-import (
4
-	"context"
5
-	"encoding/base64"
6
-	"fmt"
7
-	"net"
8
-	"net/url"
9
-	"strings"
10
-	"time"
11
-
12
-	shadowsocks "github.com/shadowsocks/go-shadowsocks2/core"
13
-	"golang.org/x/net/proxy"
14
-)
15
-
16
-type shadowsocksDialer struct {
17
-	Dialer
18
-
19
-	cipher shadowsocks.StreamConnCipher
20
-}
21
-
22
-func (s *shadowsocksDialer) Dial(network, address string) (net.Conn, error) {
23
-	return s.DialContext(context.Background(), network, address)
24
-}
25
-
26
-func (s *shadowsocksDialer) DialContext(ctx context.Context,
27
-	network, address string) (net.Conn, error) {
28
-	conn, err := s.Dialer.DialContext(ctx, network, address)
29
-	if err != nil {
30
-		return nil, err // nolint: wrapcheck
31
-	}
32
-
33
-	return s.cipher.StreamConn(conn), nil
34
-}
35
-
36
-func NewShadowsocksDialer(proxyURL *url.URL,
37
-	timeout time.Duration, bufferSize int) (Dialer, error) {
38
-	username := proxyURL.User.Username()
39
-
40
-	decoded, err := base64.RawURLEncoding.DecodeString(username)
41
-	if err != nil {
42
-		return nil, fmt.Errorf("cannot decode payload: %w", err)
43
-	}
44
-
45
-	chunks := strings.SplitN(string(decoded), ":", 2)
46
-	if len(chunks) != 2 {
47
-		return nil, fmt.Errorf("incorrect payload %s", username)
48
-	}
49
-
50
-	cipher, err := shadowsocks.PickCipher(chunks[0], nil, chunks[1])
51
-	if err != nil {
52
-		return nil, fmt.Errorf("cannot initialize shadowsocks cipher: %w", err)
53
-	}
54
-
55
-	socks5URL := *proxyURL
56
-	socks5URL.Scheme = "socks5"
57
-	socks5URL.User = nil
58
-
59
-	dialer, err := NewDefaultDialer(timeout, bufferSize)
60
-	if err != nil {
61
-		return nil, fmt.Errorf("cannot initialize a base dialer: %w", err)
62
-	}
63
-
64
-	ssDialer := &shadowsocksDialer{
65
-		Dialer: dialer,
66
-		cipher: cipher,
67
-	}
68
-
69
-	rv, err := proxy.FromURL(&socks5URL, ssDialer)
70
-	if err != nil {
71
-		return nil, fmt.Errorf("cannot initialize ss proxy dialer: %w", err)
72
-	}
73
-
74
-	return rv.(Dialer), nil
75
-}

Notiek ielāde…
Atcelt
Saglabāt