yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Other(refactor): Sort safe.Mutex types before locking to prevent deadlocks

Browse Source 
This change implements safe.Mutex and safe.RWMutex, which wrap the
sync.Mutex and sync.RWMutex types and are assigned a globally unique
integer ID. The safe.Lock and safe.RLock methods sort the mutexes
by this integer ID before locking to ensure that locks for a given
set of mutexes are always performed in the same order, avoiding
deadlocks.
This commit is contained in:
James Houlahan
2022-10-27 01:21:40 +02:00
parent 5a4f733518
commit d4da325e57
11 changed files with 133 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/bridge/user.go
View File

@ -80,7 +80,7 @@ func (bridge *Bridge) GetUserInfo(userID string) (UserInfo, error) {
}
return info, nil
}, &bridge.usersLock)
}, bridge.usersLock)
}
// QueryUserInfo queries the user info by username or address.
@ -93,7 +93,7 @@ func (bridge *Bridge) QueryUserInfo(query string) (UserInfo, error) {
}
return UserInfo{}, ErrNoSuchUser
}, &bridge.usersLock)
}, bridge.usersLock)
}
// LoginAuth begins the login process. It returns an authorized client that might need 2FA.
@ -105,7 +105,7 @@ func (bridge *Bridge) LoginAuth(ctx context.Context, username string, password [
if ok := safe.RLockRet(func() bool {
return mapHas(bridge.users, auth.UID)
}, &bridge.usersLock); ok {
}, bridge.usersLock); ok {
if err := client.AuthDelete(ctx); err != nil {
logrus.WithError(err).Warn("Failed to delete auth")
}
@ -201,7 +201,7 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
})
return nil
}, &bridge.usersLock)
}, bridge.usersLock)
}
// DeleteUser deletes the given user.
@ -225,7 +225,7 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
})
return nil
}, &bridge.usersLock)
}, bridge.usersLock)
}
// SetAddressMode sets the address mode for the given user.
@ -260,7 +260,7 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
})
return nil
}, &bridge.usersLock)
}, bridge.usersLock)
}
func (bridge *Bridge) loginUser(ctx context.Context, client *liteapi.Client, authUID, authRef string, keyPass []byte) (string, error) {
@ -295,7 +295,7 @@ func (bridge *Bridge) loadUsers(ctx context.Context) error {
if safe.RLockRet(func() bool {
return mapHas(bridge.users, user.UserID())
}, &bridge.usersLock) {
}, bridge.usersLock) {
return nil
}
@ -419,7 +419,7 @@ func (bridge *Bridge) addUserWithVault(
// Finally, save the user in the bridge.
safe.Lock(func() {
bridge.users[apiUser.ID] = user
}, &bridge.usersLock)
}, bridge.usersLock)
return nil
}