Delete Public SSH Key tmp file after calculating fingerprint (#1855)

dnmgns · lunny · commit ff7424179eca · 2017-06-08T10:08:22.000+08:00
* Delete public key tmp file after calculating fingerprint

Signed-off-by: Magnus Lindvall &lt;magnus@dnmgns.com&gt;

* Move line

Signed-off-by: Magnus Lindvall &lt;magnus@dnmgns.com&gt;

* Remove defer statement

Signed-off-by: Magnus Lindvall &lt;magnus@dnmgns.com&gt;

* Readd defer statement and move remove

Signed-off-by: Magnus Lindvall &lt;magnus@dnmgns.com&gt;

* Delete space

Signed-off-by: Magnus Lindvall &lt;magnus@dnmgns.com&gt;
diff --git a/models/ssh_key.go b/models/ssh_key.go
@@ -376,6 +376,7 @@ func calcFingerprint(publicKeyContent string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer os.Remove(tmpPath)
 	stdout, stderr, err := process.GetManager().Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath)
 	if err != nil {
 		return "", fmt.Errorf("'ssh-keygen -lf %s' failed with error '%s': %s", tmpPath, err, stderr)

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ func calcFingerprint(publicKeyContent string) (string, error) {`
`376`	`376`	`if err != nil {`
`377`	`377`	`return "", err`
`378`	`378`	`}`
	`379`	`+ defer os.Remove(tmpPath)`
`379`	`380`	`stdout, stderr, err := process.GetManager().Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath)`
`380`	`381`	`if err != nil {`
`381`	`382`	`return "", fmt.Errorf("'ssh-keygen -lf %s' failed with error '%s': %s", tmpPath, err, stderr)`