ssh: return ServerAuthError after too many auth failures
if a client is disconnected due to too many authentication attempts we should return a ServerAuthError instead of a generic error. Some users check the error returned by NewServerConn to determine whether or not a client attempted to authenticate. Fixes golang/go#69191 Change-Id: If68fcecdefd6c810fe9df8256b1216e320d8a916 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/566398 Reviewed-by: Filippo Valsorda <filippo@golang.org> Reviewed-by: Tim King <taking@google.com> Auto-Submit: Nicola Murino <nicola.murino@gmail.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Carlos Amedee <carlos@golang.org>
This commit is contained in:
committed by
Gopher Robot
parent
9e92970a1e
commit
42ee18b963
+18
-7
@@ -641,17 +641,28 @@ func TestClientAuthMaxAuthTries(t *testing.T) {
|
|||||||
defer c1.Close()
|
defer c1.Close()
|
||||||
defer c2.Close()
|
defer c2.Close()
|
||||||
|
|
||||||
go newServer(c1, serverConfig)
|
errCh := make(chan error, 1)
|
||||||
_, _, _, err = NewClientConn(c2, "", clientConfig)
|
|
||||||
if tries > 2 {
|
go func() {
|
||||||
if err == nil {
|
_, err := newServer(c1, serverConfig)
|
||||||
|
errCh <- err
|
||||||
|
}()
|
||||||
|
_, _, _, cliErr := NewClientConn(c2, "", clientConfig)
|
||||||
|
srvErr := <-errCh
|
||||||
|
|
||||||
|
if tries > serverConfig.MaxAuthTries {
|
||||||
|
if cliErr == nil {
|
||||||
t.Fatalf("client: got no error, want %s", expectedErr)
|
t.Fatalf("client: got no error, want %s", expectedErr)
|
||||||
} else if err.Error() != expectedErr.Error() {
|
} else if cliErr.Error() != expectedErr.Error() {
|
||||||
t.Fatalf("client: got %s, want %s", err, expectedErr)
|
t.Fatalf("client: got %s, want %s", err, expectedErr)
|
||||||
}
|
}
|
||||||
|
var authErr *ServerAuthError
|
||||||
|
if !errors.As(srvErr, &authErr) {
|
||||||
|
t.Errorf("expected ServerAuthError, got: %v", srvErr)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if err != nil {
|
if cliErr != nil {
|
||||||
t.Fatalf("client: got %s, want no error", err)
|
t.Fatalf("client: got %s, want no error", cliErr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -510,8 +510,8 @@ userAuthLoop:
|
|||||||
if err := s.transport.writePacket(Marshal(discMsg)); err != nil {
|
if err := s.transport.writePacket(Marshal(discMsg)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
authErrs = append(authErrs, discMsg)
|
||||||
return nil, discMsg
|
return nil, &ServerAuthError{Errors: authErrs}
|
||||||
}
|
}
|
||||||
|
|
||||||
var userAuthReq userAuthRequestMsg
|
var userAuthReq userAuthRequestMsg
|
||||||
|
|||||||
Reference in New Issue
Block a user