qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 02:44:50 -07:00
Code Releases Activity

crypto/x509: fix getting user home dir on darwin

Browse Source 
As pointed out in https://github.com/golang/go/issues/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 fa1a49aa55 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 <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Kir Kolyshkin 2018-10-03 18:41:18 -07:00 committed by Brad Fitzpatrick
parent c6483b61a9
commit 2f1ef6be00
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/crypto/x509/root_darwin.go
View File

@ -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"),
)
}