summaryrefslogtreecommitdiffhomepage
path: root/tempfork
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2022-04-18 18:25:19 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2022-04-18 18:25:19 -0700
commit8b62f7beb88bd36d45f1f417f3c8fcba47cea944 (patch)
tree8a593307470c657a3547d6055574fef717542dab /tempfork
parent91a187bf87e264618c0708953ecaa3cdd0236b70 (diff)
downloadtailscale-bradfitz/ssh_banner.tar.xz
tailscale-bradfitz/ssh_banner.zip
ssh/tailssh: start moving auth checks earlier, adding bannerbradfitz/ssh_banner
Updates #3802 Change-Id: I243952f10f439387dc56b01d03b13657ddf25069 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'tempfork')
-rw-r--r--tempfork/gliderlabs/ssh/server.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/tempfork/gliderlabs/ssh/server.go b/tempfork/gliderlabs/ssh/server.go
index c9372c43c..934139e2c 100644
--- a/tempfork/gliderlabs/ssh/server.go
+++ b/tempfork/gliderlabs/ssh/server.go
@@ -38,8 +38,6 @@ type Server struct {
HostSigners []Signer // private keys for the host key, must have at least one
Version string // server version to be sent before the initial handshake
- NoClientAuthCallback func(gossh.ConnMetadata) (*gossh.Permissions, error)
-
KeyboardInteractiveHandler KeyboardInteractiveHandler // keyboard-interactive authentication handler
PasswordHandler PasswordHandler // password authentication handler
PublicKeyHandler PublicKeyHandler // public key authentication handler
@@ -131,10 +129,6 @@ func (srv *Server) config(ctx Context) *gossh.ServerConfig {
if srv.PasswordHandler == nil && srv.PublicKeyHandler == nil && srv.KeyboardInteractiveHandler == nil {
config.NoClientAuth = true
}
- if srv.NoClientAuthCallback != nil {
- config.NoClientAuth = true
- config.NoClientAuthCallback = srv.NoClientAuthCallback
- }
if srv.Version != "" {
config.ServerVersion = "SSH-2.0-" + srv.Version
}