diff options
| -rw-r--r-- | models/ssh_key.go | 7 | ||||
| -rw-r--r-- | routers/user/setting/keys.go | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/models/ssh_key.go b/models/ssh_key.go index 1e1cdad404..33ba86c5bf 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -425,6 +425,9 @@ func calcFingerprintSSHKeygen(publicKeyContent string) (string, error) { defer os.Remove(tmpPath) stdout, stderr, err := process.GetManager().Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath) if err != nil { + if strings.Contains(stderr, "is not a public key file") { + return "", ErrKeyUnableVerify{stderr} + } return "", fmt.Errorf("'ssh-keygen -lf %s' failed with error '%s': %s", tmpPath, err, stderr) } else if len(stdout) < 2 { return "", errors.New("not enough output for calculating fingerprint: " + stdout) @@ -455,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 diff --git a/routers/user/setting/keys.go b/routers/user/setting/keys.go index 3475299437..73ae73da40 100644 --- a/routers/user/setting/keys.go +++ b/routers/user/setting/keys.go @@ -92,6 +92,9 @@ func KeysPost(ctx *context.Context, form auth.AddKeyForm) { ctx.Data["Err_Title"] = true ctx.RenderWithErr(ctx.Tr("settings.ssh_key_name_used"), tplSettingsKeys, &form) + case models.IsErrKeyUnableVerify(err): + ctx.Flash.Info(ctx.Tr("form.unable_verify_ssh_key")) + ctx.Redirect(setting.AppSubURL + "/user/settings/keys") default: ctx.ServerError("AddPublicKey", err) } |