Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 08:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: better keychain logging

Browse Source
This commit is contained in:
James Houlahan
2021-07-06 13:30:49 +02:00
committed by Jakub
parent 2707a5627c
commit 984864553e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/users/credentials/store.go
View File

@ -18,6 +18,7 @@
package credentials package credentials
import ( import (
"errors"
"fmt" "fmt"
"sort" "sort"
"sync" "sync"
@ -228,21 +229,28 @@ func (s *Store) Get(userID string) (creds *Credentials, err error) {
return s.get(userID) return s.get(userID)
} }
func (s *Store) get(userID string) (creds *Credentials, err error) { func (s *Store) get(userID string) (*Credentials, error) {
log := log.WithField("user", userID) log := log.WithField("user", userID)
_, secret, err := s.secrets.Get(userID) _, secret, err := s.secrets.Get(userID)
if err != nil { if err != nil {
log.WithError(err).Warn("Could not get credentials from native keychain") return nil, err
return }
if secret == "" {
return nil, errors.New("secret is empty")
} }
credentials := &Credentials{UserID: userID} credentials := &Credentials{UserID: userID}
if err = credentials.Unmarshal(secret); err != nil {
err = fmt.Errorf("backend/credentials: malformed secret: %v", err) if err := credentials.Unmarshal(secret); err != nil {
_ = s.secrets.Delete(userID) log.WithError(fmt.Errorf("malformed secret: %w", err)).Error("Could not unmarshal secret")
log.WithError(err).Error("Could not unmarshal secret")
return if err := s.secrets.Delete(userID); err != nil {
log.WithError(err).Error("Failed to remove malformed secret")
}
return nil, err
} }
return credentials, nil return credentials, nil