feat(users): Store user access on user's table #1923
Merged
Conversation
This file contains hidden or 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: Javier Rodriguez <javier@chainloop.dev>
Signed-off-by: Javier Rodriguez <javier@chainloop.dev>
migmartri
reviewed
Mar 27, 2025
| u.logger.Infow("msg", "Syncing user access") | ||
|
|
||
| // Count the number of users with restricted access | ||
| usersWithRestrictedAccess, err := u.userRepo.CountUsersWithRestrictedAccess(ctx) |
| // updateUserAccessBasedOnAllowList updates the access restriction status of all users based on the allowlist | ||
| func (u *UserAccessSyncerUseCase) updateUserAccessBasedOnAllowList(ctx context.Context, usersWithRestrictedAccess int) error { | ||
| // If the allowlist is empty and there are users with restricted access, give access to those users | ||
| if u.allowList != nil && len(u.allowList.GetRules()) == 0 && usersWithRestrictedAccess > 0 { |
There was a problem hiding this comment.
we are missing the default configuration. if allowlist not set but nothing to update
There was a problem hiding this comment.
and I'd remove this case since it only applies once
|
|
||
| // updateUserAccessRestriction updates the access restriction status of a user | ||
| func (u *UserAccessSyncerUseCase) updateUserAccessRestriction(ctx context.Context, user *User, isAllowListDeactivated bool) error { | ||
| allow, err := UserEmailInAllowlist(u.allowList.GetRules(), user.Email) |
There was a problem hiding this comment.
we do not need to do it if deactivated
| Annotations(&entsql.Annotation{ | ||
| Default: "CURRENT_TIMESTAMP", | ||
| }), | ||
| field.Bool("has_restricted_access").Default(true).Comment("Whether the user is blocked from accessing the system"), |
There was a problem hiding this comment.
the denormalized access state based on allow_list_settings
| func (User) Indexes() []ent.Index { | ||
| return []ent.Index{ | ||
| index.Fields("has_restricted_access").Annotations( | ||
| entsql.IndexWhere("has_restricted_access IS true"), |
Signed-off-by: Javier Rodriguez <javier@chainloop.dev>
|
Updated the PR to:
|
Signed-off-by: Javier Rodriguez <javier@chainloop.dev>
jiparis
approved these changes
Mar 27, 2025
migmartri
approved these changes
Mar 27, 2025
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.
This patch adds a new column,
has_restricted_access, to theUserstable. While not currently in use, it is synchronized with the allowlist configured on the server.A background goroutine runs at startup, syncing the
Userstable with the allowlist every 10 seconds.As we have in the allowlist middleware, if the allowlist is empty, we allow all users to get in. In this scenario, it means to update all users
has_restricted_access=trueto switch itfalse.