diff --git a/go.mod b/go.mod index a2f098c5..ecbb42cf 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/cloudfoundry/bosh-davcli go 1.21.0 require ( - github.com/cloudfoundry/bosh-utils v0.0.484 + github.com/cloudfoundry/bosh-utils v0.0.485 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.34.1 ) @@ -12,8 +12,8 @@ require ( code.cloudfoundry.org/tlsconfig v0.1.0 // indirect github.com/bmatcuk/doublestar v1.3.4 // 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/fsnotify/fsnotify v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.6.0 // indirect diff --git a/go.sum b/go.sum index d4f172d9..8c11d86e 100644 --- a/go.sum +++ b/go.sum @@ -8,12 +8,12 @@ github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQ github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= 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-utils v0.0.484 h1:XgR0D0XJv/k+tmFW1qJo0tz877DDR3d/SLI3EzX+kGI= -github.com/cloudfoundry/bosh-utils v0.0.484/go.mod h1:GrOm4BfT0KiXW4KfJ5I3MFYocO4leq90Ez41jAMer1M= -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.485 h1:27unCVMmYlWb2xzKWtpkkpsaM3LEU3p39OFSq7Su0LM= +github.com/cloudfoundry/bosh-utils v0.0.485/go.mod h1:BtS3XVKTb6N37ecru72WtX1I2IF5XaaFV1k0zzI/n10= +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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -64,8 +64,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= -github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= 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 1382a242..8a63c0c6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/bmatcuk/doublestar # github.com/charlievieth/fs v0.0.3 ## explicit; go 1.18 github.com/charlievieth/fs -# github.com/cloudfoundry/bosh-utils v0.0.484 +# github.com/cloudfoundry/bosh-utils v0.0.485 ## explicit; go 1.21.0 github.com/cloudfoundry/bosh-utils/crypto github.com/cloudfoundry/bosh-utils/errors @@ -16,10 +16,10 @@ github.com/cloudfoundry/bosh-utils/logger 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/fsnotify/fsnotify v1.7.0