From c8c4161bb4c228997a70f3b392f4cd11463a3b27 Mon Sep 17 00:00:00 2001 From: dingjun Date: Fri, 10 Jul 2020 19:44:34 +0800 Subject: [PATCH] update dep --- client.go | 2 +- conn_test.go | 2 +- go.mod | 14 +++++--------- go.sum | 39 +++++++++++++-------------------------- obfscp/scp.go | 2 +- obfssh/proxy.go | 2 +- obfssh/ssh.go | 2 +- obfsshd/config.go | 2 +- obfsshd/server.go | 2 +- server.go | 2 +- util.go | 2 +- 11 files changed, 27 insertions(+), 44 deletions(-) diff --git a/client.go b/client.go index defe15a..087abc7 100644 --- a/client.go +++ b/client.go @@ -15,7 +15,7 @@ import ( "time" "github.com/containerd/console" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" socks "github.com/fangdingjun/socks-go" "golang.org/x/crypto/ssh" ) diff --git a/conn_test.go b/conn_test.go index f794432..fccdfce 100644 --- a/conn_test.go +++ b/conn_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" ) func TestTimedOutConn(t *testing.T) { diff --git a/go.mod b/go.mod index 9a9ec81..1e7c5e5 100644 --- a/go.mod +++ b/go.mod @@ -4,16 +4,12 @@ go 1.13 require ( github.com/bgentry/speakeasy v0.1.0 - github.com/creack/pty v1.1.7 - github.com/fangdingjun/go-log v0.0.0-20190821073628-ae332053d6dc - github.com/fangdingjun/protolistener v0.0.0-20190821093313-6d5d2138f296 + github.com/containerd/console v1.0.0 + github.com/fangdingjun/go-log/v5 v5.0.0 + github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af github.com/fangdingjun/socks-go v0.0.0-20180926100003-fc6f0a9ee1f4 github.com/go-yaml/yaml v2.1.0+incompatible github.com/kr/fs v0.1.0 - github.com/kr/pretty v0.1.0 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/pkg/sftp v1.10.0 - github.com/stretchr/testify v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + github.com/pkg/sftp v1.11.0 + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 ) diff --git a/go.sum b/go.sum index d31a6ac..770caf4 100644 --- a/go.sum +++ b/go.sum @@ -1,46 +1,33 @@ -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/containerd/console v1.0.0 h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ= +github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fangdingjun/go-log v0.0.0-20190821073628-ae332053d6dc h1:Tdk7VsmsFo3d0NqHTy3SRoRnkduOxwXgR65gQsq8kXY= -github.com/fangdingjun/go-log v0.0.0-20190821073628-ae332053d6dc/go.mod h1:oi7jbIScCbha6TbVzmrJP6igIHt+jcvvEgSJ7Ww1GkI= -github.com/fangdingjun/protolistener v0.0.0-20190821093313-6d5d2138f296 h1:2c6agkdoPVSyvdJ0B+5DhOb1BQpso7a7zlBxXUnttmY= -github.com/fangdingjun/protolistener v0.0.0-20190821093313-6d5d2138f296/go.mod h1:RoT81rjdN8gQ1w/z7NiFkxV6VzkT4NZ43XIt0lu8tcc= -github.com/fangdingjun/socks-go v0.0.0-20180926100003-fc6f0a9ee1f4 h1:c3Iw/znf2xe2uut9zUTueO6XHyTTLugrbN9fAE4NAkg= +github.com/fangdingjun/go-log v5.0.1+incompatible h1:c5dNQfcb1T1We3TULF3ppVVmafG6aZSZBYi2qjCXnO4= +github.com/fangdingjun/go-log/v5 v5.0.0 h1:vdh9Bk9C4ZFL6KoO6rII73zQIyaLf7hFdBvucO/ckiE= +github.com/fangdingjun/go-log/v5 v5.0.0/go.mod h1:V012Oxo0/pSbccX4OFSp9MJglXwNsZo2ByBBorr7zzM= +github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af h1:ktdWTFpcRv7TNea7+OE8gNDz2mCbFNXwxLJe7GfruQ4= +github.com/fangdingjun/protolistener v0.0.0-20200701071613-b79ebce338af/go.mod h1:WYiFoA3d+VfM47p+FHCbDdnKR7eedUmUdwd8c07XT/0= github.com/fangdingjun/socks-go v0.0.0-20180926100003-fc6f0a9ee1f4/go.mod h1:0P4kTlyyh76uY1Li3cyw4pOIKGL9RmXXWTQYFLS1ZaM= -github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= -github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc h1:lNOt1SMsgHXTdpuGw+RpnJtzUcCb/oRKZP65pBy9pr8= github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc/go.mod h1:6/gX3+E/IYGa0wMORlSMla999awQFdbaeQCHjSMKIzY= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.0 h1:DGA1KlA9esU6WcicH+P8PxFZOl15O6GYtab1cIJdOlE= -github.com/pkg/sftp v1.10.0/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pkg/sftp v1.11.0 h1:4Zv0OGbpkg4yNuUtH0s8rvoYxRCNyT29NVUo6pgPmxI= +github.com/pkg/sftp v1.11.0/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e h1:N7DeIrjYszNmSW409R3frPPwglRwMkXSBzwVbkOjLLA= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/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= diff --git a/obfscp/scp.go b/obfscp/scp.go index 0f5a0c4..002cc24 100644 --- a/obfscp/scp.go +++ b/obfscp/scp.go @@ -15,7 +15,7 @@ import ( "time" "github.com/bgentry/speakeasy" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" "github.com/fangdingjun/obfssh" "github.com/kr/fs" "github.com/pkg/sftp" diff --git a/obfssh/proxy.go b/obfssh/proxy.go index 3a06f6d..eb14645 100644 --- a/obfssh/proxy.go +++ b/obfssh/proxy.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" socks "github.com/fangdingjun/socks-go" ) diff --git a/obfssh/ssh.go b/obfssh/ssh.go index e49eb72..6c2fa2c 100644 --- a/obfssh/ssh.go +++ b/obfssh/ssh.go @@ -12,7 +12,7 @@ import ( "time" "github.com/bgentry/speakeasy" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" "github.com/fangdingjun/obfssh" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/obfsshd/config.go b/obfsshd/config.go index 5e2a434..3f45770 100644 --- a/obfsshd/config.go +++ b/obfsshd/config.go @@ -4,7 +4,7 @@ import ( "bytes" "io/ioutil" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" "github.com/go-yaml/yaml" "golang.org/x/crypto/ssh" ) diff --git a/obfsshd/server.go b/obfsshd/server.go index d552fe7..eb82858 100644 --- a/obfsshd/server.go +++ b/obfsshd/server.go @@ -12,7 +12,7 @@ import ( "os/signal" "syscall" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" "github.com/fangdingjun/obfssh" "github.com/fangdingjun/protolistener" "golang.org/x/crypto/ssh" diff --git a/server.go b/server.go index 20b0d87..5ef83ab 100644 --- a/server.go +++ b/server.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containerd/console" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" "github.com/pkg/sftp" "golang.org/x/crypto/ssh" ) diff --git a/util.go b/util.go index ab37788..f3a78ff 100644 --- a/util.go +++ b/util.go @@ -3,7 +3,7 @@ package obfssh import ( "io" - "github.com/fangdingjun/go-log" + "github.com/fangdingjun/go-log/v5" ) // PipeAndClose pipe the data between c and s, close both when done