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

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

Browse Source
This commit is contained in:
James Houlahan
2022-10-26 23:48:18 +02:00
parent 83339da26c
commit 0bc99dbd4f
8 changed files with 311 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
internal/user/keys.go
View File

@ -21,85 +21,43 @@ 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 safe.RLockRet(func() error {
userKR, err := user.apiUser.Keys.Unlock(user.vault.KeyPass(), nil)
func withAddrKR(apiUser liteapi.User, apiAddr liteapi.Address, keyPass []byte, fn func(userKR, addrKR *crypto.KeyRing) error) error {
userKR, err := apiUser.Keys.Unlock(keyPass, nil)
if err != nil {
return fmt.Errorf("failed to unlock user keys: %w", err)
}
defer userKR.ClearPrivateParams()
addrKR, err := apiAddr.Keys.Unlock(keyPass, userKR)
if err != nil {
return fmt.Errorf("failed to unlock address keys: %w", err)
}
defer addrKR.ClearPrivateParams()
return fn(userKR, addrKR)
}
func withAddrKRs(apiUser liteapi.User, apiAddr map[string]liteapi.Address, keyPass []byte, fn func(*crypto.KeyRing, map[string]*crypto.KeyRing) error) error {
userKR, err := apiUser.Keys.Unlock(keyPass, nil)
if err != nil {
return fmt.Errorf("failed to unlock user keys: %w", err)
}
defer userKR.ClearPrivateParams()
addrKRs := make(map[string]*crypto.KeyRing, len(apiAddr))
for addrID, apiAddr := range apiAddr {
addrKR, err := apiAddr.Keys.Unlock(keyPass, userKR)
if err != nil {
return fmt.Errorf("failed to unlock user keys: %w", err)
return fmt.Errorf("failed to unlock address keys: %w", err)
}
defer userKR.ClearPrivateParams()
defer addrKR.ClearPrivateParams()
return fn(userKR)
}, &user.apiUserLock)
}
func (user *User) withAddrKR(addrID string, fn func(*crypto.KeyRing, *crypto.KeyRing) error) error {
return user.withUserKR(func(userKR *crypto.KeyRing) error {
if ok, err := user.apiAddrs.GetErr(addrID, func(apiAddr liteapi.Address) error {
addrKR, err := apiAddr.Keys.Unlock(user.vault.KeyPass(), userKR)
if err != nil {
return fmt.Errorf("failed to unlock address keys: %w", err)
}
defer userKR.ClearPrivateParams()
return fn(userKR, addrKR)
}); !ok {
return fmt.Errorf("no such address %q", addrID)
} else if err != nil {
return err
}
return nil
})
}
func (user *User) withAddrKRByEmail(email string, fn func(*crypto.KeyRing, *crypto.KeyRing) error) error {
return user.apiAddrs.ValuesErr(func(apiAddrs []liteapi.Address) error {
addrID, err := getAddrID(apiAddrs, email)
if err != nil {
return fmt.Errorf("failed to get address ID: %w", err)
}
return user.withUserKR(func(userKR *crypto.KeyRing) error {
if ok, err := user.apiAddrs.GetErr(addrID, func(apiAddr liteapi.Address) error {
addrKR, err := apiAddr.Keys.Unlock(user.vault.KeyPass(), userKR)
if err != nil {
return fmt.Errorf("failed to unlock address keys: %w", err)
}
defer userKR.ClearPrivateParams()
return fn(userKR, addrKR)
}); !ok {
return fmt.Errorf("no such address %q", addrID)
} else if err != nil {
return err
}
return nil
})
})
}
func (user *User) withAddrKRs(fn func(*crypto.KeyRing, map[string]*crypto.KeyRing) error) error {
return user.withUserKR(func(userKR *crypto.KeyRing) error {
return user.apiAddrs.ValuesErr(func(apiAddrs []liteapi.Address) error {
addrKRs := make(map[string]*crypto.KeyRing)
for _, apiAddr := range apiAddrs {
addrKR, err := apiAddr.Keys.Unlock(user.vault.KeyPass(), userKR)
if err != nil {
return fmt.Errorf("failed to unlock address keys: %w", err)
}
defer userKR.ClearPrivateParams()
addrKRs[apiAddr.ID] = addrKR
}
return fn(userKR, addrKRs)
})
})
addrKRs[addrID] = addrKR
}
return fn(userKR, addrKRs)
}