Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ssh/knownhosts: fix hashed hostname component count in error message #287

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −5
Open

ssh/knownhosts: fix hashed hostname component count in error message #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ssh/knownhosts/knownhosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,17 +481,17 @@ func decodeHash(encoded string) (hashType string, salt, hash []byte, err error)
err = errors.New("knownhosts: hashed host must start with '|'")
return
}
components := strings.Split(encoded, "|")
if len(components) != 4 {
components := strings.Split(encoded[1:], "|")
if len(components) != 3 {
err = fmt.Errorf("knownhosts: got %d components, want 3", len(components))
return
}

hashType = components[1]
if salt, err = base64.StdEncoding.DecodeString(components[2]); err != nil {
hashType = components[0]
if salt, err = base64.StdEncoding.DecodeString(components[1]); err != nil {
return
}
if hash, err = base64.StdEncoding.DecodeString(components[3]); err != nil {
if hash, err = base64.StdEncoding.DecodeString(components[2]); err != nil {
return
}
return
Expand Down
15 changes: 15 additions & 0 deletions ssh/knownhosts/knownhosts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"net"
"reflect"
"strings"
"testing"

"golang.org/x/crypto/ssh"
Expand Down Expand Up @@ -292,13 +293,27 @@ const encodedTestHostnameHash = "|1|IHXZvQMvTcZTUU29+2vXFgx8Frs=|UGccIWfRVDwilMB

func TestHostHash(t *testing.T) {
testHostHash(t, testHostname, encodedTestHostnameHash)
testHostHashDecode(t)
}

func TestHashList(t *testing.T) {
encoded := HashHostname(testHostname)
testHostHash(t, testHostname, encoded)
}

func testHostHashDecode(t *testing.T) {
for in, want := range map[string]string{
"1": "must start with '|'",
"|typ|salt": "got 2 components",
"|typ|salt|hash|extra": "got 4 components",
} {
_, _, _, err := decodeHash(in)
if err == nil || !strings.Contains(err.Error(), want) {
t.Fatalf("decodeHash: expected error to match %q, got %v", want, err)
}
}
}

func testHostHash(t *testing.T, hostname, encoded string) {
typ, salt, hash, err := decodeHash(encoded)
if err != nil {
Expand Down