yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat(BRIDGE-116): add command-line switches to enable/disable keychain check on macOS.

Browse Source
This commit is contained in:
Xavier Michelon
2024-08-08 10:54:11 +02:00
parent 84c0b907d7
commit 3d53bf7477
13 changed files with 355 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/keychain/helper_darwin.go
View File

@ -31,15 +31,20 @@ const (
MacOSKeychain = "macos-keychain"
)
func listHelpers() (Helpers, string) {
func listHelpers(skipKeychainTest bool) (Helpers, string) {
helpers := make(Helpers)
// MacOS always provides a keychain.
if isUsable(newMacOSHelper("")) {
if skipKeychainTest {
logrus.WithField("pkg", "keychain").Info("Skipping macOS keychain test")
helpers[MacOSKeychain] = newMacOSHelper
logrus.WithField("keychain", "MacOSKeychain").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "MacOSKeychain").Debug("Keychain is not available.")
if isUsable(newMacOSHelper("")) {
helpers[MacOSKeychain] = newMacOSHelper
logrus.WithField("keychain", "MacOSKeychain").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "MacOSKeychain").Debug("Keychain is not available.")
}
}
// Use MacOSKeychain by default.