extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-12-23 23:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition with JWT group sync (#1486)

Browse Source 
This PR fixes the issue that caused JWT group membership not being store
Therefore causing many event logs and inconsistency
This commit is contained in:
Maycon Santos 2024-01-20 23:50:57 +01:00 committed by GitHub
parent 131d9f1bc7
commit d4194cba6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
management/server/account.go
View File

@ -1544,7 +1544,19 @@ func (am *DefaultAccountManager) GetAccountFromToken(claims jwtclaims.Authorizat
log.Infof("overriding JWT Domain and DomainCategory claims since single account mode is enabled")
}
account, err := am.getAccountWithAuthorizationClaims(claims)
newAcc, err := am.getAccountWithAuthorizationClaims(claims)
if err != nil {
return nil, nil, err
}
unlock := am.Store.AcquireAccountLock(newAcc.Id)
alreadyUnlocked := false
defer func() {
if !alreadyUnlocked {
unlock()
}
}()
account, err := am.Store.GetAccount(newAcc.Id)
if err != nil {
return nil, nil, err
}
@ -1593,6 +1605,8 @@ func (am *DefaultAccountManager) GetAccountFromToken(claims jwtclaims.Authorizat
log.Errorf("failed to save account: %v", err)
} else {
am.updateAccountPeers(account)
unlock()
alreadyUnlocked = true
for _, g := range addNewGroups {
if group := account.GetGroup(g); group != nil {
am.StoreEvent(user.Id, user.Id, account.Id, activity.GroupAddedToUser,