ssh: correctly ignore pre-banner lines
Reading the peer's benner in readVersion() was incorrectly counting lines sent by the server before the actual `SSH-2.0` banner against the line limit for the banner itself. This is incorrect per RFC 4253 section 4.2, where the limit of 255 characters is written to apply only to the `SSH-` banner string itself. This instead limits pre-banner lines to 255 characters each but instead allows a maximum of 1024 lines. Change-Id: Ief014bb3413e26e8d2077d3eb204ceaea9dc9444 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/811320 LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Nicola Murino <nicola.murino@gmail.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Carlos Amedee <carlos@golang.org>
This commit is contained in:
committed by
Gopher Robot
parent
46efc8bc62
commit
593c81af8a
+16
-4
@@ -35,11 +35,15 @@ func TestReadVersion(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestReadVersionError(t *testing.T) {
|
||||
longVersion := strings.Repeat("SSH-2.0-bla", 50)[:253]
|
||||
multiLineVersion := strings.Repeat("ignored\r\n", 50) + "SSH-2.0-bla\r\n"
|
||||
tooLongVersion := strings.Repeat("SSH-2.0-bla", 60) + "\r\n"
|
||||
multiLine := strings.Repeat("ignored\r\n", 50)
|
||||
tooManyLines := strings.Repeat("ignored\r\n", 2000)
|
||||
tooLongLine := strings.Repeat("blah ", 100) + "\r\n"
|
||||
cases := []string{
|
||||
longVersion + "too-long\r\n",
|
||||
multiLineVersion,
|
||||
tooLongVersion,
|
||||
multiLine + tooLongVersion,
|
||||
tooManyLines + "SSH-2.0-bla\r\n",
|
||||
tooLongLine + "SSH-2.0-bla\r\n",
|
||||
}
|
||||
for _, in := range cases {
|
||||
if _, err := readVersion(bytes.NewBufferString(in)); err == nil {
|
||||
@@ -48,6 +52,14 @@ func TestReadVersionError(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIgnorePreVersion(t *testing.T) {
|
||||
longishLine := strings.Repeat("blah ", 30) + "\r\n"
|
||||
multiLineVersion := strings.Repeat(longishLine, 100) + "SSH-2.0-bla\r\n"
|
||||
if _, err := readVersion(bytes.NewBufferString(multiLineVersion)); err != nil {
|
||||
t.Errorf("readVersion() got error %v, expected success", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestExchangeVersionsBasic(t *testing.T) {
|
||||
v := "SSH-2.0-bla"
|
||||
buf := bytes.NewBufferString(v + "\r\n")
|
||||
|
||||
Reference in New Issue
Block a user