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

fix(BRIDGE-7): add timestamp to test credentials for keychain on macOS.

Browse Source
This commit is contained in:
Xavier Michelon
2024-04-09 10:43:31 +02:00
parent 9bfa79455e
commit 66569f71a0
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/keychain/keychain.go
View File

@ -220,14 +220,6 @@ func isUsable(helper credentials.Helper, err error) bool {
creds := getTestCredentials() creds := getTestCredentials()
// If the test entry is already present from an interrupted previous test, we must wipe it first.
if _, _, err := helper.Get(creds.ServerURL); err == nil {
if err := helper.Delete(creds.ServerURL); err != nil {
l.WithError(err).Warn("Failed to delete existing test credentials from keychain")
return false
}
}
if err := retry(func() error { if err := retry(func() error {
return helper.Add(creds) return helper.Add(creds)
}); err != nil { }); err != nil {
@ -252,7 +244,7 @@ func getTestCredentials() *credentials.Credentials {
// On macOS, a handful of users experience failures of the test credentials. // On macOS, a handful of users experience failures of the test credentials.
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
return &credentials.Credentials{ return &credentials.Credentials{
ServerURL: hostURL(constants.KeyChainName) + "/check", ServerURL: hostURL(constants.KeyChainName) + fmt.Sprintf("/check_%v", time.Now().UTC().UnixMicro()),
Username: "", // username is ignored on macOS, it's extracted from splitting the server URL Username: "", // username is ignored on macOS, it's extracted from splitting the server URL
Secret: "check", Secret: "check",
} }