Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: group cache (#18613)
ecmadao3fd7853c6b9c
diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex 4e9f5fd835..c2fe04a431 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -221,7 +221,7 @@ func (s *AuthService) Login(ctx context.Context, req *connect.Request[v1pb.Loginslog.Error("failed to update user profile", log.BBError(err), slog.String("user", loginUser.Email))}- response.User = convertToUser(ctx, loginUser)+ response.User = convertToUser(ctx, s.iamManager, loginUser)return resp, nil}diff --git a/backend/api/v1/group_service.go b/backend/api/v1/group_service.goindex 95b198b8ab..4c543e50fc 100644--- a/backend/api/v1/group_service.go+++ b/backend/api/v1/group_service.go@@ -212,8 +212,10 @@ func (s *GroupService) UpdateGroup(ctx context.Context, req *connect.Request[v1preturn nil, connect.NewError(connect.CodeInternal, err)}- if err := s.iamManager.ReloadCache(ctx); err != nil {- return nil, err+ if patch.Payload != nil {+ if err := s.iamManager.ReloadCache(ctx); err != nil {+ return nil, err+ }}result, err := s.convertToV1Group(groupMessage)@@ -332,14 +334,8 @@ func (*GroupService) convertToV1Group(groupMessage *store.GroupMessage) (*v1pb.Greturn nil, connect.NewError(connect.CodeNotFound, errors.New("cannot found group"))}- var name string- if groupMessage.Email != "" {- name = common.FormatGroupEmail(groupMessage.Email)- } else {- name = common.FormatGroupEmail(groupMessage.ID)- }group := &v1pb.Group{- Name: name,+ Name: utils.FormatGroupName(groupMessage),Title: groupMessage.Title,Description: groupMessage.Description,Source: groupMessage.Payload.Source,diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.goindex a41b654cb4..6e7aed4e47 100644--- a/backend/api/v1/user_service.go+++ b/backend/api/v1/user_service.go@@ -64,7 +64,7 @@ func (s *UserService) GetUser(ctx context.Context, request *connect.Request[v1pbif user == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("user %q not found", email))}- return connect.NewResponse(convertToUser(ctx, user)), nil+ return connect.NewResponse(convertToUser(ctx, s.iamManager, user)), nil}// BatchGetUsers get users in batch.@@ -81,12 +81,12 @@ func (s *UserService) BatchGetUsers(ctx context.Context, request *connect.Reques}// GetCurrentUser gets the current authenticated user.-func (*UserService) GetCurrentUser(ctx context.Context, _ *connect.Request[emptypb.Empty]) (*connect.Response[v1pb.User], error) {+func (s *UserService) GetCurrentUser(ctx context.Context, _ *connect.Request[emptypb.Empty]) (*connect.Response[v1pb.User], error) {user, ok := GetUserFromContext(ctx)if !ok || user == nil {return nil, connect.NewError(connect.CodeUnauthenticated, errors.Errorf("authenticated user not found"))}- return connect.NewResponse(convertToUser(ctx, user)), nil+ return connect.NewResponse(convertToUser(ctx, s.iamManager, user)), nil}// ListUsers lists all users.@@ -145,7 +145,7 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1NextPageToken: nextPageToken,}for _, user := range users {- response.Users = append(response.Users, convertToUser(ctx, user))+ response.Users = append(response.Users, convertToUser(ctx, s.iamManager, user))}return connect.NewResponse(response), nil}@@ -304,7 +304,7 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v}}- userResponse := convertToUser(ctx, user)+ userResponse := convertToUser(ctx, s.iamManager, user)if request.Msg.User.UserType == v1pb.UserType_SERVICE_ACCOUNT {userResponse.ServiceKey = password}@@ -521,7 +521,7 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[vreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update user, error: %v", err))}- userResponse := convertToUser(ctx, user)+ userResponse := convertToUser(ctx, s.iamManager, user)if request.Msg.User.UserType == v1pb.UserType_SERVICE_ACCOUNT && passwordPatch != nil {userResponse.ServiceKey = *passwordPatch}@@ -659,7 +659,7 @@ func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInternal, err)}- return connect.NewResponse(convertToUser(ctx, user)), nil+ return connect.NewResponse(convertToUser(ctx, s.iamManager, user)), nil}// UpdateEmail updates a user's email address.@@ -717,7 +717,7 @@ func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update user email, error: %v", err))}- return connect.NewResponse(convertToUser(ctx, user)), nil+ return connect.NewResponse(convertToUser(ctx, s.iamManager, user)), nil}func convertToV1UserType(userType storepb.PrincipalType) v1pb.UserType {@@ -735,7 +735,7 @@ func convertToV1UserType(userType storepb.PrincipalType) v1pb.UserType {}}-func convertToUser(ctx context.Context, user *store.UserMessage) *v1pb.User {+func convertToUser(ctx context.Context, iamManager *iam.Manager, user *store.UserMessage) *v1pb.User {convertedUser := &v1pb.User{Name: common.FormatUserEmail(user.Email),State: convertDeletedToState(user.MemberDeleted),@@ -748,10 +748,7 @@ func convertToUser(ctx context.Context, user *store.UserMessage) *v1pb.User {LastChangePasswordTime: user.Profile.LastChangePasswordTime,Source: user.Profile.Source,},- }-- for _, group := range user.Groups {- convertedUser.Groups = append(convertedUser.Groups, common.FormatGroupEmail(group))+ Groups: iamManager.GetUserGroups(user.Email),}// Add workload identity config if presentdiff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.goindex e60b3370b4..37998cfb9e 100644--- a/backend/component/iam/manager.go+++ b/backend/component/iam/manager.go@@ -12,6 +12,7 @@ import ("github.com/bytebase/bytebase/backend/enterprise"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/store"+ "github.com/bytebase/bytebase/backend/utils")//go:embed acl.yaml@@ -29,6 +30,8 @@ type Manager struct {// rolePermissions is a map from role to permissions. Key is "roles/{role}".rolePermissions map[string]map[Permission]boolgroupMembers map[string]map[string]bool+ // member - groups mapping+ memberGroups map[string][]stringPredefinedRoles []*store.RoleMessagestore *store.StorelicenseService *enterprise.LicenseService@@ -105,15 +108,21 @@ func (m *Manager) ReloadCache(ctx context.Context) error {return err}groupMembers := make(map[string]map[string]bool)+ memberGroups := make(map[string][]string)for _, group := range groups {usersSet := make(map[string]bool)+ groupName := utils.FormatGroupName(group)for _, m := range group.Payload.GetMembers() {usersSet[m.Member] = true+ if _, ok := memberGroups[m.Member]; !ok {+ memberGroups[m.Member] = []string{}+ }+ memberGroups[m.Member] = append(memberGroups[m.Member], groupName)}- groupName := common.FormatGroupEmail(group.Email)groupMembers[groupName] = usersSet}m.groupMembers = groupMembers+ m.memberGroups = memberGroupsreturn nil}@@ -127,6 +136,10 @@ func (m *Manager) GetPermissions(role string) (map[Permission]bool, error) {return permissions, nil}+func (m *Manager) GetUserGroups(email string) []string {+ return m.memberGroups[common.FormatUserEmail(email)]+}+func check(user *store.UserMessage, p Permission, policy *storepb.IamPolicy, rolePermissions map[string]map[Permission]bool, groupMembers map[string]map[string]bool) bool {userName := common.FormatUserEmail(user.Email)diff --git a/backend/store/principal.go b/backend/store/principal.goindex 7d93ac5939..5f81f65783 100644--- a/backend/store/principal.go+++ b/backend/store/principal.go@@ -6,7 +6,6 @@ import ("strings""time"- "github.com/lib/pq""github.com/pkg/errors""google.golang.org/protobuf/encoding/protojson""google.golang.org/protobuf/types/known/timestamppb"@@ -62,8 +61,6 @@ type UserMessage struct {Phone string// output onlyCreatedAt time.Time- // The group email list- Groups []string}type UserStat struct {@@ -192,7 +189,7 @@ func (s *Store) listAndCacheAllUsers(ctx context.Context) error {func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*UserMessage, error) {with := qb.Q()- from := qb.Q().Space("principal INNER JOIN user_groups ON principal.id = user_groups.user_id")+ from := qb.Q().Space("principal")where := qb.Q().Space("TRUE")// Build CTE for project filtering if needed@@ -206,26 +203,10 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U),project_members AS (SELECT ARRAY_AGG(member) AS members FROM all_members WHERE role NOT LIKE 'roles/workspace%'- ),`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String())+ )`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String())from.Space(`INNER JOIN project_members ON (CONCAT('users/', principal.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)- } else {- with.Space(`WITH`)}- // Join the user_group table to find groups for each user.- // The user will be stored in the user_group.payload.members.member field, the member is in the "users/{email}" format- with.Space(`user_groups AS (- SELECT- principal.id AS user_id,- COALESCE(ARRAY_AGG(user_group.email ORDER BY user_group.email) FILTER (WHERE user_group.email IS NOT NULL), '{}') AS groups- FROM principal- LEFT JOIN user_group ON EXISTS (- SELECT 1 FROM jsonb_array_elements(user_group.payload->'members') AS m- WHERE m->>'member' = CONCAT('users/', principal.email)- )- GROUP BY principal.id- )`)-if filterQ := find.FilterQ; filterQ != nil {where.And("?", filterQ)}@@ -258,8 +239,7 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*Uprincipal.mfa_config,principal.phone,principal.profile,- principal.created_at,- user_groups.groups+ principal.created_atFROM ?WHERE ?ORDER BY type DESC, created_at ASC@@ -288,7 +268,6 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*Uvar mfaConfigBytes []bytevar profileBytes []bytevar typeString string- var groups pq.StringArrayif err := rows.Scan(&userMessage.ID,&userMessage.MemberDeleted,@@ -300,11 +279,9 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U&userMessage.Phone,&profileBytes,&userMessage.CreatedAt,- &groups,); err != nil {return nil, err}- userMessage.Groups = []string(groups)if typeValue, ok := storepb.PrincipalType_value[typeString]; ok {userMessage.Type = storepb.PrincipalType(typeValue)} else {@@ -373,30 +350,6 @@ func scanPrincipalRow(ctx context.Context, tx *sql.Tx, sqlStr string, args []anyreturn &user, nil}-// fetchUserGroups fetches the groups for a user by email.-func fetchUserGroups(ctx context.Context, tx *sql.Tx, email string) ([]string, error) {- groupsQuery := qb.Q().Space(`- SELECT COALESCE(ARRAY_AGG(user_group.email ORDER BY user_group.email) FILTER (WHERE user_group.email IS NOT NULL), '{}')- FROM principal- LEFT JOIN user_group ON EXISTS (- SELECT 1 FROM jsonb_array_elements(user_group.payload->'members') AS m- WHERE m->>'member' = CONCAT('users/', principal.email)- )- WHERE principal.email = ?- GROUP BY principal.email- `, email)- groupsSQL, groupsArgs, err := groupsQuery.ToSQL()- if err != nil {- return nil, errors.Wrapf(err, "failed to build groups sql")- }-- var groups pq.StringArray- if err := tx.QueryRowContext(ctx, groupsSQL, groupsArgs...).Scan(&groups); err != nil {- return nil, err- }- return []string(groups), nil-}-// CreateUser creates an user.func (s *Store) CreateUser(ctx context.Context, create *UserMessage) (*UserMessage, error) {// Double check the passing-in emails.@@ -521,9 +474,6 @@ func (s *Store) UpdateUser(ctx context.Context, currentUser *UserMessage, patchreturn nil, err}- // Preserve groups from currentUser since UpdateUser doesn't modify group memberships- updatedUser.Groups = currentUser.Groups-if err := tx.Commit(); err != nil {return nil, err}@@ -845,13 +795,6 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmailreturn nil, errors.Wrapf(err, "failed to update audit_log user references")}- // Fetch groups for the updated user (must be done before commit while tx is still open)- groups, err := fetchUserGroups(ctx, tx, updatedUser.Email)- if err != nil {- return nil, err- }- updatedUser.Groups = groups-if err := tx.Commit(); err != nil {return nil, err}diff --git a/backend/utils/member.go b/backend/utils/member.goindex 098aede236..b210ac5382 100644--- a/backend/utils/member.go+++ b/backend/utils/member.go@@ -24,6 +24,13 @@ func validateIAMBinding(binding *storepb.Binding) bool {return ok}+func FormatGroupName(group *store.GroupMessage) string {+ if group.Email != "" {+ return common.FormatGroupEmail(group.Email)+ }+ return common.FormatGroupEmail(group.ID)+}+// GetUsersByRoleInIAMPolicy gets users in the iam policy.func GetUsersByRoleInIAMPolicy(ctx context.Context, stores *store.Store, role string, policies ...*storepb.IamPolicy) []*store.UserMessage {roleFullName := common.FormatRole(role)diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex 9516124580..a80b51ece6 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -182,7 +182,7 @@ export const useUserStore = defineStore("user", () => {);const pendingFetch = validList.filter((name) => {- return isValidUserName(name) && getUserByIdentifier(name) === undefined;+ return getUserByIdentifier(name) === undefined;}).map((name) => ensureUserFullName(name));if (pendingFetch.length === 0) {diff --git a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vueindex 5d9e11fef7..4450410fc1 100644--- a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue@@ -78,7 +78,7 @@ import SchemaPane from "./SchemaPane";import WorksheetPane from "./WorksheetPane";const editorStore = useSQLEditorStore();-const { asidePanelTab } = useSQLEditorContext();+const { asidePanelTab, maybeSwitchProject } = useSQLEditorContext();const { isDisconnected } = storeToRefs(useSQLEditorTabStore());const { project, projectContextReady } = storeToRefs(editorStore);@@ -96,7 +96,7 @@ const handleSwitchProject = (name: string | undefined) => {if (!name || !isValidProjectName(name)) {editorStore.setProject("");} else {- editorStore.setProject(name);+ maybeSwitchProject(name);}};</script>diff --git a/frontend/src/views/sql-editor/context.ts b/frontend/src/views/sql-editor/context.tsindex 46375d5b91..77cf4cf49a 100644--- a/frontend/src/views/sql-editor/context.ts+++ b/frontend/src/views/sql-editor/context.ts@@ -250,6 +250,25 @@ export const provideSQLEditorContext = () => {}};+ const maybeSwitchProject = async (projectName: string) => {+ editorStore.projectContextReady = false;+ try {+ if (!isValidProjectName(projectName)) {+ return;+ }+ const project = await projectStore.getOrFetchProjectByName(projectName);+ // Fetch IAM policy to ensure permission checks work correctly+ await projectIamPolicyStore.getOrFetchProjectIamPolicy(project.name);+ editorStore.setProject(project.name);+ context.events.emit("project-context-ready", { project: project.name });+ return project.name;+ } catch {+ // Nothing+ } finally {+ editorStore.projectContextReady = true;+ }+ };+const context: SQLEditorContext = {asidePanelTab: ref("WORKSHEET"),showConnectionPanel,@@ -259,24 +278,7 @@ export const provideSQLEditorContext = () => {pendingInsertAtCaret: ref(),events: new Emittery(),- maybeSwitchProject: async (projectName) => {- if (!isValidProjectName(projectName)) {- return;- }- editorStore.projectContextReady = false;- try {- const project = await projectStore.getOrFetchProjectByName(projectName);- // Fetch IAM policy to ensure permission checks work correctly- await projectIamPolicyStore.getOrFetchProjectIamPolicy(project.name);- editorStore.setProject(project.name);- context.events.emit("project-context-ready", { project: project.name });- return project.name;- } catch {- // Nothing- } finally {- editorStore.projectContextReady = true;- }- },+ maybeSwitchProject,handleEditorPanelResize: (size: number) => {if (size >= 1) {return;