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

Other(refactor): Use normal value + mutex for user.apiUser

Browse Source
This commit is contained in:
James Houlahan
2022-10-26 23:13:38 +02:00
parent 8749d5dc7d
commit 83339da26c
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/user/keys.go
View File

@ -21,19 +21,20 @@ import (
"fmt"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/v2/internal/safe"
"gitlab.protontech.ch/go/liteapi"
)
func (user *User) withUserKR(fn func(*crypto.KeyRing) error) error {
return user.apiUser.LoadErr(func(apiUser liteapi.User) error {
userKR, err := apiUser.Keys.Unlock(user.vault.KeyPass(), nil)
return safe.RLockRet(func() error {
userKR, err := user.apiUser.Keys.Unlock(user.vault.KeyPass(), nil)
if err != nil {
return fmt.Errorf("failed to unlock user keys: %w", err)
}
defer userKR.ClearPrivateParams()
return fn(userKR)
})
}, &user.apiUserLock)
}
func (user *User) withAddrKR(addrID string, fn func(*crypto.KeyRing, *crypto.KeyRing) error) error {