Merge remote-tracking branch 'upstream/master' into ptysess

Author: caarlos0

circle.yml

@@ -9,9 +9,9 @@ jobs:
     - run: go get
     - run: go test -v -race
 
-  build-go-1.13:
+  build-go-1.17:
     docker:
-    - image: golang:1.13
+    - image: golang:1.17
     working_directory: /go/src/github.com/gliderlabs/ssh
     steps:
     - checkout
@@ -23,4 +23,4 @@ workflows:
   build:
     jobs:
       - build-go-latest
-      - build-go-1.13
+      - build-go-1.17

context.go

@@ -95,6 +95,9 @@ type Context interface {
 type sshContext struct {
 	ctx context.Context
 	mtx *sync.RWMutex
+
+	values   map[interface{}]interface{}
+	valuesMu sync.Mutex
 }
 
 var _ context.Context = &sshContext{}
@@ -103,7 +106,11 @@ var _ sync.Locker = &sshContext{}
 
 func newContext(srv *Server) (*sshContext, context.CancelFunc) {
 	innerCtx, cancel := context.WithCancel(context.Background())
-	ctx := &sshContext{innerCtx, &sync.RWMutex{}}
+	ctx := &sshContext{
+		ctx:    innerCtx,
+		mtx:    &sync.RWMutex{},
+		values: make(map[interface{}]interface{}),
+	}
 	ctx.SetValue(ContextKeyServer, srv)
 	perms := &Permissions{&gossh.Permissions{}}
 	ctx.SetValue(ContextKeyPermissions, perms)
@@ -124,18 +131,21 @@ func applyConnMetadata(ctx Context, conn gossh.ConnMetadata) {
 	ctx.SetValue(ContextKeyRemoteAddr, conn.RemoteAddr())
 }
 
-func (ctx *sshContext) SetValue(key, value interface{}) {
-	ctx.mtx.Lock()
-	defer ctx.mtx.Unlock()
-	ctx.ctx = context.WithValue(ctx.ctx, key, value)
-}
-
 func (ctx *sshContext) Value(key interface{}) interface{} {
-	ctx.mtx.RLock()
-	defer ctx.mtx.RUnlock()
+	ctx.valuesMu.Lock()
+	defer ctx.valuesMu.Unlock()
+	if v, ok := ctx.values[key]; ok {
+		return v
+	}
 	return ctx.ctx.Value(key)
 }
 
+func (ctx *sshContext) SetValue(key, value interface{}) {
+	ctx.valuesMu.Lock()
+	defer ctx.valuesMu.Unlock()
+	ctx.values[key] = value
+}
+
 func (ctx *sshContext) Done() <-chan struct{} {
 	ctx.mtx.RLock()
 	defer ctx.mtx.RUnlock()

go.mod

@@ -1,9 +1,15 @@
 module github.com/charmbracelet/ssh
 
-go 1.12
+go 1.17
 
 require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
 	github.com/aymanbagabas/go-pty v0.2.1
-	golang.org/x/crypto v0.16.0
+	golang.org/x/crypto v0.17.0
+)
+
+require (
+	github.com/creack/pty v1.1.15 // indirect
+	github.com/u-root/u-root v0.11.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 )

go.sum

@@ -224,8 +224,9 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=

server.go

@@ -37,6 +37,7 @@ type Server struct {
 	Handler     Handler  // handler to invoke, ssh.DefaultHandler if nil
 	HostSigners []Signer // private keys for the host key, must have at least one
 	Version     string   // server version to be sent before the initial handshake
+	Banner      string   // server banner
 
 	KeyboardInteractiveHandler    KeyboardInteractiveHandler    // keyboard-interactive authentication handler
 	PasswordHandler               PasswordHandler               // password authentication handler
@@ -132,6 +133,11 @@ func (srv *Server) config(ctx Context) *gossh.ServerConfig {
 	if srv.Version != "" {
 		config.ServerVersion = "SSH-2.0-" + srv.Version
 	}
+	if srv.Banner != "" {
+		config.BannerCallback = func(conn gossh.ConnMetadata) string {
+			return srv.Banner
+		}
+	}
 	if srv.PasswordHandler != nil {
 		config.PasswordCallback = func(conn gossh.ConnMetadata, password []byte) (*gossh.Permissions, error) {
 			applyConnMetadata(ctx, conn)