crypto/x509: fix getting user home dir on darwin

As pointed out in #26463, HOME (or equivalent) environment variable (rather than the value obtained by parsing /etc/passwd or the like) should be used to obtain user's home directory. Since commit fa1a49a there's a method to obtain user's home directory -- use it here. Change-Id: I852fbb24249bcfe08f3874fae6e7b9d01d869190 Reviewed-on: https://go-review.googlesource.com/c/139426 Reviewed-by: Brad Fitzpatrick <[email protected]> Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
golang · Oct 4, 2018 · 2f1ef6b · 2f1ef6b
1 parent c6483b6
commit 2f1ef6b
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
@@ -16,7 +16,6 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"os/user"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -67,17 +66,17 @@ func execSecurityRoots() (*CertPool, error) {
 		"/Library/Keychains/System.keychain",
 	}
 
-	u, err := user.Current()
-	if err != nil {
+	home := os.UserHomeDir()
+	if home == "" {
 		if debugExecDarwinRoots {
-			println(fmt.Sprintf("crypto/x509: get current user: %v", err))
+			println("crypto/x509: can't get user home directory")
 		}
 	} else {
 		args = append(args,
-			filepath.Join(u.HomeDir, "/Library/Keychains/login.keychain"),
+			filepath.Join(home, "/Library/Keychains/login.keychain"),
 
 			// Fresh installs of Sierra use a slightly different path for the login keychain
-			filepath.Join(u.HomeDir, "/Library/Keychains/login.keychain-db"),
+			filepath.Join(home, "/Library/Keychains/login.keychain-db"),
 		)
 	}