Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Get better logging arround keychain list initialisation.

Browse Source
This commit is contained in:
Romain LE JEUNE
2023-12-14 16:41:00 +01:00
parent 5c69af4418
commit 8f5bd37aee
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/keychain/helper_darwin.go
View File

@ -37,8 +37,9 @@ func listHelpers() (Helpers, string) {
// MacOS always provides a keychain.
if isUsable(newMacOSHelper("")) {
helpers[MacOSKeychain] = newMacOSHelper
logrus.WithField("keychain", "MacOSKeychain").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "MacOSKeychain").Warn("Keychain is not available.")
logrus.WithField("keychain", "MacOSKeychain").Debug("Keychain is not available.")
}
// Use MacOSKeychain by default.

9
pkg/keychain/helper_linux.go
View File

@ -36,20 +36,23 @@ func listHelpers() (Helpers, string) {
if isUsable(newDBusHelper("")) {
helpers[SecretServiceDBus] = newDBusHelper
logrus.WithField("keychain", "SecretServiceDBus").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "SecretServiceDBus").Warn("Keychain is not available.")
logrus.WithField("keychain", "SecretServiceDBus").Debug("Keychain is not available.")
}
if _, err := execabs.LookPath("gnome-keyring"); err == nil && isUsable(newSecretServiceHelper("")) {
helpers[SecretService] = newSecretServiceHelper
logrus.WithField("keychain", "SecretService").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "SecretService").Warn("Keychain is not available.")
logrus.WithField("keychain", "SecretService").Debug("Keychain is not available.")
}
if _, err := execabs.LookPath("pass"); err == nil && isUsable(newPassHelper("")) {
helpers[Pass] = newPassHelper
logrus.WithField("keychain", "Pass").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "Pass").Warn("Keychain is not available.")
logrus.WithField("keychain", "Pass").Debug("Keychain is not available.")
}
defaultHelper := SecretServiceDBus

3
pkg/keychain/helper_windows.go
View File

@ -30,8 +30,9 @@ func listHelpers() (Helpers, string) {
// Windows always provides a keychain.
if isUsable(newWinCredHelper("")) {
helpers[WindowsCredentials] = newWinCredHelper
logrus.WithField("keychain", "WindowsCredentials").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "WindowsCredentials").Warn("Keychain is not available.")
logrus.WithField("keychain", "WindowsCredentials").Debug("Keychain is not available.")
}
// Use WindowsCredentials by default.
return helpers, WindowsCredentials