From 4b108b8258def657a9a5053f43c8bf4ca765a385 Mon Sep 17 00:00:00 2001 From: mzack Date: Mon, 24 Jan 2022 16:08:33 +0100 Subject: [PATCH 1/4] Add support for ztls --- fastdialer/dialer.go | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/fastdialer/dialer.go b/fastdialer/dialer.go index 2978232..548a187 100644 --- a/fastdialer/dialer.go +++ b/fastdialer/dialer.go @@ -15,6 +15,7 @@ import ( "github.com/projectdiscovery/iputil" "github.com/projectdiscovery/networkpolicy" retryabledns "github.com/projectdiscovery/retryabledns" + ztls "github.com/zmap/zcrypto/tls" ) // Dialer structure containing data information @@ -97,7 +98,7 @@ func NewDialer(options Options) (*Dialer, error) { // Dial function compatible with net/http func (d *Dialer) Dial(ctx context.Context, network, address string) (conn net.Conn, err error) { - conn, err = d.dial(ctx, network, address, false, nil) + conn, err = d.dial(ctx, network, address, false, false, nil, nil) return } @@ -107,13 +108,24 @@ func (d *Dialer) DialTLS(ctx context.Context, network, address string) (conn net return } +// DialZTLS with encrypted connection using ztls +func (d *Dialer) DialZTLS(ctx context.Context, network, address string) (conn net.Conn, err error) { + conn, err = d.DialZTLSWithConfig(ctx, network, address, &ztls.Config{InsecureSkipVerify: true}) + return +} + // DialTLS with encrypted connection func (d *Dialer) DialTLSWithConfig(ctx context.Context, network, address string, config *tls.Config) (conn net.Conn, err error) { - conn, err = d.dial(ctx, network, address, true, config) + conn, err = d.dial(ctx, network, address, true, false, config, nil) + return +} + +func (d *Dialer) DialZTLSWithConfig(ctx context.Context, network, address string, config *ztls.Config) (conn net.Conn, err error) { + conn, err = d.dial(ctx, network, address, false, true, nil, config) return } -func (d *Dialer) dial(ctx context.Context, network, address string, shouldUseTLS bool, tlsconfig *tls.Config) (conn net.Conn, err error) { +func (d *Dialer) dial(ctx context.Context, network, address string, shouldUseTLS, shouldUseZTLS bool, tlsconfig *tls.Config, ztlsconfig *ztls.Config) (conn net.Conn, err error) { var hostname, port, fixedIP string addressParts := strings.Split(address, ":") numberOfParts := len(addressParts) @@ -170,6 +182,12 @@ func (d *Dialer) dial(ctx context.Context, network, address string, shouldUseTLS tlsconfigCopy.ServerName = hostname } conn, err = tls.DialWithDialer(d.dialer, network, hostPort, tlsconfig) + } else if shouldUseZTLS { + ztlsconfigCopy := ztlsconfig.Clone() + if !iputil.IsIP(hostname) { + ztlsconfigCopy.ServerName = hostname + } + conn, err = ztls.DialWithDialer(d.dialer, network, hostPort, ztlsconfigCopy) } else { conn, err = d.dialer.DialContext(ctx, network, hostPort) } From ae3cd418e3e71df8ee65e96ca6bf27459383550f Mon Sep 17 00:00:00 2001 From: mzack Date: Tue, 25 Jan 2022 20:45:29 +0100 Subject: [PATCH 2/4] adding auto ztls support --- fastdialer/dialer.go | 15 +++++++++++++-- fastdialer/options.go | 1 + fastdialer/util.go | 45 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 fastdialer/util.go diff --git a/fastdialer/dialer.go b/fastdialer/dialer.go index 548a187..437226b 100644 --- a/fastdialer/dialer.go +++ b/fastdialer/dialer.go @@ -104,6 +104,10 @@ func (d *Dialer) Dial(ctx context.Context, network, address string) (conn net.Co // DialTLS with encrypted connection func (d *Dialer) DialTLS(ctx context.Context, network, address string) (conn net.Conn, err error) { + if d.options.WithZTLS { + conn, err = d.DialZTLSWithConfig(ctx, network, address, &ztls.Config{InsecureSkipVerify: true}) + } + conn, err = d.DialTLSWithConfig(ctx, network, address, &tls.Config{InsecureSkipVerify: true}) return } @@ -121,8 +125,15 @@ func (d *Dialer) DialTLSWithConfig(ctx context.Context, network, address string, } func (d *Dialer) DialZTLSWithConfig(ctx context.Context, network, address string, config *ztls.Config) (conn net.Conn, err error) { - conn, err = d.dial(ctx, network, address, false, true, nil, config) - return + // ztls doesn't support tls13 + if IsTLS13(config) { + stdTLSConfig, err := AsTLSConfig(config) + if err != nil { + return nil, err + } + return d.dial(ctx, network, address, true, false, stdTLSConfig, nil) + } + return d.dial(ctx, network, address, false, true, nil, config) } func (d *Dialer) dial(ctx context.Context, network, address string, shouldUseTLS, shouldUseZTLS bool, tlsconfig *tls.Config, ztlsconfig *ztls.Config) (conn net.Conn, err error) { diff --git a/fastdialer/options.go b/fastdialer/options.go index 4734b23..3dc17e7 100644 --- a/fastdialer/options.go +++ b/fastdialer/options.go @@ -45,6 +45,7 @@ type Options struct { DialerTimeout time.Duration DialerKeepAlive time.Duration Dialer *net.Dialer + WithZTLS bool } // DefaultOptions of the cache diff --git a/fastdialer/util.go b/fastdialer/util.go new file mode 100644 index 0000000..414c162 --- /dev/null +++ b/fastdialer/util.go @@ -0,0 +1,45 @@ +package fastdialer + +import ( + "bytes" + "crypto/tls" + "encoding/gob" + + ztls "github.com/zmap/zcrypto/tls" +) + +func AsTLSConfig(ztlsConfig *ztls.Config) (*tls.Config, error) { + tlsConfig := &tls.Config{} + err := To(ztlsConfig, tlsConfig) + return tlsConfig, err +} + +func AsZTLSConfig(tlsConfig *tls.Config) (*ztls.Config, error) { + ztlsConfig := &ztls.Config{} + err := To(tlsConfig, ztlsConfig) + return ztlsConfig, err +} + +func To(from, to interface{}) error { + buf := bytes.Buffer{} + err := gob.NewEncoder(&buf).Encode(from) + if err != nil { + return err + } + err = gob.NewDecoder(&buf).Decode(to) + if err != nil { + return err + } + return nil +} + +func IsTLS13(config interface{}) bool { + switch c := config.(type) { + case *tls.Config: + return c.MinVersion == tls.VersionTLS13 + case *ztls.Config: + return c.MinVersion == tls.VersionTLS13 + } + + return false +} From ad70c3c23dbb78a9a15c8d201f4c196ce1676ccd Mon Sep 17 00:00:00 2001 From: mzack Date: Thu, 27 Jan 2022 20:33:26 +0100 Subject: [PATCH 3/4] using direct return for dialtls --- fastdialer/dialer.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fastdialer/dialer.go b/fastdialer/dialer.go index 437226b..bac37f2 100644 --- a/fastdialer/dialer.go +++ b/fastdialer/dialer.go @@ -105,11 +105,10 @@ func (d *Dialer) Dial(ctx context.Context, network, address string) (conn net.Co // DialTLS with encrypted connection func (d *Dialer) DialTLS(ctx context.Context, network, address string) (conn net.Conn, err error) { if d.options.WithZTLS { - conn, err = d.DialZTLSWithConfig(ctx, network, address, &ztls.Config{InsecureSkipVerify: true}) + return d.DialZTLSWithConfig(ctx, network, address, &ztls.Config{InsecureSkipVerify: true}) } - conn, err = d.DialTLSWithConfig(ctx, network, address, &tls.Config{InsecureSkipVerify: true}) - return + return d.DialTLSWithConfig(ctx, network, address, &tls.Config{InsecureSkipVerify: true}) } // DialZTLS with encrypted connection using ztls From f06b0fd54d4728477f22ab1cc81947a793b07f66 Mon Sep 17 00:00:00 2001 From: mzack Date: Thu, 27 Jan 2022 20:33:45 +0100 Subject: [PATCH 4/4] adding test cases for tlsconfig/ztlsconfig conversion --- fastdialer/util.go | 20 +++----------------- fastdialer/util_test.go | 23 +++++++++++++++++++++++ go.mod | 5 ++++- go.sum | 23 +++++++++++++++++++++++ 4 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 fastdialer/util_test.go diff --git a/fastdialer/util.go b/fastdialer/util.go index 414c162..b0e8b11 100644 --- a/fastdialer/util.go +++ b/fastdialer/util.go @@ -1,38 +1,24 @@ package fastdialer import ( - "bytes" "crypto/tls" - "encoding/gob" + "github.com/ulule/deepcopier" ztls "github.com/zmap/zcrypto/tls" ) func AsTLSConfig(ztlsConfig *ztls.Config) (*tls.Config, error) { tlsConfig := &tls.Config{} - err := To(ztlsConfig, tlsConfig) + err := deepcopier.Copy(ztlsConfig).To(tlsConfig) return tlsConfig, err } func AsZTLSConfig(tlsConfig *tls.Config) (*ztls.Config, error) { ztlsConfig := &ztls.Config{} - err := To(tlsConfig, ztlsConfig) + err := deepcopier.Copy(tlsConfig).To(ztlsConfig) return ztlsConfig, err } -func To(from, to interface{}) error { - buf := bytes.Buffer{} - err := gob.NewEncoder(&buf).Encode(from) - if err != nil { - return err - } - err = gob.NewDecoder(&buf).Decode(to) - if err != nil { - return err - } - return nil -} - func IsTLS13(config interface{}) bool { switch c := config.(type) { case *tls.Config: diff --git a/fastdialer/util_test.go b/fastdialer/util_test.go new file mode 100644 index 0000000..b504458 --- /dev/null +++ b/fastdialer/util_test.go @@ -0,0 +1,23 @@ +package fastdialer + +import ( + "crypto/tls" + "testing" + + "github.com/stretchr/testify/require" + ztls "github.com/zmap/zcrypto/tls" +) + +func TestAsTLSConfig(t *testing.T) { + ztlsConfig := &ztls.Config{} + tlsConfig, err := AsTLSConfig(ztlsConfig) + require.Nil(t, err) + require.NotNil(t, tlsConfig) +} + +func TestAsZTLSConfig(t *testing.T) { + tlsConfig := &tls.Config{} + ztlsConfig, err := AsZTLSConfig(tlsConfig) + require.Nil(t, err) + require.NotNil(t, ztlsConfig) +} diff --git a/go.mod b/go.mod index ab6a4e9..f28303e 100644 --- a/go.mod +++ b/go.mod @@ -10,12 +10,15 @@ require ( github.com/miekg/dns v1.1.43 // indirect github.com/projectdiscovery/cryptoutil v0.0.0-20210805184155-b5d2512f9345 github.com/projectdiscovery/hmap v0.0.2-0.20210917080408-0fd7bd286bfa - github.com/projectdiscovery/iputil v0.0.0-20210804143329-3a30fcde43f3 // indirect + github.com/projectdiscovery/iputil v0.0.0-20210804143329-3a30fcde43f3 github.com/projectdiscovery/mapcidr v0.0.8 // indirect github.com/projectdiscovery/networkpolicy v0.0.1 github.com/projectdiscovery/retryabledns v1.0.13-0.20210916165024-76c5b76fd59a github.com/projectdiscovery/stringsutil v0.0.0-20210830151154-f567170afdd9 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect + github.com/stretchr/testify v1.7.0 + github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 + github.com/zmap/zcrypto v0.0.0-20211005224000-2d0ffdec8a9b go.etcd.io/bbolt v1.3.6 // indirect golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 // indirect golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 // indirect diff --git a/go.sum b/go.sum index ffcae48..67790c6 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -51,6 +52,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -64,6 +66,7 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ= github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -97,7 +100,10 @@ github.com/projectdiscovery/stringsutil v0.0.0-20210830151154-f567170afdd9/go.mo github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= @@ -105,23 +111,37 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 h1:TtyC78WMafNW8QFfv3TeP3yWNDG+uxNkk9vOrnDu6JA= +github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6/go.mod h1:h8272+G2omSmi30fBXiZDMkmHuOgonplfKIKjQWzlfs= +github.com/weppos/publicsuffix-go v0.15.1-0.20210928183822-5ee35905bd95 h1:DyAZOw3JsVd6LJHqhl4MpKQdYQEmat0C6pPPwom39Ow= +github.com/weppos/publicsuffix-go v0.15.1-0.20210928183822-5ee35905bd95/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/yl2chen/cidranger v1.0.2 h1:lbOWZVCG1tCRX4u24kuM1Tb4nHqWkDxwLdoS+SevawU= github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/9UEQfHl0g= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521 h1:kKCF7VX/wTmdg2ZjEaqlq99Bjsoiz7vH6sFniF/vI4M= +github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= +github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= +github.com/zmap/zcrypto v0.0.0-20211005224000-2d0ffdec8a9b h1:iYQzlljG1dOXBtsJGyzFC/wBK5qUCWs1eLCr/UcJYPA= +github.com/zmap/zcrypto v0.0.0-20211005224000-2d0ffdec8a9b/go.mod h1:5nID//bFGkx3/+iHcFIFRHQ54EOPJ0iSj0IGKpMElvw= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 h1:xYJJ3S178yv++9zXV/hnr29plCAGO9vAFG9dorqaFQc= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210414194228-064579744ee0/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= @@ -133,12 +153,14 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -152,6 +174,7 @@ golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 h1:7ZDGnxgHAMw7thfC5bEos0RDAccZKxioiWBhfIe+tvw= golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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=