diff --git a/go.mod b/go.mod index da1738b2..56b78494 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Masterminds/semver v1.5.0 github.com/alecthomas/kingpin/v2 v2.4.0 github.com/cloudfoundry/bosh-cli v6.4.1+incompatible - github.com/cloudfoundry/bosh-utils v0.0.485 + github.com/cloudfoundry/bosh-utils v0.0.486 github.com/cppforlife/go-patch v0.2.0 github.com/google/go-github v17.0.0+incompatible github.com/pkg/errors v0.9.1 @@ -24,8 +24,8 @@ require ( github.com/bmatcuk/doublestar v1.3.4 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charlievieth/fs v0.0.3 // indirect - github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect - github.com/cloudfoundry/socks5-proxy v0.2.121 // indirect + github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee // indirect + github.com/cloudfoundry/socks5-proxy v0.2.122 // indirect github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect diff --git a/go.sum b/go.sum index 66561cba..06c2c221 100644 --- a/go.sum +++ b/go.sum @@ -20,12 +20,12 @@ github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo= github.com/cloudfoundry/bosh-cli v6.4.1+incompatible h1:n5/+NIF9QxvGINOrjh6DmO+GTen78MoCj5+LU9L8bR4= github.com/cloudfoundry/bosh-cli v6.4.1+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM= -github.com/cloudfoundry/bosh-utils v0.0.485 h1:27unCVMmYlWb2xzKWtpkkpsaM3LEU3p39OFSq7Su0LM= -github.com/cloudfoundry/bosh-utils v0.0.485/go.mod h1:BtS3XVKTb6N37ecru72WtX1I2IF5XaaFV1k0zzI/n10= -github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e h1:FQdRViaoDphGRfgrotl2QGsX1gbloe57dbGBS5CG6KY= -github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e/go.mod h1:PXmcacyJB/pJjSxEl15IU6rEIKXrhZQRzsr0UTkgNNs= -github.com/cloudfoundry/socks5-proxy v0.2.121 h1:TiWZlwHCDUrPt+diReZp4kwXocwufKWE/JybLOsWsxo= -github.com/cloudfoundry/socks5-proxy v0.2.121/go.mod h1:mNi+PGrviQiW+h5JOfZ7G4/ppmIdD2V1I+k3PzV14ow= +github.com/cloudfoundry/bosh-utils v0.0.486 h1:ubCyx+BYtba5/QJM6NLNdhsEq9+l8WCjPDp4Q3Us6cs= +github.com/cloudfoundry/bosh-utils v0.0.486/go.mod h1:G/4pEwWIXnwnK+RM472+A+YWbfmrwH4xzx7qkdRKsQ8= +github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee h1:88ruSYvCUKX2YcF2CMYVTmPGITvNdRbzaBRk2c/iMds= +github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee/go.mod h1:72EEm1oq5oXqGfu9XGtaRPWEcAFYd/P10cMNln0QhA8= +github.com/cloudfoundry/socks5-proxy v0.2.122 h1:Gh6rP/P2gcx6lZZ2dNVComumven0RbST3NRTC8PNd9M= +github.com/cloudfoundry/socks5-proxy v0.2.122/go.mod h1:HU6mWPd37l6Yw+H98Kffb+5KP6o2l749kw054psBsUM= github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU= github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8= github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 h1:J+ghqo7ZubTzelkjo9hntpTtP/9lUCWH9icEmAW+B+Q= diff --git a/vendor/github.com/cloudfoundry/go-socks5/.gitignore b/vendor/github.com/cloudfoundry/go-socks5/.gitignore index 00268614..79aa76b8 100644 --- a/vendor/github.com/cloudfoundry/go-socks5/.gitignore +++ b/vendor/github.com/cloudfoundry/go-socks5/.gitignore @@ -20,3 +20,6 @@ _cgo_export.* _testmain.go *.exe +.idea +go.sum +vendor diff --git a/vendor/github.com/cloudfoundry/go-socks5/socks5.go b/vendor/github.com/cloudfoundry/go-socks5/socks5.go index b8816a30..23b5f863 100644 --- a/vendor/github.com/cloudfoundry/go-socks5/socks5.go +++ b/vendor/github.com/cloudfoundry/go-socks5/socks5.go @@ -105,6 +105,15 @@ func (s *Server) ListenAndServe(network, addr string) error { return s.Serve(l) } +// Listen only starts listening, useful if you want to block and wait for listening before serving +func (s *Server) Listen(network, addr string) (net.Listener, error) { + l, err := net.Listen(network, addr) + if err != nil { + return nil, err + } + return l, nil +} + // Serve is used to serve connections from a listener func (s *Server) Serve(l net.Listener) error { for { diff --git a/vendor/modules.txt b/vendor/modules.txt index b4ed5cf2..1579a014 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -29,7 +29,7 @@ github.com/cloudfoundry/bosh-cli/director github.com/cloudfoundry/bosh-cli/director/template github.com/cloudfoundry/bosh-cli/io github.com/cloudfoundry/bosh-cli/uaa -# github.com/cloudfoundry/bosh-utils v0.0.485 +# github.com/cloudfoundry/bosh-utils v0.0.486 ## explicit; go 1.21.0 github.com/cloudfoundry/bosh-utils/crypto github.com/cloudfoundry/bosh-utils/errors @@ -39,10 +39,10 @@ github.com/cloudfoundry/bosh-utils/property github.com/cloudfoundry/bosh-utils/retrystrategy github.com/cloudfoundry/bosh-utils/system github.com/cloudfoundry/bosh-utils/uuid -# github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e -## explicit +# github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee +## explicit; go 1.21.0 github.com/cloudfoundry/go-socks5 -# github.com/cloudfoundry/socks5-proxy v0.2.121 +# github.com/cloudfoundry/socks5-proxy v0.2.122 ## explicit; go 1.21.0 github.com/cloudfoundry/socks5-proxy # github.com/cppforlife/go-patch v0.2.0