sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-29 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
This commit is contained in:
bcmmbaga
2024-09-18 19:05:21 +03:00
parent 8f9c54f6c2
commit 9631cb4fb3
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
management/server/account.go
View File

@@ -1757,7 +1757,10 @@ func (am *DefaultAccountManager) GetAccountFromToken(ctx context.Context, claims
} }
} }
if err = am.syncJWTGroups(ctx, claims, account.Id); err != nil { unlock := am.Store.AcquireWriteLockByUID(ctx, account.Id)
defer unlock()
if err = am.syncJWTGroups(ctx, account, user, claims); err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -1766,13 +1769,9 @@ func (am *DefaultAccountManager) GetAccountFromToken(ctx context.Context, claims
// syncJWTGroups processes the JWT groups for a user, updates the account based on the groups, // syncJWTGroups processes the JWT groups for a user, updates the account based on the groups,
// and propagates changes to peers if group propagation is enabled. // and propagates changes to peers if group propagation is enabled.
func (am *DefaultAccountManager) syncJWTGroups(ctx context.Context, claims jwtclaims.AuthorizationClaims, accountID string) error { func (am *DefaultAccountManager) syncJWTGroups(ctx context.Context, account *Account, user *User, claims jwtclaims.AuthorizationClaims) error {
settings, err := am.Store.GetAccountSettings(ctx, LockingStrengthShare, accountID) settings := account.Settings
if err != nil { if settings == nil || !settings.JWTGroupsEnabled {
return err
}
if !settings.JWTGroupsEnabled {
return nil return nil
} }
@@ -1783,19 +1782,6 @@ func (am *DefaultAccountManager) syncJWTGroups(ctx context.Context, claims jwtcl
jwtGroupsNames := extractJWTGroups(ctx, settings.JWTGroupsClaimName, claims) jwtGroupsNames := extractJWTGroups(ctx, settings.JWTGroupsClaimName, claims)
unlock := am.Store.AcquireWriteLockByUID(ctx, accountID)
defer unlock()
account, err := am.Store.GetAccount(ctx, accountID)
if err != nil {
return err
}
user, err := account.FindUser(claims.UserId)
if err != nil {
return nil
}
oldGroups := make([]string, len(user.AutoGroups)) oldGroups := make([]string, len(user.AutoGroups))
copy(oldGroups, user.AutoGroups) copy(oldGroups, user.AutoGroups)
@@ -1924,11 +1910,14 @@ func (am *DefaultAccountManager) getAccountWithAuthorizationClaims(ctx context.C
} }
return account, nil return account, nil
} else if s, ok := status.FromError(err); ok && s.Type() == status.NotFound { } else if s, ok := status.FromError(err); ok && s.Type() == status.NotFound {
unlockAccount := am.Store.AcquireWriteLockByUID(ctx, domainAccountID) var domainAccount *Account
defer unlockAccount() if domainAccountID != "" {
domainAccount, err := am.Store.GetAccountByPrivateDomain(ctx, claims.Domain) unlockAccount := am.Store.AcquireWriteLockByUID(ctx, domainAccountID)
if err != nil { defer unlockAccount()
return nil, err domainAccount, err = am.Store.GetAccountByPrivateDomain(ctx, claims.Domain)
if err != nil {
return nil, err
}
} }
return am.handleNewUserAccount(ctx, domainAccount, claims) return am.handleNewUserAccount(ctx, domainAccount, claims)

4
management/server/sql_store.go
View File

@@ -404,10 +404,6 @@ func (s *SqlStore) GetAccountByPrivateDomain(ctx context.Context, domain string)
return nil, err return nil, err
} }
if accountID == "" {
return nil, status.Errorf(status.NotFound, "account not found: index lookup failed")
}
// TODO: rework to not call GetAccount // TODO: rework to not call GetAccount
return s.GetAccount(ctx, accountID) return s.GetAccount(ctx, accountID)
} }