updated keybase/go-keychain

99designs · Jan 17, 2020 · fc8746d · fc8746d
1 parent 90a8c37
commit fc8746d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 35 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c
-	github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d
+	github.com/keybase/go-keychain v0.0.0-20191220220820-f65a47cbe0b1
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/stretchr/objx v0.2.0 // indirect

diff --git a/go.sum b/go.sum
@@ -10,8 +10,8 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
-github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM=
-github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc=
+github.com/keybase/go-keychain v0.0.0-20191220220820-f65a47cbe0b1 h1:Lk38J60jgB05LTkSEElUXe49VEzWMNrPyPFf2vhKM1k=
+github.com/keybase/go-keychain v0.0.0-20191220220820-f65a47cbe0b1/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

diff --git a/keychain.go b/keychain.go
@@ -17,7 +17,6 @@ type keychain struct {
 
 	isSynchronizable         bool
 	isAccessibleWhenUnlocked bool
-	isTrusted                bool
 }
 
 func init() {
@@ -34,9 +33,6 @@ func init() {
 		if cfg.KeychainName != "" {
 			kc.path = cfg.KeychainName + ".keychain"
 		}
-		if cfg.KeychainTrustApplication {
-			kc.isTrusted = true
-		}
 		return kc, nil
 	})
 }
@@ -144,23 +140,7 @@ func (k *keychain) Set(item Item) error {
 		kcItem.SetAccessible(gokeychain.AccessibleWhenUnlocked)
 	}
 
-	isTrusted := k.isTrusted && !item.KeychainNotTrustApplication
-
-	if isTrusted {
-		debugf("Keychain item trusts keyring")
-		kcItem.SetAccess(&gokeychain.Access{
-			Label:               item.Label,
-			TrustedApplications: nil,
-		})
-	} else {
-		debugf("Keychain item doesn't trust keyring")
-		kcItem.SetAccess(&gokeychain.Access{
-			Label:               item.Label,
-			TrustedApplications: []string{},
-		})
-	}
-
-	debugf("Adding service=%q, label=%q, account=%q, trusted=%v to osx keychain %q", k.service, item.Label, item.Key, isTrusted, k.path)
+	debugf("Adding service=%q, label=%q, account=%q, trusted=%v to osx keychain %q", k.service, item.Label, item.Key, k.path)
 
 	if err := gokeychain.AddItem(kcItem); err == gokeychain.ErrorDuplicateItem {
 		debugf("Item already exists, updating")
@@ -183,9 +163,6 @@ func (k *keychain) Set(item Item) error {
 			return errors.New("no results")
 		}
 
-		// Don't call SetAccess() as this will cause multiple prompts on update, even when we are not updating the AccessList
-		kcItem.SetAccess(nil)
-
 		if err := gokeychain.UpdateItem(queryItem, kcItem); err != nil {
 			return fmt.Errorf("Failed to update item in keychain: %v", err)
 		}

diff --git a/keychain_test.go b/keychain_test.go
@@ -19,7 +19,6 @@ func TestOSXKeychainKeyringSet(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 
 	item := Item{
@@ -59,7 +58,6 @@ func TestOSXKeychainKeyringOverwrite(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 
 	item1 := Item{
@@ -111,7 +109,6 @@ func TestOSXKeychainKeyringListKeysWhenEmpty(t *testing.T) {
 		path:         path,
 		service:      "test",
 		passwordFunc: fixedStringPrompt("test password"),
-		isTrusted:    true,
 	}
 
 	keys, err := k.Keys()
@@ -131,7 +128,6 @@ func TestOSXKeychainKeyringListKeysWhenNotEmpty(t *testing.T) {
 		path:         path,
 		service:      "test",
 		passwordFunc: fixedStringPrompt("test password"),
-		isTrusted:    true,
 	}
 
 	keys := []string{"key1", "key2", "key3"}
@@ -177,7 +173,6 @@ func TestOSXKeychainGetKeyWhenEmpty(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 
 	_, err := k.Get("no-such-key")
@@ -194,7 +189,6 @@ func TestOSXKeychainGetKeyWhenNotEmpty(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 	item := Item{
 		Key:         "llamas",
@@ -224,7 +218,6 @@ func TestOSXKeychainRemoveKeyWhenEmpty(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 
 	err := k.Remove("no-such-key")
@@ -241,7 +234,6 @@ func TestOSXKeychainRemoveKeyWhenNotEmpty(t *testing.T) {
 		path:         path,
 		passwordFunc: fixedStringPrompt("test password"),
 		service:      "test",
-		isTrusted:    true,
 	}
 	item := Item{
 		Key:         "llamas",