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

fix: race condition in AuthRefresh that could cause user to be logged out

Browse Source
This commit is contained in:
James Houlahan
2020-07-16 10:19:50 +02:00
parent 11e01ca163
commit bf0945eaef
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -67,6 +67,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
* GODT-321 Changing address ordering would cause all messages to disappear in combined mode. * GODT-321 Changing address ordering would cause all messages to disappear in combined mode.
* GODT-129 Fix custom message PGP by using template. * GODT-129 Fix custom message PGP by using template.
* GODT-280 Don't assume contact keys are stored armored. * GODT-280 Don't assume contact keys are stored armored.
* GODT-427 Fix race condition in auth refresh that could cause user to be logged out.
## [v1.2.8] Donghai-fix-append (beta 2020-06-XXX) ## [v1.2.8] Donghai-fix-append (beta 2020-06-XXX)

3
pkg/pmapi/auth.go
View File

@ -357,6 +357,9 @@ func (c *client) Auth2FA(twoFactorCode string, auth *Auth) (*Auth2FA, error) {
// AuthRefresh will refresh an expired access token. // AuthRefresh will refresh an expired access token.
func (c *client) AuthRefresh(uidAndRefreshToken string) (auth *Auth, err error) { func (c *client) AuthRefresh(uidAndRefreshToken string) (auth *Auth, err error) {
c.refreshLocker.Lock()
defer c.refreshLocker.Unlock()
// If we don't yet have a saved access token, save this one in case the refresh fails! // If we don't yet have a saved access token, save this one in case the refresh fails!
// That way we can try again later (see handleUnauthorizedStatus). // That way we can try again later (see handleUnauthorizedStatus).
c.cm.setTokenIfUnset(c.userID, uidAndRefreshToken) c.cm.setTokenIfUnset(c.userID, uidAndRefreshToken)

2
pkg/pmapi/client.go
View File

@ -113,6 +113,7 @@ type client struct {
accessToken string accessToken string
userID string userID string
requestLocker sync.Locker requestLocker sync.Locker
refreshLocker sync.Locker
user *User user *User
addresses AddressList addresses AddressList
@ -130,6 +131,7 @@ func newClient(cm *ClientManager, userID string) *client {
hc: getHTTPClient(cm.config, cm.roundTripper), hc: getHTTPClient(cm.config, cm.roundTripper),
userID: userID, userID: userID,
requestLocker: &sync.Mutex{}, requestLocker: &sync.Mutex{},
refreshLocker: &sync.Mutex{},
keyRingLock: &sync.Mutex{}, keyRingLock: &sync.Mutex{},
addrKeyRing: make(map[string]*crypto.KeyRing), addrKeyRing: make(map[string]*crypto.KeyRing),
log: logrus.WithField("pkg", "pmapi").WithField("userID", userID), log: logrus.WithField("pkg", "pmapi").WithField("userID", userID),