personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-11-08 22:23:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

move to golang.org/x/term (#1372)
Some checks failed
gofmt / Run gofmt (push) Successful in 35s
Details
smoke-extra / Run extra smoke tests (push) Failing after 20s
Details
smoke / Run multi node smoke test (push) Failing after 1m28s
Details
Build and test / Build all and test on ubuntu-linux (push) Failing after 19m52s
Details
Build and test / Build and test on linux with boringcrypto (push) Failing after 2m34s
Details
Build and test / Build and test on linux with pkcs11 (push) Failing after 2m44s
Details
Build and test / Build and test on macos-latest (push) Has been cancelled
Details
Build and test / Build and test on windows-latest (push) Has been cancelled
Details

Browse Source 
The `golang.org/x/crypto/ssh/terminal` was deprecated and moved to
`golang.org/x/term`. We already use the new package in
`cmd/nebula-cert`, so fix our remaining reference here.

See:

- https://github.com/golang/go/issues/31044
This commit is contained in:
Wade Simmons 2025-04-02 09:11:34 -04:00 committed by GitHub
parent e2d6f4e444
commit f5d096dd2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshd/session.go
View File

@ -9,13 +9,13 @@ import (
"github.com/armon/go-radix" "github.com/armon/go-radix"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/term"
) )
type session struct { type session struct {
l *logrus.Entry l *logrus.Entry
c *ssh.ServerConn c *ssh.ServerConn
term *terminal.Terminal term *term.Terminal
commands *radix.Tree commands *radix.Tree
exitChan chan bool exitChan chan bool
} }
@ -106,8 +106,8 @@ func (s *session) handleRequests(in <-chan *ssh.Request, channel ssh.Channel) {
} }
} }
func (s *session) createTerm(channel ssh.Channel) *terminal.Terminal { func (s *session) createTerm(channel ssh.Channel) *term.Terminal {
term := terminal.NewTerminal(channel, s.c.User()+"@nebula > ") term := term.NewTerminal(channel, s.c.User()+"@nebula > ")
term.AutoCompleteCallback = func(line string, pos int, key rune) (newLine string, newPos int, ok bool) { term.AutoCompleteCallback = func(line string, pos int, key rune) (newLine string, newPos int, ok bool) {
// key 9 is tab // key 9 is tab
if key == 9 { if key == 9 {