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

GODT-2041: Crash after factory reset

Browse Source 
I forgot to remove the user from the users map during factory reset.
This meant the (deleted) would attempt to be closed during teardown.
This commit is contained in:
James Houlahan
2022-11-28 19:58:10 +01:00
parent b902f1490f
commit ae7ae2886f
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/bridge/user.go
View File

@ -223,8 +223,6 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
return ErrNoSuchUser
}
defer delete(bridge.users, user.ID())
bridge.logoutUser(ctx, user, true, false)
bridge.publish(events.UserLoggedOut{
@ -245,7 +243,6 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
}
if user, ok := bridge.users[userID]; ok {
defer delete(bridge.users, user.ID())
bridge.logoutUser(ctx, user, true, true)
}
@ -528,6 +525,8 @@ func (bridge *Bridge) newVaultUser(
// logout logs out the given user, optionally logging them out from the API too.
func (bridge *Bridge) logoutUser(ctx context.Context, user *user.User, withAPI, withData bool) {
defer delete(bridge.users, user.ID())
logrus.WithFields(logrus.Fields{
"userID": user.ID(),
"withAPI": withAPI,