Skip to content

Delegate authdb group membership check to userdb. #10408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Delegate authdb group membership check to userdb. #10408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions enterprise/server/backends/authdb/authdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,21 +827,16 @@ func (d *AuthDB) CreateUserAPIKey(ctx context.Context, groupID, userID, label st
}

func (d *AuthDB) isGroupMember(ctx context.Context, groupID, userID string) (bool, error) {
q := d.env.GetDBHandle().NewQuery(ctx, "authdb_check_group_membership").Raw(`
SELECT *
FROM "UserGroups"
WHERE group_group_id = ?
AND user_user_id = ?
AND membership_status = ?
`, groupID, userID, grpb.GroupMembershipStatus_MEMBER)
ug := &tables.UserGroup{}
if err := q.Take(ug); err != nil {
if db.IsRecordNotFound(err) {
return false, nil
}
u, err := d.env.GetUserDB().GetUserByIDWithoutAuthCheck(ctx, userID)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wish we could not use this method anymore

if err != nil {
return false, err
}
return true, nil
for _, g := range u.Groups {
if g.GroupID == groupID {
return true, nil
}
}
return false, nil
}

func (d *AuthDB) getAPIKey(ctx context.Context, h interfaces.DB, apiKeyID string) (*tables.APIKey, error) {
Expand Down
Loading