Skip to content

Commit 443b8cb

Browse files
committed
ssh: relax RSA signature check in SSH_MSG_USERAUTH_REQUEST
Buggy SSH clients, such as gpg-agent v2.2.4 and OpenSSH v7.6 shipped in Ubuntu 18.04, may send `ssh-rsa-512` as the public key algorithm but actually include an `rsa-sha` signature. If RFC 3808 (extension negotiation) is implemented, these clients will fail to authenticate with the error: ``` ssh: signature "ssh-rsa" came in for selected algorithm "rsa-sha2-512", public key is type ssh-rsa ``` According to RFC 8332 section 3.2: If the client includes the signature field, the client MUST encode the same algorithm name in the signature as in SSH_MSG_USERAUTH_REQUEST -- either "rsa-sha2-256" or "rsa-sha2-512". If a server receives a mismatching request, it MAY apply arbitrary authentication penalties, including but not limited to authentication failure or disconnect. ...A server MAY, but is not required to, accept this variant or another variant that corresponds to a good-faith implementation and is considered safe to accept. While the client is expected to do the right thing, in practice older clients may not fully support `ssh-rsa-256` and `ssh-rsa-512`. For example, gpg-agent v2.2.6 added support for these newer signature types. To accomodate these clients, relax the matching constraint: if the `SSH_MSG_USERAUTH_REQUEST` message specifies an RSA public key algorithm and includes an RSA public key, then allow any of the following signature types: - `rsa-sha-512` - `rsa-sha-256` - `rsa-sha` This emulates what OpenSSH does. OpenSSH only considers that the RSA family is specified and then verifies if the signature and public key match. Closes golang/go#53391
1 parent 793ad66 commit 443b8cb

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed

ssh/server.go

+23-1
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,28 @@ func (l ServerAuthError) Error() string {
396396
// It is returned in ServerAuthError.Errors from NewServerConn.
397397
var ErrNoAuth = errors.New("ssh: no auth passed yet")
398398

399+
func isRSAType(algo string) bool {
400+
return algo == KeyAlgoRSASHA512 || algo == KeyAlgoRSASHA256 || algo == KeyAlgoRSA
401+
}
402+
403+
func algoCompatible(algo string, publicKey PublicKey, sig *Signature) bool {
404+
if underlyingAlgo(algo) == sig.Format {
405+
return true
406+
}
407+
408+
// Buggy SSH clients may send ssh-rsa2-512 as the public key algorithm but
409+
// actually include a rsa-sha signature.
410+
// According to RFC 8832 Section 3.2:
411+
// A server MAY, but is not required to, accept this variant or another variant that
412+
// corresponds to a good-faith implementation and is considered safe to
413+
// accept.
414+
if publicKey.Type() == KeyAlgoRSA && isRSAType(algo) && isRSAType(sig.Format) {
415+
return true
416+
}
417+
418+
return false
419+
}
420+
399421
func (s *connection) serverAuthenticate(config *ServerConfig) (*Permissions, error) {
400422
sessionID := s.transport.getSessionID()
401423
var cache pubKeyCache
@@ -564,7 +586,7 @@ userAuthLoop:
564586
authErr = fmt.Errorf("ssh: algorithm %q not accepted", sig.Format)
565587
break
566588
}
567-
if underlyingAlgo(algo) != sig.Format {
589+
if !algoCompatible(algo, pubKey, sig) {
568590
authErr = fmt.Errorf("ssh: signature %q not compatible with selected algorithm %q", sig.Format, algo)
569591
break
570592
}

0 commit comments

Comments
 (0)