p85947160
/
gitea
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

More debug info

This commit is contained in:
Unknwon 2014-10-11 20:34:48 -04:00
parent b7b7863364
commit fb839ca0fb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
models/publickey.go
View File

@ -108,7 +108,7 @@ var (
// CheckPublicKeyString checks if the given public key string is recognized by SSH. // CheckPublicKeyString checks if the given public key string is recognized by SSH.
func CheckPublicKeyString(content string) (bool, error) { func CheckPublicKeyString(content string) (bool, error) {
if strings.ContainsAny(content, "\n\r") { if strings.ContainsAny(content, "\n\r") {
return false, errors.New("Only a single line with a single key please") return false, errors.New("only a single line with a single key please")
} }
// write the key to a file… // write the key to a file…
@ -136,19 +136,19 @@ func CheckPublicKeyString(content string) (bool, error) {
sshKeygenOutput := strings.Split(stdout, " ") sshKeygenOutput := strings.Split(stdout, " ")
if len(sshKeygenOutput) < 4 { if len(sshKeygenOutput) < 4 {
return false, errors.New("Not enough fields returned by ssh-keygen -l -f") return false, fmt.Errorf("not enough fields returned by ssh-keygen -l -f: %v", sshKeygenOutput)
} }
// Check if key type and key size match. // Check if key type and key size match.
keySize, err := com.StrTo(sshKeygenOutput[0]).Int() keySize := com.StrTo(sshKeygenOutput[0]).MustInt()
if err != nil { if keySize == 0 {
return false, errors.New("Cannot get key size of the given key") return false, errors.New("cannot get key size of the given key")
} }
keyType := strings.TrimSpace(sshKeygenOutput[len(sshKeygenOutput)-1]) keyType := strings.TrimSpace(sshKeygenOutput[len(sshKeygenOutput)-1])
if minimumKeySize := MinimumKeySize[keyType]; minimumKeySize == 0 { if minimumKeySize := MinimumKeySize[keyType]; minimumKeySize == 0 {
return false, errors.New("Sorry, unrecognized public key type") return false, errors.New("sorry, unrecognized public key type")
} else if keySize < minimumKeySize { } else if keySize < minimumKeySize {
return false, fmt.Errorf("The minimum accepted size of a public key %s is %d", keyType, minimumKeySize) return false, fmt.Errorf("the minimum accepted size of a public key %s is %d", keyType, minimumKeySize)
} }
return true, nil return true, nil
@ -204,7 +204,7 @@ func AddPublicKey(key *PublicKey) (err error) {
if err != nil { if err != nil {
return errors.New("ssh-keygen -l -f: " + stderr) return errors.New("ssh-keygen -l -f: " + stderr)
} else if len(stdout) < 2 { } else if len(stdout) < 2 {
return errors.New("Not enough output for calculating fingerprint") return errors.New("not enough output for calculating fingerprint: " + stdout)
} }
key.Fingerprint = strings.Split(stdout, " ")[1] key.Fingerprint = strings.Split(stdout, " ")[1]