[management] Refactor User JWT group sync #2690
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
pascal-fischer
requested changes
Oct 3, 2024
Comment on lines
-1829
to
-1832
| unlock := am.Store.AcquireWriteLockByUID(ctx, accountID) | ||
| defer unlock() |
There was a problem hiding this comment.
Sadly I think we can not yet get rid of the account lock as long as we still have saveAccount operations somewhere
management/server/account.go
Outdated
Comment on lines
1879
to
1881
| account, err := am.requestBuffer.GetAccountWithBackpressure(ctx, accountID) | ||
| if err != nil { | ||
| return fmt.Errorf("error getting account: %w", err) |
There was a problem hiding this comment.
Having this part within the transaction might be unfortunate. Can we add a flag that after a successful transaction, we do the account peers update?
management/server/account.go
Outdated
Comment on lines
1888
to
1905
| group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID) | ||
| if err != nil { | ||
| log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID) | ||
| } else { | ||
| meta := map[string]any{ | ||
| "group": group.Name, "group_id": group.ID, | ||
| "is_service_user": user.IsServiceUser, "user_name": user.ServiceUserName, | ||
| } | ||
| am.StoreEvent(ctx, user.Id, user.Id, accountID, activity.GroupAddedToUser, meta) | ||
| } | ||
| } | ||
|
|
||
| for _, g := range removeOldGroups { | ||
| if group := account.GetGroup(g); group != nil { | ||
| am.StoreEvent(ctx, user.Id, user.Id, account.Id, activity.GroupRemovedFromUser, | ||
| map[string]any{ | ||
| "group": group.Name, | ||
| "group_id": group.ID, | ||
| "is_service_user": user.IsServiceUser, | ||
| "user_name": user.ServiceUserName}) | ||
| group, err := transaction.GetGroupByID(ctx, LockingStrengthShare, g, accountID) | ||
| if err != nil { | ||
| log.WithContext(ctx).Debugf("group %s not found while saving user activity event of account %s", g, accountID) | ||
| } else { | ||
| meta := map[string]any{ |
There was a problem hiding this comment.
Having the event writing as part of the transaction should be good from a security perspective. But rolling back in case of failing event storing will change how our system works. I think this is a good approach but we should discuss this so everyone is on the same page.
Comment on lines
+1015
to
+1037
| func (s *SqlStore) AddUserPeersToGroups(ctx context.Context, accountID string, userID string, groupIDs []string) error { | ||
| if len(groupIDs) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| var userPeerIDs []string | ||
| result := s.db.WithContext(ctx).Clauses(clause.Locking{Strength: string(LockingStrengthShare)}).Select("id"). | ||
| Where("account_id = ? AND user_id = ?", accountID, userID).Model(&nbpeer.Peer{}).Find(&userPeerIDs) | ||
| if result.Error != nil { | ||
| return status.Errorf(status.Internal, "issue finding user peers") | ||
| } | ||
|
|
||
| groupsToUpdate := make([]*nbgroup.Group, 0, len(groupIDs)) | ||
| for _, gid := range groupIDs { | ||
| group, err := s.GetGroupByID(ctx, LockingStrengthShare, gid, accountID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| groupPeers := make(map[string]struct{}) | ||
| for _, pid := range group.Peers { | ||
| groupPeers[pid] = struct{}{} | ||
| } |
There was a problem hiding this comment.
This is too much business logic in the store. This needs to be moved into the account manager
Comment on lines
+1055
to
+1074
| func (s *SqlStore) RemoveUserPeersFromGroups(ctx context.Context, accountID string, userID string, groupIDs []string) error { | ||
| if len(groupIDs) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| var userPeerIDs []string | ||
| result := s.db.WithContext(ctx).Clauses(clause.Locking{Strength: string(LockingStrengthShare)}).Select("id"). | ||
| Where("account_id = ? AND user_id = ?", accountID, userID).Model(&nbpeer.Peer{}).Find(&userPeerIDs) | ||
| if result.Error != nil { | ||
| return status.Errorf(status.Internal, "issue finding user peers") | ||
| } | ||
|
|
||
| groupsToUpdate := make([]*nbgroup.Group, 0, len(groupIDs)) | ||
| for _, gid := range groupIDs { | ||
| group, err := s.GetGroupByID(ctx, LockingStrengthShare, gid, accountID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if group.Name == "All" { |
There was a problem hiding this comment.
also to much business logic in store
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
# Conflicts: # management/server/file_store.go
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
bcmmbaga
force-pushed
the
refactor/jwt-group-sync
branch
from
0c25837 to
adf8d48
Compare
|
pascal-fischer
approved these changes
Oct 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Issue ticket number and link
Checklist