From 41a904de57b3277ddd638ac6d8f723c7115ceac9 Mon Sep 17 00:00:00 2001 From: Junn Date: Fri, 17 Feb 2023 11:43:58 +1000 Subject: [PATCH 1/7] fix(ssh): test --- ssh/client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ssh/client.go b/ssh/client.go index bdc356cbdf..207e6ef54e 100644 --- a/ssh/client.go +++ b/ssh/client.go @@ -16,6 +16,7 @@ import ( // Client implements a traditional SSH client that supports shells, // subprocesses, TCP port/streamlocal forwarding and tunneled dialing. +// test type Client struct { Conn From c5155627b86038c7ff7a1d1ad7353fc1bd2376c0 Mon Sep 17 00:00:00 2001 From: Junn Date: Fri, 17 Feb 2023 12:27:18 +1000 Subject: [PATCH 2/7] fix(ssh): test fork --- ssh/client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ssh/client.go b/ssh/client.go index bdc356cbdf..c13a53930d 100644 --- a/ssh/client.go +++ b/ssh/client.go @@ -174,6 +174,7 @@ func (c *Client) handleChannelOpens(in <-chan NewChannel) { // to incoming channels and requests, use net.Dial with NewClientConn // instead. func Dial(network, addr string, config *ClientConfig) (*Client, error) { + fmt.Printf("TESTING ASSETNOTE FORK 123 --------------") conn, err := net.DialTimeout(network, addr, config.Timeout) if err != nil { return nil, err From 4f0e15f5e6eff65cf7412c59baaea531284e30b6 Mon Sep 17 00:00:00 2001 From: Shubham Shah Date: Mon, 20 Feb 2023 16:17:44 +1000 Subject: [PATCH 3/7] feat(ssh): print auth methods --- ssh/client.go | 1 - ssh/client_auth.go | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh/client.go b/ssh/client.go index abb541cd35..207e6ef54e 100644 --- a/ssh/client.go +++ b/ssh/client.go @@ -175,7 +175,6 @@ func (c *Client) handleChannelOpens(in <-chan NewChannel) { // to incoming channels and requests, use net.Dial with NewClientConn // instead. func Dial(network, addr string, config *ClientConfig) (*Client, error) { - fmt.Printf("TESTING ASSETNOTE FORK 123 --------------") conn, err := net.DialTimeout(network, addr, config.Timeout) if err != nil { return nil, err diff --git a/ssh/client_auth.go b/ssh/client_auth.go index 409b5ea1d4..4203d4ce71 100644 --- a/ssh/client_auth.go +++ b/ssh/client_auth.go @@ -70,6 +70,7 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error { sessionID := c.transport.getSessionID() for auth := AuthMethod(new(noneAuth)); auth != nil; { ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand, extensions) + fmt.Printf("methods: %v", methods) if err != nil { return err } From 1bfa248a79ee3e492721331ba91d25ac8bb547b0 Mon Sep 17 00:00:00 2001 From: Shubham Shah Date: Mon, 20 Feb 2023 16:25:12 +1000 Subject: [PATCH 4/7] feat(ssh): print auth methods --- ssh/client_auth.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ssh/client_auth.go b/ssh/client_auth.go index 4203d4ce71..7e8ecf1fbf 100644 --- a/ssh/client_auth.go +++ b/ssh/client_auth.go @@ -70,7 +70,11 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error { sessionID := c.transport.getSessionID() for auth := AuthMethod(new(noneAuth)); auth != nil; { ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand, extensions) - fmt.Printf("methods: %v", methods) + for _, meth := range methods { + if strings.ToLower(meth) == "password" { + fmt.Println("password authentication enabled on this server") + } + } if err != nil { return err } From 711faa579ce24966de9f7b67de974329111242d7 Mon Sep 17 00:00:00 2001 From: Shubham Shah Date: Mon, 20 Feb 2023 16:25:36 +1000 Subject: [PATCH 5/7] feat(ssh): print auth methods --- ssh/client_auth.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ssh/client_auth.go b/ssh/client_auth.go index 7e8ecf1fbf..e57872da43 100644 --- a/ssh/client_auth.go +++ b/ssh/client_auth.go @@ -70,6 +70,7 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error { sessionID := c.transport.getSessionID() for auth := AuthMethod(new(noneAuth)); auth != nil; { ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand, extensions) + fmt.Printf("methods available: %v\n", methods) for _, meth := range methods { if strings.ToLower(meth) == "password" { fmt.Println("password authentication enabled on this server") From 33b7cde698799a0c0da27579ddb45b4a614c19fa Mon Sep 17 00:00:00 2001 From: Shubham Shah Date: Tue, 21 Feb 2023 09:40:08 +1000 Subject: [PATCH 6/7] feat(ssh): print auth methods --- ssh/client_auth.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ssh/client_auth.go b/ssh/client_auth.go index e57872da43..adc9adc8e6 100644 --- a/ssh/client_auth.go +++ b/ssh/client_auth.go @@ -66,16 +66,11 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error { // then any untried methods suggested by the server. var tried []string var lastMethods []string - + var retMethods []string sessionID := c.transport.getSessionID() for auth := AuthMethod(new(noneAuth)); auth != nil; { ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand, extensions) - fmt.Printf("methods available: %v\n", methods) - for _, meth := range methods { - if strings.ToLower(meth) == "password" { - fmt.Println("password authentication enabled on this server") - } - } + retMethods = append(retMethods, methods...) if err != nil { return err } @@ -108,6 +103,13 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error { } } } + + for _, meth := range retMethods { + if strings.ToLower(meth) == "password" { + return fmt.Errorf("password authentication enabled: methods %v", retMethods) + } + } + return fmt.Errorf("ssh: unable to authenticate, attempted methods %v, no supported methods remain", tried) } From 71c0593a1ddc18f11b89006d0909fcbdd39cdc0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Feb 2024 02:04:24 +0000 Subject: [PATCH 7/7] build(deps): bump the go_modules group across 2 directories with 1 update Bumps the go_modules group with 1 update in the /. directory: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.6.0 to 0.17.0 - [Commits](https://github.com/golang/net/compare/v0.6.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production dependency-group: go_modules-security-group ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index b114192f15..d47d4bd65a 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module golang.org/x/crypto go 1.17 require ( - golang.org/x/net v0.6.0 - golang.org/x/sys v0.5.0 - golang.org/x/term v0.5.0 + golang.org/x/net v0.17.0 + golang.org/x/sys v0.13.0 + golang.org/x/term v0.13.0 ) -require golang.org/x/text v0.7.0 // indirect +require golang.org/x/text v0.13.0 // indirect diff --git a/go.sum b/go.sum index 2108b4eb59..961566a75d 100644 --- a/go.sum +++ b/go.sum @@ -1,31 +1,43 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=