fix major version check

hugefiver · Nov 24, 2021 · e1a48e9 · e1a48e9
1 parent e79b0f9
commit e1a48e9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/third/crypto/ssh/server.go b/third/crypto/ssh/server.go
@@ -256,9 +256,15 @@ func (s *connection) serverHandshake(config *ServerConfig) (*Permissions, error)
 	// precheck version string
 	var major, minor int
 	n, err := fmt.Sscanf(string(s.clientVersion), "SSH-%d.%d", &major, &minor)
-	if err != nil || n != 2 || (major != 2 && minor != 0) {
+	if err != nil || n != 2 {
 		s.sshConn.conn.Write([]byte("Invalid SSH identification string.\r\n"))
-		// s.sshConn.conn.Write([]byte("Protocol mismatch.\r\n"))
+		err := s.sshConn.Close()
+		if err == nil {
+			err = errors.New("client version format invalid")
+		}
+		return nil, err
+	} else if major != 2 && minor != 0 {
+		s.sshConn.conn.Write([]byte("Protocol major versions differ.\r\n"))
 		err := s.sshConn.Close()
 		if err == nil {
 			err = errors.New("client major version don't match")