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

Jump to bottom

Use ErrKeyUnableToVerify if fail to calc fingerprint in ssh-keygen #10863

Merged
merged 4 commits into from
Mar 28, 2020
Merged

Use ErrKeyUnableToVerify if fail to calc fingerprint in ssh-keygen #10863

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01f64eb
Use ErrKeyUnableToVerify if fail to calc fingerprint in ssh-keygen
zeripath Mar 28, 2020
b5d799f
Merge branch 'master' into fix-3985
zeripath Mar 28, 2020
b986168
Pass up the unable to verify
zeripath Mar 28, 2020
e351ba2
Merge branch 'fix-3985' of github.com:zeripath/gitea into fix-3985
zeripath Mar 28, 2020
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
Pass up the unable to verify
  • Loading branch information
@zeripath
zeripath committed Mar 28, 2020
commit b9861685591e96aed9aa4a0a1e23f6f53090069b
4 changes: 4 additions & 0 deletions models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@ func calcFingerprint(publicKeyContent string) (string, error) {
fp, err = calcFingerprintSSHKeygen(publicKeyContent)
}
if err != nil {
if IsErrKeyUnableVerify(err) {
log.Info("%s", publicKeyContent)
return "", err
}
return "", fmt.Errorf("%s: %v", fnName, err)
}
return fp, nil
Expand Down