Supply default KeygenPath in SSH key parser

yogo1212 · yogo1212 · commit bfdf35cf55da · 2023-04-10T21:26:13.000+02:00
This allows the parser to be used even if it's not configured (useful for automatic tests).

Signed-off-by: Leon M. Busch-George &lt;leon@georgemail.eu&gt;
diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go
@@ -285,7 +285,12 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {
 		}
 	}()
 
-	stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", setting.SSH.KeygenPath, "-lf", tmpName)
+	keygenPath := setting.SSH.KeygenPath
+	if len(keygenPath) == 0 {
+		keygenPath = "ssh-keygen"
+	}
+
+	stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", keygenPath, "-lf", tmpName)
 	if err != nil {
 		return "", 0, fmt.Errorf("fail to parse public key: %s - %s", err, stderr)
 	}

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,12 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {`
`285`	`285`	`}`
`286`	`286`	`}()`
`287`	`287`
`288`		`- stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", setting.SSH.KeygenPath, "-lf", tmpName)`
	`288`	`+ keygenPath := setting.SSH.KeygenPath`
	`289`	`+ if len(keygenPath) == 0 {`
	`290`	`+ keygenPath = "ssh-keygen"`
	`291`	`+ }`
	`292`	`+`
	`293`	`+ stdout, stderr, err := process.GetManager().Exec("SSHKeyGenParsePublicKey", keygenPath, "-lf", tmpName)`
`289`	`294`	`if err != nil {`
`290`	`295`	`return "", 0, fmt.Errorf("fail to parse public key: %s - %s", err, stderr)`
`291`	`296`	`}`