Skip to content

Make PKCS8, PEM and SSH2 keys work #7600

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

Merged
merged 6 commits into from
Jul 25, 2019
Merged

Make PKCS8, PEM and SSH2 keys work #7600

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7907f41
Make PEM and SSH2 keys work
zeripath Jul 24, 2019
cfa1167
Merge branch 'master' into fix-PEM-encoded-SSH-key
zeripath Jul 24, 2019
5f0cedf
add ssh2 testcases and PEM cases - and fix PEM
zeripath Jul 24, 2019
689003a
Merge branch 'master' into fix-PEM-encoded-SSH-key
zeripath Jul 24, 2019
d81925a
Add final test to parse the proposed key
zeripath Jul 25, 2019
dc195d2
Merge branch 'master' into fix-PEM-encoded-SSH-key
zeripath Jul 25, 2019
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
Prev Previous commit
Next Next commit
Add final test to parse the proposed key
  • Loading branch information
@zeripath
zeripath committed Jul 25, 2019
commit d81925a041904b1a09dfb5e5799e0795fa5e04ec
5 changes: 5 additions & 0 deletions models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ func parseKeyString(content string) (string, error) {
return "", fmt.Errorf("key type and content does not match: %s - %s", keyType, t)
}
}
// Finally we need to check whether we can actually read the proposed key:
_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(keyType + " " + keyContent + " " + keyComment))
if err != nil {
return "", fmt.Errorf("invalid ssh public key: %v", err)
}
return keyType + " " + keyContent + " " + keyComment, nil
}

Expand Down