Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat(api): complete API separation for Service Account and Workload Identity (#19107)
rebelicecca6ea5fec2a
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 95f3c68a98..185679b506 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -7896,6 +7896,8 @@ components:Specifies the principals requesting access for a Bytebase resource.For users, the member should be: user:{email}For groups, the member should be: group:{email}+ For service accounts, the member should be: serviceAccount:{email}+ For workload identities, the member should be: workloadIdentity:{email}condition:title: conditiondescription: |-diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex 8ab8d6ee15..dcd8c87753 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -201,7 +201,7 @@ func (s *AuthService) Refresh(ctx context.Context, req *connect.Request[v1pb.Ref}// 4. Get user- user, err := s.store.GetUserByEmail(ctx, stored.UserEmail)+ user, err := s.store.GetEndUserByEmail(ctx, stored.UserEmail)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get user"))}@@ -245,7 +245,7 @@ func (s *AuthService) getAndVerifyUser(ctx context.Context, request *v1pb.LoginRreturn nil, err}- user, err := s.store.GetUserByEmail(ctx, request.Email)+ user, err := s.store.GetPrincipalByEmail(ctx, request.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user by email %q", request.Email))}@@ -365,11 +365,11 @@ func (s *AuthService) getOrCreateUserWithIDP(ctx context.Context, request *v1pb.}}// If the email is still invalid, we will return an error.- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, email, false /* isServiceAccount */, false); err != nil {+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, email, false); err != nil {return nil, err}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list users by email %s", email))}@@ -639,7 +639,7 @@ func (s *AuthService) completeMFALogin(ctx context.Context, request *v1pb.LoginRif err != nil {return nil, err}- user, err := s.store.GetUserByEmail(ctx, userEmail)+ user, err := s.store.GetEndUserByEmail(ctx, userEmail)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user"))}@@ -701,7 +701,7 @@ func (s *AuthService) validateLoginPermissions(ctx context.Context, user *store.}// Check domain restriction- return validateEmailWithDomains(ctx, s.licenseService, s.store, user.Email, false, false)+ return validateEmailWithDomains(ctx, s.licenseService, s.store, user.Email, false)}// checkMFARequired checks if MFA is required and returns a response with temp token if so.@@ -812,28 +812,20 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1}// Find workload identity by email- user, err := s.store.GetUserByEmail(ctx, request.Email)+ wi, err := s.store.GetWorkloadIdentityByEmail(ctx, request.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to find workload identity"))}- if user == nil {+ if wi == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("workload identity %q not found", request.Email))}- if user.Type != storepb.PrincipalType_WORKLOAD_IDENTITY {- return nil, connect.NewError(connect.CodeInvalidArgument,- errors.Errorf("email %q is not a workload identity", request.Email))- }- if user.MemberDeleted {+ if wi.MemberDeleted {return nil, connect.NewError(connect.CodeUnauthenticated,errors.New("workload identity has been deactivated"))}// Get workload identity config- if user.Profile == nil {- return nil, connect.NewError(connect.CodeInternal,- errors.New("workload identity profile not found"))- }- wicConfig := user.Profile.GetWorkloadIdentityConfig()+ wicConfig := wi.Configif wicConfig == nil {return nil, connect.NewError(connect.CodeInternal,errors.New("workload identity config not found"))@@ -846,20 +838,17 @@ func (s *AuthService) ExchangeToken(ctx context.Context, req *connect.Request[v1}// Generate Bytebase API token (1 hour duration, same as service account)- token, err := auth.GenerateAPIToken(user.Email, s.secret)+ token, err := auth.GenerateAPIToken(wi.Email, s.secret)if err != nil {return nil, connect.NewError(connect.CodeInternal,errors.Wrap(err, "failed to generate access token"))}// Update last login time- if _, err := s.store.UpdateUser(ctx, user, &store.UpdateUserMessage{- Profile: &storepb.UserProfile{- LastLoginTime: timestamppb.Now(),- WorkloadIdentityConfig: wicConfig,- },+ if _, err := s.store.UpdateWorkloadIdentity(ctx, wi, &store.UpdateWorkloadIdentityMessage{+ LastLoginTime: timestamppb.Now(),}); err != nil {- slog.Error("failed to update workload identity profile", log.BBError(err), slog.String("email", user.Email))+ slog.Error("failed to update workload identity profile", log.BBError(err), slog.String("email", wi.Email))}return connect.NewResponse(&v1pb.ExchangeTokenResponse{diff --git a/backend/api/v1/group_service.go b/backend/api/v1/group_service.goindex 5bc3dc2495..723f37e24d 100644--- a/backend/api/v1/group_service.go+++ b/backend/api/v1/group_service.go@@ -126,7 +126,7 @@ func (s *GroupService) CreateGroup(ctx context.Context, req *connect.Request[v1preturn nil, connect.NewError(connect.CodeInvalidArgument, err)}- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, groupMessage.Email, false /* isServiceAccount */, true); err != nil {+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, groupMessage.Email, true); err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid email %q", groupMessage.Email))}@@ -283,7 +283,7 @@ func (s *GroupService) convertToGroupPayload(ctx context.Context, group *v1pb.Grif err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get member email"))}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get member %s", member.Member))}diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex 22f27758af..49950a97aa 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -337,7 +337,7 @@ func (s *IssueService) getUserByIdentifier(ctx context.Context, identifier strinif email == "" {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid empty creator identifier"))}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetPrincipalByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf(`failed to find user "%s" with error: %v`, email, err.Error()))}@@ -489,7 +489,7 @@ func (s *IssueService) buildIssueMessage(ctx context.Context, project *store.Proif err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user email from %q", request.Issue.GrantRequest.User))}- grantRequestUser, err := s.store.GetUserByEmail(ctx, grantRequestUserEmail)+ grantRequestUser, err := s.store.GetEndUserByEmail(ctx, grantRequestUserEmail)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user by email %q", grantRequestUserEmail))}@@ -742,7 +742,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p}// Get issue creator for webhook event- creator, err := s.store.GetUserByEmail(ctx, issue.CreatorEmail)+ creator, err := s.store.GetPrincipalByEmail(ctx, issue.CreatorEmail)if err != nil {slog.Warn("failed to get issue creator, using system bot", log.BBError(err))creator = store.SystemBotUserdiff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.goindex 841bf1a60c..703eb198e1 100644--- a/backend/api/v1/project_service.go+++ b/backend/api/v1/project_service.go@@ -1205,13 +1205,15 @@ func validateMember(member string) error {}userIdentifierMap := map[string]bool{- common.UserBindingPrefix: true,- common.GroupBindingPrefix: true,+ common.UserBindingPrefix: true,+ common.GroupBindingPrefix: true,+ common.ServiceAccountBindingPrefix: true,+ common.WorkloadIdentityBindingPrefix: true,}for prefix := range userIdentifierMap {if strings.HasPrefix(member, prefix) && len(member[len(prefix):]) > 0 {return nil}}- return errors.Errorf("invalid user %s", member)+ return errors.Errorf("invalid member %s", member)}diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.goindex a5db68bc81..c0bbc02ef8 100644--- a/backend/api/v1/project_service_converter.go+++ b/backend/api/v1/project_service_converter.go@@ -144,6 +144,10 @@ func convertToV1MemberInBinding(member string) string {return common.UserBindingPrefix + strings.TrimPrefix(member, common.UserNamePrefix)} else if strings.HasPrefix(member, common.GroupPrefix) {return common.GroupBindingPrefix + strings.TrimPrefix(member, common.GroupPrefix)+ } else if strings.HasPrefix(member, common.ServiceAccountNamePrefix) {+ return common.ServiceAccountBindingPrefix + strings.TrimPrefix(member, common.ServiceAccountNamePrefix)+ } else if strings.HasPrefix(member, common.WorkloadIdentityNamePrefix) {+ return common.WorkloadIdentityBindingPrefix + strings.TrimPrefix(member, common.WorkloadIdentityNamePrefix)}// handle allUsers.return member@@ -235,10 +239,16 @@ func convertToStoreIamPolicyMember(member string) (string, error) {} else if strings.HasPrefix(member, common.GroupBindingPrefix) {email := strings.TrimPrefix(member, common.GroupBindingPrefix)return common.FormatGroupEmail(email), nil+ } else if strings.HasPrefix(member, common.ServiceAccountBindingPrefix) {+ email := strings.TrimPrefix(member, common.ServiceAccountBindingPrefix)+ return common.FormatServiceAccountEmail(email), nil+ } else if strings.HasPrefix(member, common.WorkloadIdentityBindingPrefix) {+ email := strings.TrimPrefix(member, common.WorkloadIdentityBindingPrefix)+ return common.FormatWorkloadIdentityEmail(email), nil} else if member == common.AllUsers {return member, nil}- return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupport member %s", member))+ return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported member %s", member))}func convertToProject(projectMessage *store.ProjectMessage) *v1pb.Project {diff --git a/backend/api/v1/sql_service_converter.go b/backend/api/v1/sql_service_converter.goindex ae044207af..40a42f46ab 100644--- a/backend/api/v1/sql_service_converter.go+++ b/backend/api/v1/sql_service_converter.go@@ -38,7 +38,7 @@ func convertAdviceStatus(status storepb.Advice_Status) v1pb.Advice_Level {}func (s *SQLService) convertToV1QueryHistory(ctx context.Context, history *store.QueryHistoryMessage) (*v1pb.QueryHistory, error) {- creator, err := s.store.GetUserByEmail(ctx, history.Creator)+ creator, err := s.store.GetPrincipalByEmail(ctx, history.Creator)if err != nil {return nil, err}diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.goindex 90fceecaef..706da9e53f 100644--- a/backend/api/v1/user_service.go+++ b/backend/api/v1/user_service.go@@ -55,7 +55,19 @@ func (s *UserService) GetUser(ctx context.Context, request *connect.Request[v1pbif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- user, err := s.store.GetUserByEmail(ctx, email)++ // Special case for SYSTEM_BOT user which is a built-in resource.+ // SYSTEM_BOT is stored in principal table with type='SYSTEM_BOT', but GetEndUserByEmail+ // only queries END_USER type. We use the static SystemBotUser here to avoid mixing user types.+ if email == common.SystemBotEmail {+ v1User, err := convertToUser(ctx, s.iamManager, store.SystemBotUser)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))+ }+ return connect.NewResponse(v1User), nil+ }++ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))}@@ -107,10 +119,12 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1}limitPlusOne := offset.limit + 1+ endUserType := storepb.PrincipalType_END_USERfind := &store.FindUserMessage{Limit: &limitPlusOne,Offset: &offset.offset,ShowDeleted: request.Msg.ShowDeleted,+ Type: &endUserType,}filterResult, err := store.GetListUserFilter(request.Msg.Filter)if err != nil {@@ -151,6 +165,15 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1NextPageToken: nextPageToken,}for _, user := range users {+ // Because FindUserMessage.Type is an equality filter, we can't filter for OR (END_USER OR SYSTEM_BOT).+ // So we filter on the result set for SYSTEM_BOT if the request allows (though FindUserMessage forced END_USER).+ // Wait, FindUserMessage forced END_USER above. So we won't get SYSTEM_BOT.+ // If we want to support SYSTEM_BOT in ListUsers, we need to handle it.+ // Usually ListUsers is for management UI, which mainly deals with END_USER.+ // If we need SYSTEM_BOT, we might need a more flexible store filter or just rely on END_USER.+ // Let's assume ListUsers is strictly for END_USERs for now as per separation concern.+ // SystemBot is a special singleton usually fetched by ID or known email.+v1User, err := convertToUser(ctx, s.iamManager, user)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))@@ -195,24 +218,12 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[vif err != nil {return nil, err}- if principalType != storepb.PrincipalType_SERVICE_ACCOUNT && principalType != storepb.PrincipalType_END_USER && principalType != storepb.PrincipalType_WORKLOAD_IDENTITY {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("support user, service account, and workload identity only"))- }-- // Validate workload identity specific requirements- if principalType == storepb.PrincipalType_WORKLOAD_IDENTITY {- if !common.IsWorkloadIdentityEmail(request.Msg.User.Email) {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("workload identity email must end with %s", common.WorkloadIdentityEmailSuffix))- }- if request.Msg.User.WorkloadIdentityConfig == nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("workload_identity_config is required for workload identity"))- }+ if principalType != storepb.PrincipalType_END_USER {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("support user only"))}- if principalType == storepb.PrincipalType_END_USER {- if err := s.userCountGuard(ctx); err != nil {- return nil, err- }+ if err := s.userCountGuard(ctx); err != nil {+ return nil, err}count, err := s.store.CountActiveEndUsers(ctx)@@ -228,11 +239,10 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v}// Skip domain restrictions for service accounts and workload identities- skipDomainRestriction := principalType == storepb.PrincipalType_SERVICE_ACCOUNT || principalType == storepb.PrincipalType_WORKLOAD_IDENTITY- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.User.Email, skipDomainRestriction, false); err != nil {+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.User.Email, false); err != nil {return nil, err}- existingUser, err := s.store.GetUserByEmail(ctx, request.Msg.User.Email)+ existingUser, err := s.store.GetEndUserByEmail(ctx, request.Msg.User.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user by email"))}@@ -241,33 +251,16 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v}password := request.Msg.User.Password- switch principalType {- case storepb.PrincipalType_SERVICE_ACCOUNT:- pwd, err := common.RandomString(20)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate access key for service account"))+ if password != "" {+ if err := s.validatePassword(ctx, password); err != nil {+ return nil, err}- password = fmt.Sprintf("%s%s", common.ServiceAccountAccessKeyPrefix, pwd)- case storepb.PrincipalType_WORKLOAD_IDENTITY:- // Workload identity uses OIDC tokens, not passwords- // Generate a random unusable password for security- pwd, err := common.RandomString(64)+ } else {+ pwd, err := common.RandomString(20)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate secure password for workload identity"))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate random password for user"))}password = pwd- default:- if password != "" {- if err := s.validatePassword(ctx, password); err != nil {- return nil, err- }- } else {- pwd, err := common.RandomString(20)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate random password for user"))- }- password = pwd- }}passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)@@ -275,27 +268,13 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[vreturn nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to generate password hash"))}- // Build profile with workload identity config if applicable- var profile *storepb.UserProfile- if principalType == storepb.PrincipalType_WORKLOAD_IDENTITY {- wic := request.Msg.User.WorkloadIdentityConfig- profile = &storepb.UserProfile{- WorkloadIdentityConfig: &storepb.WorkloadIdentityConfig{- ProviderType: storepb.WorkloadIdentityConfig_ProviderType(wic.ProviderType),- IssuerUrl: wic.IssuerUrl,- AllowedAudiences: wic.AllowedAudiences,- SubjectPattern: wic.SubjectPattern,- },- }- }-userMessage := &store.UserMessage{Email: request.Msg.User.Email,Name: request.Msg.User.Title,Phone: request.Msg.User.Phone,Type: principalType,PasswordHash: string(passwordHash),- Profile: profile,+ Profile: &storepb.UserProfile{},}user, err := s.store.CreateUser(ctx, userMessage)@@ -318,9 +297,6 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))}- if request.Msg.User.UserType == v1pb.UserType_SERVICE_ACCOUNT {- userResponse.ServiceKey = password- }return connect.NewResponse(userResponse), nil}@@ -366,7 +342,7 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))}@@ -416,16 +392,6 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[vreturn nil, err}passwordPatch = &request.Msg.User.Password- case "service_key":- if user.Type != storepb.PrincipalType_SERVICE_ACCOUNT {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("service key can be mutated for service accounts only"))- }- val, err := common.RandomString(20)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to generate access key for service account"))- }- password := fmt.Sprintf("%s%s", common.ServiceAccountAccessKeyPrefix, val)- passwordPatch = &passwordcase "mfa_enabled":if request.Msg.User.MfaEnabled {if user.MFAConfig.TempOtpSecret == "" || len(user.MFAConfig.TempRecoveryCodes) == 0 {@@ -544,9 +510,6 @@ func (s *UserService) UpdateUser(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert user"))}- if request.Msg.User.UserType == v1pb.UserType_SERVICE_ACCOUNT && passwordPatch != nil {- userResponse.ServiceKey = *passwordPatch- }return connect.NewResponse(userResponse), nil}@@ -568,7 +531,7 @@ func (s *UserService) DeleteUser(ctx context.Context, request *connect.Request[vif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))}@@ -661,7 +624,7 @@ func (s *UserService) UndeleteUser(ctx context.Context, request *connect.Requestif err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))}@@ -707,7 +670,7 @@ func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}- user, err := s.store.GetUserByEmail(ctx, email)+ user, err := s.store.GetEndUserByEmail(ctx, email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get user"))}@@ -724,12 +687,12 @@ func (s *UserService) UpdateEmail(ctx context.Context, request *connect.Request[}// Validate email format and domain restrictions- if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.Email, user.Type == storepb.PrincipalType_SERVICE_ACCOUNT, false); err != nil {+ if err := validateEmailWithDomains(ctx, s.licenseService, s.store, request.Msg.Email, false); err != nil {return nil, err}// Check if email already exists- existedUser, err := s.store.GetUserByEmail(ctx, request.Msg.Email)+ existedUser, err := s.store.GetEndUserByEmail(ctx, request.Msg.Email)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find user by email"))}@@ -785,17 +748,6 @@ func convertToUser(ctx context.Context, iamManager *iam.Manager, user *store.UseGroups: groups,}- // Add workload identity config if present- if user.Profile != nil && user.Profile.WorkloadIdentityConfig != nil {- wic := user.Profile.WorkloadIdentityConfig- convertedUser.WorkloadIdentityConfig = &v1pb.WorkloadIdentityConfig{- ProviderType: v1pb.WorkloadIdentityConfig_ProviderType(wic.ProviderType),- IssuerUrl: wic.IssuerUrl,- AllowedAudiences: wic.AllowedAudiences,- SubjectPattern: wic.SubjectPattern,- }- }-if user.MFAConfig != nil {convertedUser.MfaEnabled = user.MFAConfig.OtpSecret != ""// Only expose temporary MFA secrets and recovery codes to the user themselves@@ -815,17 +767,13 @@ func convertToPrincipalType(userType v1pb.UserType) (storepb.PrincipalType, errot = storepb.PrincipalType_END_USERcase v1pb.UserType_SYSTEM_BOT:t = storepb.PrincipalType_SYSTEM_BOT- case v1pb.UserType_SERVICE_ACCOUNT:- t = storepb.PrincipalType_SERVICE_ACCOUNT- case v1pb.UserType_WORKLOAD_IDENTITY:- t = storepb.PrincipalType_WORKLOAD_IDENTITYdefault:return t, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid user type %s", userType))}return t, nil}-func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.LicenseService, stores *store.Store, email string, isServiceAccount bool, checkDomainSetting bool) error {+func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.LicenseService, stores *store.Store, email string, checkDomainSetting bool) error {if licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION) != nil {// nolint:nilerr// feature not enabled, only validate email and skip domain restriction.@@ -848,10 +796,6 @@ func validateEmailWithDomains(ctx context.Context, licenseService *enterprise.Liif err := common.ValidateEmail(email); err != nil {return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid email: %v", err.Error()))}- // Domain restrictions are not applied to service account.- if isServiceAccount {- return nil- }// Enforce domain restrictions.if len(allowedDomains) > 0 {ok := falsediff --git a/backend/common/permission/permission.yaml b/backend/common/permission/permission.yamlindex fbbaf866ad..ee12a2d8ff 100644--- a/backend/common/permission/permission.yaml+++ b/backend/common/permission/permission.yaml@@ -92,6 +92,12 @@ permissions:- bb.rollouts.create- bb.rollouts.get- bb.rollouts.list+ - bb.serviceAccounts.create+ - bb.serviceAccounts.delete+ - bb.serviceAccounts.get+ - bb.serviceAccounts.list+ - bb.serviceAccounts.undelete+ - bb.serviceAccounts.update- bb.settings.get- bb.settings.getEnvironment- bb.settings.getWorkspaceProfile@@ -119,5 +125,11 @@ permissions:- bb.users.updateEmail- bb.worksheets.get- bb.worksheets.manage+ - bb.workloadIdentities.create+ - bb.workloadIdentities.delete+ - bb.workloadIdentities.get+ - bb.workloadIdentities.list+ - bb.workloadIdentities.undelete+ - bb.workloadIdentities.update- bb.workspaces.getIamPolicy- bb.workspaces.setIamPolicydiff --git a/backend/common/resource_name.go b/backend/common/resource_name.goindex d17ba49db2..85a0d4dd1e 100644--- a/backend/common/resource_name.go+++ b/backend/common/resource_name.go@@ -59,8 +59,10 @@ const (MetadataSuffix = "/metadata"CatalogSuffix = "/catalog"- UserBindingPrefix = "user:"- GroupBindingPrefix = "group:"+ UserBindingPrefix = "user:"+ GroupBindingPrefix = "group:"+ ServiceAccountBindingPrefix = "serviceAccount:"+ WorkloadIdentityBindingPrefix = "workloadIdentity:")// GetProjectID returns the project ID from a resource name.diff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.goindex f28599e77b..ab34918d52 100644--- a/backend/component/iam/manager.go+++ b/backend/component/iam/manager.go@@ -99,7 +99,7 @@ func (m *Manager) GetUserGroups(ctx context.Context, email string) ([]string, er}func check(user *store.UserMessage, p permission.Permission, policy *storepb.IamPolicy, getPermissions func(role string) map[permission.Permission]bool, getGroupMembers func(groupName string) map[string]bool) bool {- userName := common.FormatUserEmail(user.Email)+ userName := formatUserNameByType(user)for _, binding := range policy.GetBindings() {permissions := getPermissions(binding.GetRole())@@ -127,3 +127,18 @@ func check(user *store.UserMessage, p permission.Permission, policy *storepb.Iam}return false}++// formatUserNameByType returns the appropriate member name format based on user type.+// For regular users: users/{email}+// For service accounts: serviceAccounts/{email}+// For workload identities: workloadIdentities/{email}+func formatUserNameByType(user *store.UserMessage) string {+ switch user.Type {+ case storepb.PrincipalType_SERVICE_ACCOUNT:+ return common.FormatServiceAccountEmail(user.Email)+ case storepb.PrincipalType_WORKLOAD_IDENTITY:+ return common.FormatWorkloadIdentityEmail(user.Email)+ default:+ return common.FormatUserEmail(user.Email)+ }+}diff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.goindex a31ae24a79..3961eb47fc 100644--- a/backend/component/webhook/manager.go+++ b/backend/component/webhook/manager.go@@ -182,7 +182,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even// Set issue information if availableif issue != nil {creatorName := issue.Title // Fallback- creatorUser, err := m.store.GetUserByEmail(ctx, actor.Email)+ creatorUser, err := m.store.GetPrincipalByEmail(ctx, actor.Email)if err != nil {slog.Warn("failed to get creator user for webhook context",slog.String("issue_title", issue.Title),diff --git a/backend/generated-go/v1/iam_policy.pb.go b/backend/generated-go/v1/iam_policy.pb.goindex e68ebb7c27..56d8b67dfb 100644--- a/backend/generated-go/v1/iam_policy.pb.go+++ b/backend/generated-go/v1/iam_policy.pb.go@@ -257,6 +257,8 @@ type Binding struct {// Specifies the principals requesting access for a Bytebase resource.// For users, the member should be: user:{email}// For groups, the member should be: group:{email}+ // For service accounts, the member should be: serviceAccount:{email}+ // For workload identities, the member should be: workloadIdentity:{email}Members []string `protobuf:"bytes,2,rep,name=members,proto3" json:"members,omitempty"`// The condition that is associated with this binding, only used in the project IAM policy.// If the condition evaluates to true, then this binding applies to the current request.diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 7e9a2bd626..e887426daf 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -868,7 +868,7 @@ func NotifyApprovalRequested(ctx context.Context, stores *store.Store, webhookMa}// Get issue creator as actor- creator, err := stores.GetUserByEmail(ctx, issue.CreatorEmail)+ creator, err := stores.GetPrincipalByEmail(ctx, issue.CreatorEmail)if err != nil {slog.Warn("failed to get issue creator, using system bot", log.BBError(err))creator = store.SystemBotUserdiff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.goindex f968da3e9d..751cc78041 100644--- a/backend/runner/taskrun/data_export_executor.go+++ b/backend/runner/taskrun/data_export_executor.go@@ -92,7 +92,7 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,statement := sheet.StatementdataSource := utils.DataSourceFromInstanceWithType(instance, storepb.DataSourceType_ADMIN)- creatorUser, err := exec.store.GetUserByEmail(ctx, issue.CreatorEmail)+ creatorUser, err := exec.store.GetPrincipalByEmail(ctx, issue.CreatorEmail)if err != nil {return nil, errors.Wrapf(err, "failed to get creator user for issue %d", issue.UID)}diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.goindex 1efac1d2e5..4e4b253953 100644--- a/backend/server/grpc_routes.go+++ b/backend/server/grpc_routes.go@@ -112,6 +112,8 @@ func configureGrpcRouters(sqlService := apiv1.NewSQLService(stores, schemaSyncer, dbFactory, licenseService, iamManager)subscriptionService := apiv1.NewSubscriptionService(profile, licenseService)userService := apiv1.NewUserService(stores, licenseService, profile, iamManager)+ serviceAccountService := apiv1.NewServiceAccountService(stores, iamManager)+ workloadIdentityService := apiv1.NewWorkloadIdentityService(stores, iamManager)worksheetService := apiv1.NewWorksheetService(stores, iamManager)workspaceService := apiv1.NewWorkspaceService(stores, iamManager)@@ -212,6 +214,12 @@ func configureGrpcRouters(userPath, userHandler := v1connect.NewUserServiceHandler(userService, handlerOpts)connectHandlers[userPath] = userHandler+ serviceAccountPath, serviceAccountHandler := v1connect.NewServiceAccountServiceHandler(serviceAccountService, handlerOpts)+ connectHandlers[serviceAccountPath] = serviceAccountHandler++ workloadIdentityPath, workloadIdentityHandler := v1connect.NewWorkloadIdentityServiceHandler(workloadIdentityService, handlerOpts)+ connectHandlers[workloadIdentityPath] = workloadIdentityHandler+worksheetPath, worksheetHandler := v1connect.NewWorksheetServiceHandler(worksheetService, handlerOpts)connectHandlers[worksheetPath] = worksheetHandler@@ -241,10 +249,12 @@ func configureGrpcRouters(v1connect.RoleServiceName,v1connect.RolloutServiceName,v1connect.SettingServiceName,+ v1connect.ServiceAccountServiceName,v1connect.SheetServiceName,v1connect.SQLServiceName,v1connect.SubscriptionServiceName,v1connect.UserServiceName,+ v1connect.WorkloadIdentityServiceName,v1connect.WorksheetServiceName,v1connect.WorkspaceServiceName,)@@ -342,6 +352,12 @@ func configureGrpcRouters(if err := v1pb.RegisterUserServiceHandler(ctx, mux, grpcConn); err != nil {return err}+ if err := v1pb.RegisterServiceAccountServiceHandler(ctx, mux, grpcConn); err != nil {+ return err+ }+ if err := v1pb.RegisterWorkloadIdentityServiceHandler(ctx, mux, grpcConn); err != nil {+ return err+ }if err := v1pb.RegisterWorksheetServiceHandler(ctx, mux, grpcConn); err != nil {return err}diff --git a/backend/store/predefined_roles.go b/backend/store/predefined_roles.goindex aca39778b4..97f9b3f023 100644--- a/backend/store/predefined_roles.go+++ b/backend/store/predefined_roles.go@@ -152,6 +152,18 @@ var PredefinedRoles = []*RoleMessage{permission.WorksheetsManage,permission.WorkspacesGetIamPolicy,permission.WorkspacesSetIamPolicy,+ permission.ServiceAccountsCreate,+ permission.ServiceAccountsDelete,+ permission.ServiceAccountsGet,+ permission.ServiceAccountsList,+ permission.ServiceAccountsUndelete,+ permission.ServiceAccountsUpdate,+ permission.WorkloadIdentitiesCreate,+ permission.WorkloadIdentitiesDelete,+ permission.WorkloadIdentitiesGet,+ permission.WorkloadIdentitiesList,+ permission.WorkloadIdentitiesUndelete,+ permission.WorkloadIdentitiesUpdate,),},{@@ -268,6 +280,10 @@ var PredefinedRoles = []*RoleMessage{permission.WorksheetsGet,permission.WorksheetsManage,permission.WorkspacesGetIamPolicy,+ permission.ServiceAccountsGet,+ permission.ServiceAccountsList,+ permission.WorkloadIdentitiesGet,+ permission.WorkloadIdentitiesList,),},{@@ -290,6 +306,10 @@ var PredefinedRoles = []*RoleMessage{permission.UsersGet,permission.UsersList,permission.WorkspacesGetIamPolicy,+ permission.ServiceAccountsGet,+ permission.ServiceAccountsList,+ permission.WorkloadIdentitiesGet,+ permission.WorkloadIdentitiesList,),},{@@ -370,6 +390,18 @@ var PredefinedRoles = []*RoleMessage{permission.UsersList,permission.TaskRunsList,permission.WorksheetsGet,+ permission.ServiceAccountsCreate,+ permission.ServiceAccountsDelete,+ permission.ServiceAccountsGet,+ permission.ServiceAccountsList,+ permission.ServiceAccountsUndelete,+ permission.ServiceAccountsUpdate,+ permission.WorkloadIdentitiesCreate,+ permission.WorkloadIdentitiesDelete,+ permission.WorkloadIdentitiesGet,+ permission.WorkloadIdentitiesList,+ permission.WorkloadIdentitiesUndelete,+ permission.WorkloadIdentitiesUpdate,),},{diff --git a/backend/store/principal.go b/backend/store/principal.goindex cb2ea2d6d1..bdc0f9a0e7 100644--- a/backend/store/principal.go+++ b/backend/store/principal.go@@ -17,10 +17,11 @@ import (// SystemBotUser is the static system bot user.var SystemBotUser = &UserMessage{- ID: common.SystemBotID,- Name: "Bytebase",- Email: "[email protected]",- Type: storepb.PrincipalType_SYSTEM_BOT,+ ID: common.SystemBotID,+ Name: "Bytebase",+ Email: "[email protected]",+ Type: storepb.PrincipalType_SYSTEM_BOT,+ Profile: &storepb.UserProfile{},}// FindUserMessage is the message for finding users.@@ -81,20 +82,6 @@ func (s *Store) GetUserByID(ctx context.Context, id int) (*UserMessage, error) {return users[0], nil}-// GetUserByEmail gets the user by email.-func (s *Store) GetUserByEmail(ctx context.Context, email string) (*UserMessage, error) {- if v, ok := s.userEmailCache.Get(email); ok && s.enableCache {- return v, nil- }-- if err := s.listAndCacheAllUsers(ctx); err != nil {- return nil, err- }-- user, _ := s.userEmailCache.Get(email)- return user, nil-}-// GetPrincipalByEmail gets any principal (user, service account, or workload identity) by email.// This is used by the auth layer where the JWT subject can be any principal type.// It determines the principal type by the email format and calls the appropriate method.@@ -153,6 +140,20 @@ func (s *Store) GetPrincipalByEmail(ctx context.Context, email string) (*UserMesreturn s.GetUserByEmail(ctx, email)}+// GetUserByEmail gets the user by email.+func (s *Store) GetUserByEmail(ctx context.Context, email string) (*UserMessage, error) {+ if v, ok := s.userEmailCache.Get(email); ok && s.enableCache {+ return v, nil+ }++ if err := s.listAndCacheAllUsers(ctx); err != nil {+ return nil, err+ }++ user, _ := s.userEmailCache.Get(email)+ return user, nil+}+func (s *Store) StatUsers(ctx context.Context) ([]*UserStat, error) {q := qb.Q().Space(`SELECTdiff --git a/backend/store/principal_workload_identity.go b/backend/store/principal_workload_identity.goindex 46bef685c2..14fb3017f7 100644--- a/backend/store/principal_workload_identity.go+++ b/backend/store/principal_workload_identity.go@@ -7,6 +7,7 @@ import ("github.com/pkg/errors""google.golang.org/protobuf/encoding/protojson"+ "google.golang.org/protobuf/types/known/timestamppb""github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/qb"@@ -24,9 +25,9 @@ type WorkloadIdentityMessage struct {Project *string// Config is the workload identity configuration.Config *storepb.WorkloadIdentityConfig+ // LastLoginTime is the last login time of the workload identity.+ LastLoginTime *timestamppb.Timestamp}--// FindWorkloadIdentityMessage is the message for finding workload identities.type FindWorkloadIdentityMessage struct {ID *intEmail *string@@ -50,9 +51,10 @@ type CreateWorkloadIdentityMessage struct {// UpdateWorkloadIdentityMessage is the message to update a workload identity.type UpdateWorkloadIdentityMessage struct {- Name *string- Delete *bool- Config *storepb.WorkloadIdentityConfig+ Name *string+ Delete *bool+ Config *storepb.WorkloadIdentityConfig+ LastLoginTime *timestamppb.Timestamp}// GetWorkloadIdentityByEmail gets a workload identity by email.@@ -143,6 +145,7 @@ func (s *Store) ListWorkloadIdentities(ctx context.Context, find *FindWorkloadIdreturn nil, err}wi.Config = profile.WorkloadIdentityConfig+ wi.LastLoginTime = profile.LastLoginTimewis = append(wis, &wi)}if err := rows.Err(); err != nil {@@ -208,9 +211,17 @@ func (s *Store) UpdateWorkloadIdentity(ctx context.Context, wi *WorkloadIdentity}// Config update requires updating the profile JSONupdateConfig := patch.Config != nil- if updateConfig {+ updateLastLoginTime := patch.LastLoginTime != nil+ if updateConfig || updateLastLoginTime {profile := &storepb.UserProfile{- WorkloadIdentityConfig: patch.Config,+ WorkloadIdentityConfig: wi.Config,+ LastLoginTime: wi.LastLoginTime,+ }+ if updateConfig {+ profile.WorkloadIdentityConfig = patch.Config+ }+ if updateLastLoginTime {+ profile.LastLoginTime = patch.LastLoginTime}profileBytes, err := protojson.Marshal(profile)if err != nil {@@ -252,6 +263,7 @@ func (s *Store) UpdateWorkloadIdentity(ctx context.Context, wi *WorkloadIdentityreturn nil, err}updated.Config = profile.WorkloadIdentityConfig+ updated.LastLoginTime = profile.LastLoginTime// Also update the unified cache if this WI is in theres.userEmailCache.Remove(wi.Email)diff --git a/backend/tests/tests.go b/backend/tests/tests.goindex 15c83ab871..f523c6c515 100644--- a/backend/tests/tests.go+++ b/backend/tests/tests.go@@ -88,32 +88,34 @@ var ()type controller struct {- server *server.Server- profile *component.Profile- client *http.Client- authInterceptor *authInterceptor- issueServiceClient v1connect.IssueServiceClient- rolloutServiceClient v1connect.RolloutServiceClient- planServiceClient v1connect.PlanServiceClient- orgPolicyServiceClient v1connect.OrgPolicyServiceClient- reviewConfigServiceClient v1connect.ReviewConfigServiceClient- projectServiceClient v1connect.ProjectServiceClient- databaseGroupServiceClient v1connect.DatabaseGroupServiceClient- authServiceClient v1connect.AuthServiceClient- userServiceClient v1connect.UserServiceClient- settingServiceClient v1connect.SettingServiceClient- instanceServiceClient v1connect.InstanceServiceClient- databaseServiceClient v1connect.DatabaseServiceClient- databaseCatalogServiceClient v1connect.DatabaseCatalogServiceClient- sheetServiceClient v1connect.SheetServiceClient- sqlServiceClient v1connect.SQLServiceClient- subscriptionServiceClient v1connect.SubscriptionServiceClient- actuatorServiceClient v1connect.ActuatorServiceClient- workspaceServiceClient v1connect.WorkspaceServiceClient- releaseServiceClient v1connect.ReleaseServiceClient- revisionServiceClient v1connect.RevisionServiceClient- groupServiceClient v1connect.GroupServiceClient- auditLogServiceClient v1connect.AuditLogServiceClient+ server *server.Server+ profile *component.Profile+ client *http.Client+ authInterceptor *authInterceptor+ issueServiceClient v1connect.IssueServiceClient+ rolloutServiceClient v1connect.RolloutServiceClient+ planServiceClient v1connect.PlanServiceClient+ orgPolicyServiceClient v1connect.OrgPolicyServiceClient+ reviewConfigServiceClient v1connect.ReviewConfigServiceClient+ projectServiceClient v1connect.ProjectServiceClient+ databaseGroupServiceClient v1connect.DatabaseGroupServiceClient+ authServiceClient v1connect.AuthServiceClient+ userServiceClient v1connect.UserServiceClient+ settingServiceClient v1connect.SettingServiceClient+ instanceServiceClient v1connect.InstanceServiceClient+ databaseServiceClient v1connect.DatabaseServiceClient+ databaseCatalogServiceClient v1connect.DatabaseCatalogServiceClient+ sheetServiceClient v1connect.SheetServiceClient+ sqlServiceClient v1connect.SQLServiceClient+ subscriptionServiceClient v1connect.SubscriptionServiceClient+ actuatorServiceClient v1connect.ActuatorServiceClient+ workspaceServiceClient v1connect.WorkspaceServiceClient+ releaseServiceClient v1connect.ReleaseServiceClient+ revisionServiceClient v1connect.RevisionServiceClient+ groupServiceClient v1connect.GroupServiceClient+ auditLogServiceClient v1connect.AuditLogServiceClient+ serviceAccountServiceClient v1connect.ServiceAccountServiceClient+ workloadIdentityServiceClient v1connect.WorkloadIdentityServiceClientproject *v1pb.Project@@ -300,6 +302,8 @@ func (ctl *controller) start(ctx context.Context, port int) (context.Context, erctl.revisionServiceClient = v1connect.NewRevisionServiceClient(ctl.client, baseURL, interceptors)ctl.groupServiceClient = v1connect.NewGroupServiceClient(ctl.client, baseURL, interceptors)ctl.auditLogServiceClient = v1connect.NewAuditLogServiceClient(ctl.client, baseURL, interceptors)+ ctl.serviceAccountServiceClient = v1connect.NewServiceAccountServiceClient(ctl.client, baseURL, interceptors)+ ctl.workloadIdentityServiceClient = v1connect.NewWorkloadIdentityServiceClient(ctl.client, baseURL, interceptors)if err := ctl.waitForHealthz(ctx); err != nil {return nil, errors.Wrap(err, "failed to wait for healthz")diff --git a/backend/tests/user_test.go b/backend/tests/user_test.goindex a347acca29..cdc55f5f21 100644--- a/backend/tests/user_test.go+++ b/backend/tests/user_test.go@@ -48,11 +48,10 @@ func TestDeleteUser(t *testing.T) {a.Error(err)a.ErrorContains(err, expectErrorMsg)- serviceAccountResp, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{- User: &v1pb.User{- Title: "bot",- UserType: v1pb.UserType_SERVICE_ACCOUNT,- Email: "[email protected]",+ serviceAccountResp, err := ctl.serviceAccountServiceClient.CreateServiceAccount(ctx, connect.NewRequest(&v1pb.CreateServiceAccountRequest{+ ServiceAccountId: "bot",+ ServiceAccount: &v1pb.ServiceAccount{+ Title: "bot",},}))a.NoError(err)diff --git a/backend/utils/member.go b/backend/utils/member.goindex 89a48e74f9..851292372c 100644--- a/backend/utils/member.go+++ b/backend/utils/member.go@@ -182,7 +182,7 @@ func getUserByIdentifier(ctx context.Context, stores *store.Store, identifier, p// GetUserIAMPolicyBindings return the valid bindings for the user.func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *store.UserMessage, policies ...*storepb.IamPolicy) []*storepb.Binding {- userEmailFullName := common.FormatUserEmail(user.Email)+ userMemberName := formatMemberNameByType(user)var bindings []*storepb.Binding@@ -198,7 +198,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *sthasUser = truebreak}- if userEmailFullName == member {+ if userMemberName == member {hasUser = truebreak}@@ -213,7 +213,7 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *stcontinue}for _, member := range group.Payload.Members {- if userEmailFullName == member.Member {+ if userMemberName == member.Member {hasUser = truebreak}@@ -231,8 +231,8 @@ func GetUserIAMPolicyBindings(ctx context.Context, stores *store.Store, user *streturn bindings}-// MemberContainsUser checks if a member (user or group) contains the specified user.-// The member should be in users/{email} or groups/{email} format.+// MemberContainsUser checks if a member (user, service account, workload identity, or group) contains the specified user.+// The member should be in users/{email}, serviceAccounts/{email}, workloadIdentities/{email}, or groups/{email} format.func MemberContainsUser(ctx context.Context, stores *store.Store, member string, user *store.UserMessage) bool {if member == common.AllUsers {return true@@ -248,6 +248,26 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,return memberEmail == user.Email}+ // Check if member is a service account+ if strings.HasPrefix(member, common.ServiceAccountNamePrefix) {+ memberEmail, err := common.GetServiceAccountEmail(member)+ if err != nil {+ slog.Error("failed to parse service account email", slog.String("member", member), log.BBError(err))+ return false+ }+ return memberEmail == user.Email+ }++ // Check if member is a workload identity+ if strings.HasPrefix(member, common.WorkloadIdentityNamePrefix) {+ memberEmail, err := common.GetWorkloadIdentityEmail(member)+ if err != nil {+ slog.Error("failed to parse workload identity email", slog.String("member", member), log.BBError(err))+ return false+ }+ return memberEmail == user.Email+ }+// Check if member is a groupif strings.HasPrefix(member, common.GroupPrefix) {group, err := GetGroupByName(ctx, stores, member)@@ -259,9 +279,9 @@ func MemberContainsUser(ctx context.Context, stores *store.Store, member string,slog.Error("cannot find group", slog.String("group", member))return false}- userEmailFullName := common.FormatUserEmail(user.Email)+ userMemberName := formatMemberNameByType(user)for _, groupMember := range group.Payload.Members {- if userEmailFullName == groupMember.Member {+ if userMemberName == groupMember.Member {return true}}diff --git a/backend/utils/utils.go b/backend/utils/utils.goindex a5075f91b8..0c3b37e3bd 100644--- a/backend/utils/utils.go+++ b/backend/utils/utils.go@@ -90,9 +90,9 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,}updated := false- email := strings.TrimPrefix(grantRequest.User, "users/")- if email == "" {- return errors.New("invalid empty user identifier")+ email, err := extractEmailFromUserIdentifier(grantRequest.User)+ if err != nil {+ return err}newUser, err := stores.GetUserByEmail(ctx, email)if err != nil {@@ -101,6 +101,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,if newUser == nil {return connect.NewError(connect.CodeInternal, errors.Errorf("user %s not found", email))}+ memberName := formatMemberNameByType(newUser)for _, binding := range policyMessage.Policy.Bindings {if binding.Role != grantRequest.Role {continue@@ -113,7 +114,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,continue}// Append- binding.Members = append(binding.Members, common.FormatUserEmail(newUser.Email))+ binding.Members = append(binding.Members, memberName)updated = truebreak}@@ -125,7 +126,7 @@ func UpdateProjectPolicyFromGrantIssue(ctx context.Context, stores *store.Store,condition.Description = fmt.Sprintf("#%d", issue.UID)policyMessage.Policy.Bindings = append(policyMessage.Policy.Bindings, &storepb.Binding{Role: grantRequest.Role,- Members: []string{common.FormatUserEmail(newUser.Email)},+ Members: []string{memberName},Condition: condition,})}@@ -204,3 +205,45 @@ func IsSpaceOrSemicolon(r rune) bool {}return r == ';'}++// extractEmailFromUserIdentifier extracts email from user identifier.+// Supported formats: users/{email}, serviceAccounts/{email}, workloadIdentities/{email}+func extractEmailFromUserIdentifier(identifier string) (string, error) {+ if strings.HasPrefix(identifier, common.UserNamePrefix) {+ email := strings.TrimPrefix(identifier, common.UserNamePrefix)+ if email == "" {+ return "", errors.New("invalid empty user identifier")+ }+ return email, nil+ }+ if strings.HasPrefix(identifier, common.ServiceAccountNamePrefix) {+ email := strings.TrimPrefix(identifier, common.ServiceAccountNamePrefix)+ if email == "" {+ return "", errors.New("invalid empty service account identifier")+ }+ return email, nil+ }+ if strings.HasPrefix(identifier, common.WorkloadIdentityNamePrefix) {+ email := strings.TrimPrefix(identifier, common.WorkloadIdentityNamePrefix)+ if email == "" {+ return "", errors.New("invalid empty workload identity identifier")+ }+ return email, nil+ }+ return "", errors.Errorf("invalid user identifier format: %s", identifier)+}++// formatMemberNameByType returns the appropriate member name format based on user type.+// For regular users: users/{email}+// For service accounts: serviceAccounts/{email}+// For workload identities: workloadIdentities/{email}+func formatMemberNameByType(user *store.UserMessage) string {+ switch user.Type {+ case storepb.PrincipalType_SERVICE_ACCOUNT:+ return common.FormatServiceAccountEmail(user.Email)+ case storepb.PrincipalType_WORKLOAD_IDENTITY:+ return common.FormatWorkloadIdentityEmail(user.Email)+ default:+ return common.FormatUserEmail(user.Email)+ }+}diff --git a/frontend/src/connect/index.ts b/frontend/src/connect/index.tsindex c6c5211cc9..90c3afe577 100644--- a/frontend/src/connect/index.ts+++ b/frontend/src/connect/index.ts@@ -31,7 +31,9 @@ import {import { SheetService } from "@/types/proto-es/v1/sheet_service_pb";import { SQLService } from "@/types/proto-es/v1/sql_service_pb";import { SubscriptionService } from "@/types/proto-es/v1/subscription_service_pb";+import { ServiceAccountService } from "@/types/proto-es/v1/service_account_service_pb";import { UserService } from "@/types/proto-es/v1/user_service_pb";+import { WorkloadIdentityService } from "@/types/proto-es/v1/workload_identity_service_pb";import { WorksheetService } from "@/types/proto-es/v1/worksheet_service_pb";import { WorkspaceService } from "@/types/proto-es/v1/workspace_service_pb";import {@@ -139,6 +141,16 @@ export const sheetServiceClientConnect = createClient(SheetService, transport);export const userServiceClientConnect = createClient(UserService, transport);+export const serviceAccountServiceClientConnect = createClient(+ ServiceAccountService,+ transport+);++export const workloadIdentityServiceClientConnect = createClient(+ WorkloadIdentityService,+ transport+);+export const releaseServiceClientConnect = createClient(ReleaseService,transportdiff --git a/frontend/src/connect/methods.ts b/frontend/src/connect/methods.tsindex 4108cf6f57..3800fcf8b7 100644--- a/frontend/src/connect/methods.ts+++ b/frontend/src/connect/methods.ts@@ -20,11 +20,13 @@ import { ReviewConfigService } from "@/types/proto-es/v1/review_config_service_pimport { RevisionService } from "@/types/proto-es/v1/revision_service_pb";import { RoleService } from "@/types/proto-es/v1/role_service_pb";import { RolloutService } from "@/types/proto-es/v1/rollout_service_pb";+import { ServiceAccountService } from "@/types/proto-es/v1/service_account_service_pb";import { SettingService } from "@/types/proto-es/v1/setting_service_pb";import { SheetService } from "@/types/proto-es/v1/sheet_service_pb";import { SQLService } from "@/types/proto-es/v1/sql_service_pb";import { SubscriptionService } from "@/types/proto-es/v1/subscription_service_pb";import { UserService } from "@/types/proto-es/v1/user_service_pb";+import { WorkloadIdentityService } from "@/types/proto-es/v1/workload_identity_service_pb";import { WorksheetService } from "@/types/proto-es/v1/worksheet_service_pb";import { WorkspaceService } from "@/types/proto-es/v1/workspace_service_pb";@@ -51,11 +53,13 @@ export const ALL_METHODS_WITH_AUDIT = [ReviewConfigService,RoleService,RolloutService,+ ServiceAccountService,SettingService,SheetService,SQLService,SubscriptionService,UserService,+ WorkloadIdentityService,WorksheetService,WorkspaceService,]diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex 80c623ea86..fe0194ff2a 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -4,7 +4,11 @@ import { computedAsync } from "@vueuse/core";import { isEqual, isUndefined, uniq } from "lodash-es";import { defineStore } from "pinia";import { computed, ref } from "vue";-import { userServiceClientConnect } from "@/connect";+import {+ serviceAccountServiceClientConnect,+ userServiceClientConnect,+ workloadIdentityServiceClientConnect,+} from "@/connect";import { silentContextKey } from "@/connect/context-key";import {allUsersUser,@@ -15,6 +19,16 @@ import {userBindingPrefix,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";+import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";+import {+ CreateServiceAccountRequestSchema,+ DeleteServiceAccountRequestSchema,+ GetServiceAccountRequestSchema,+ ListServiceAccountsRequestSchema,+ ServiceAccountSchema,+ UndeleteServiceAccountRequestSchema,+ UpdateServiceAccountRequestSchema,+} from "@/types/proto-es/v1/service_account_service_pb";import type {UpdateUserRequest,User,@@ -27,8 +41,19 @@ import {ListUsersRequestSchema,UndeleteUserRequestSchema,UpdateUserRequestSchema,+ UserSchema,UserType,} from "@/types/proto-es/v1/user_service_pb";+import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";+import {+ CreateWorkloadIdentityRequestSchema,+ DeleteWorkloadIdentityRequestSchema,+ GetWorkloadIdentityRequestSchema,+ ListWorkloadIdentitiesRequestSchema,+ UndeleteWorkloadIdentityRequestSchema,+ UpdateWorkloadIdentityRequestSchema,+ WorkloadIdentitySchema,+} from "@/types/proto-es/v1/workload_identity_service_pb";import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";import { useActuatorV1Store } from "./v1/actuator";import { extractUserId, userNamePrefix } from "./v1/common";@@ -62,6 +87,35 @@ const getListUserFilter = (params: UserFilter) => {return filter.join(" && ");};+const serviceAccountToUser = (sa: ServiceAccount): User => {+ return create(UserSchema, {+ name: `users/${sa.email}`,+ email: sa.email,+ title: sa.title,+ state: sa.state,+ userType: UserType.SERVICE_ACCOUNT,+ serviceKey: sa.serviceKey,+ });+};++const workloadIdentityToUser = (wi: WorkloadIdentity): User => {+ return create(UserSchema, {+ name: `users/${wi.email}`,+ email: wi.email,+ title: wi.title,+ state: wi.state,+ userType: UserType.WORKLOAD_IDENTITY,+ workloadIdentityConfig: wi.workloadIdentityConfig,+ });+};++const extractEmailPrefix = (email: string, suffix: string): string => {+ if (email.endsWith(suffix)) {+ return email.slice(0, -suffix.length);+ }+ return email.split("@")[0];+};+export const useUserStore = defineStore("user", () => {const actuatorStore = useActuatorV1Store();const allUser = computed(() => allUsersUser());@@ -97,23 +151,125 @@ export const useUserStore = defineStore("user", () => {nextPageToken: "",};}- const request = create(ListUsersRequestSchema, {- pageSize: params.pageSize,- pageToken: params.pageToken,- filter: getListUserFilter(params.filter ?? {}),- showDeleted: params.filter?.state === State.DELETED ? true : false,- });- const response = await userServiceClientConnect.listUsers(request);- for (const user of response.users) {- setUser(user);++ const requestedTypes = params.filter?.types ?? [+ UserType.USER,+ UserType.SERVICE_ACCOUNT,+ UserType.WORKLOAD_IDENTITY,+ UserType.SYSTEM_BOT,+ ];+ const showDeleted = params.filter?.state === State.DELETED;+ const allUsers: User[] = [];++ const needsUserService = requestedTypes.some(+ (t) => t === UserType.USER || t === UserType.SYSTEM_BOT+ );+ const needsServiceAccountService = requestedTypes.includes(+ UserType.SERVICE_ACCOUNT+ );+ const needsWorkloadIdentityService = requestedTypes.includes(+ UserType.WORKLOAD_IDENTITY+ );++ const promises: Promise<void>[] = [];++ if (needsUserService) {+ const userPromise = (async () => {+ const request = create(ListUsersRequestSchema, {+ pageSize: params.pageSize,+ pageToken: params.pageToken,+ filter: getListUserFilter(params.filter ?? {}),+ showDeleted,+ });+ const response = await userServiceClientConnect.listUsers(request);+ for (const user of response.users) {+ setUser(user);+ allUsers.push(user);+ }+ })();+ promises.push(userPromise);+ }++ if (needsServiceAccountService) {+ const saPromise = (async () => {+ const request = create(ListServiceAccountsRequestSchema, {+ pageSize: params.pageSize,+ pageToken: params.pageToken,+ showDeleted,+ });+ const response =+ await serviceAccountServiceClientConnect.listServiceAccounts(request);+ for (const sa of response.serviceAccounts) {+ const user = serviceAccountToUser(sa);+ setUser(user);+ allUsers.push(user);+ }+ })();+ promises.push(saPromise);+ }++ if (needsWorkloadIdentityService) {+ const wiPromise = (async () => {+ const request = create(ListWorkloadIdentitiesRequestSchema, {+ pageSize: params.pageSize,+ pageToken: params.pageToken,+ showDeleted,+ });+ const response =+ await workloadIdentityServiceClientConnect.listWorkloadIdentities(+ request+ );+ for (const wi of response.workloadIdentities) {+ const user = workloadIdentityToUser(wi);+ setUser(user);+ allUsers.push(user);+ }+ })();+ promises.push(wiPromise);}++ await Promise.all(promises);+return {- users: response.users,- nextPageToken: response.nextPageToken,+ users: allUsers,+ nextPageToken: "",};};const fetchUser = async (name: string, silent = false) => {+ const email = extractUserId(name);++ if (+ email.endsWith("@service.bytebase.com") ||+ email.includes(".service.bytebase.com")+ ) {+ const request = create(GetServiceAccountRequestSchema, {+ name: `serviceAccounts/${email}`,+ });+ const response =+ await serviceAccountServiceClientConnect.getServiceAccount(request, {+ contextValues: createContextValues().set(silentContextKey, silent),+ });+ return setUser(serviceAccountToUser(response));+ }++ if (+ email.endsWith("@workload.bytebase.com") ||+ email.includes(".workload.bytebase.com")+ ) {+ const request = create(GetWorkloadIdentityRequestSchema, {+ name: `workloadIdentities/${email}`,+ });+ const response =+ await workloadIdentityServiceClientConnect.getWorkloadIdentity(+ request,+ {+ contextValues: createContextValues().set(silentContextKey, silent),+ }+ );+ return setUser(workloadIdentityToUser(response));+ }+const request = create(GetUserRequestSchema, {name,});@@ -124,10 +280,46 @@ export const useUserStore = defineStore("user", () => {};const createUser = async (user: User) => {- const request = create(CreateUserRequestSchema, {- user: user,- });- const response = await userServiceClientConnect.createUser(request);+ let response: User;++ if (user.userType === UserType.SERVICE_ACCOUNT) {+ const serviceAccountId = extractEmailPrefix(+ user.email,+ "@service.bytebase.com"+ );+ const request = create(CreateServiceAccountRequestSchema, {+ serviceAccountId,+ serviceAccount: create(ServiceAccountSchema, {+ title: user.title,+ }),+ });+ const sa =+ await serviceAccountServiceClientConnect.createServiceAccount(request);+ response = serviceAccountToUser(sa);+ } else if (user.userType === UserType.WORKLOAD_IDENTITY) {+ const workloadIdentityId = extractEmailPrefix(+ user.email,+ "@workload.bytebase.com"+ );+ const request = create(CreateWorkloadIdentityRequestSchema, {+ workloadIdentityId,+ workloadIdentity: create(WorkloadIdentitySchema, {+ title: user.title,+ workloadIdentityConfig: user.workloadIdentityConfig,+ }),+ });+ const wi =+ await workloadIdentityServiceClientConnect.createWorkloadIdentity(+ request+ );+ response = workloadIdentityToUser(wi);+ } else {+ const request = create(CreateUserRequestSchema, {+ user: user,+ });+ response = await userServiceClientConnect.createUser(request);+ }+await actuatorStore.fetchServerInfo();return setUser(response);};@@ -138,14 +330,51 @@ export const useUserStore = defineStore("user", () => {if (!originData) {throw new Error(`user with name ${name} not found`);}- const request = create(UpdateUserRequestSchema, {- user: updateUserRequest.user,- updateMask: updateUserRequest.updateMask,- otpCode: updateUserRequest.otpCode,- regenerateTempMfaSecret: updateUserRequest.regenerateTempMfaSecret,- regenerateRecoveryCodes: updateUserRequest.regenerateRecoveryCodes,- });- const response = await userServiceClientConnect.updateUser(request);++ let response: User;+ const updateMaskPaths = updateUserRequest.updateMask?.paths ?? [];++ if (+ originData.userType === UserType.SERVICE_ACCOUNT &&+ updateMaskPaths.includes("service_key")+ ) {+ const request = create(UpdateServiceAccountRequestSchema, {+ serviceAccount: create(ServiceAccountSchema, {+ name: `serviceAccounts/${originData.email}`,+ title: updateUserRequest.user?.title ?? originData.title,+ }),+ updateMask: updateUserRequest.updateMask,+ });+ const sa =+ await serviceAccountServiceClientConnect.updateServiceAccount(request);+ response = serviceAccountToUser(sa);+ } else if (originData.userType === UserType.WORKLOAD_IDENTITY) {+ const request = create(UpdateWorkloadIdentityRequestSchema, {+ workloadIdentity: create(WorkloadIdentitySchema, {+ name: `workloadIdentities/${originData.email}`,+ title: updateUserRequest.user?.title ?? originData.title,+ workloadIdentityConfig:+ updateUserRequest.user?.workloadIdentityConfig ??+ originData.workloadIdentityConfig,+ }),+ updateMask: updateUserRequest.updateMask,+ });+ const wi =+ await workloadIdentityServiceClientConnect.updateWorkloadIdentity(+ request+ );+ response = workloadIdentityToUser(wi);+ } else {+ const request = create(UpdateUserRequestSchema, {+ user: updateUserRequest.user,+ updateMask: updateUserRequest.updateMask,+ otpCode: updateUserRequest.otpCode,+ regenerateTempMfaSecret: updateUserRequest.regenerateTempMfaSecret,+ regenerateRecoveryCodes: updateUserRequest.regenerateRecoveryCodes,+ });+ response = await userServiceClientConnect.updateUser(request);+ }+return setUser(response);};@@ -162,20 +391,58 @@ export const useUserStore = defineStore("user", () => {};const archiveUser = async (user: User) => {- const request = create(DeleteUserRequestSchema, {- name: user.name,- });- await userServiceClientConnect.deleteUser(request);+ if (user.userType === UserType.SERVICE_ACCOUNT) {+ const request = create(DeleteServiceAccountRequestSchema, {+ name: `serviceAccounts/${user.email}`,+ });+ await serviceAccountServiceClientConnect.deleteServiceAccount(request);+ } else if (user.userType === UserType.WORKLOAD_IDENTITY) {+ const request = create(DeleteWorkloadIdentityRequestSchema, {+ name: `workloadIdentities/${user.email}`,+ });+ await workloadIdentityServiceClientConnect.deleteWorkloadIdentity(+ request+ );+ } else {+ const request = create(DeleteUserRequestSchema, {+ name: user.name,+ });+ await userServiceClientConnect.deleteUser(request);+ }+user.state = State.DELETED;await actuatorStore.fetchServerInfo();return user;};const restoreUser = async (user: User) => {- const request = create(UndeleteUserRequestSchema, {- name: user.name,- });- const response = await userServiceClientConnect.undeleteUser(request);+ let response: User;++ if (user.userType === UserType.SERVICE_ACCOUNT) {+ const request = create(UndeleteServiceAccountRequestSchema, {+ name: `serviceAccounts/${user.email}`,+ });+ const sa =+ await serviceAccountServiceClientConnect.undeleteServiceAccount(+ request+ );+ response = serviceAccountToUser(sa);+ } else if (user.userType === UserType.WORKLOAD_IDENTITY) {+ const request = create(UndeleteWorkloadIdentityRequestSchema, {+ name: `workloadIdentities/${user.email}`,+ });+ const wi =+ await workloadIdentityServiceClientConnect.undeleteWorkloadIdentity(+ request+ );+ response = workloadIdentityToUser(wi);+ } else {+ const request = create(UndeleteUserRequestSchema, {+ name: user.name,+ });+ response = await userServiceClientConnect.undeleteUser(request);+ }+await actuatorStore.fetchServerInfo();return setUser(response);};@@ -198,16 +465,97 @@ export const useUserStore = defineStore("user", () => {);}+ const regularUsers: string[] = [];+ const serviceAccountEmails: string[] = [];+ const workloadIdentityEmails: string[] = [];++ for (const name of pendingFetch) {+ const email = extractUserId(name);+ if (+ email.endsWith("@service.bytebase.com") ||+ email.includes(".service.bytebase.com")+ ) {+ serviceAccountEmails.push(email);+ } else if (+ email.endsWith("@workload.bytebase.com") ||+ email.includes(".workload.bytebase.com")+ ) {+ workloadIdentityEmails.push(email);+ } else {+ regularUsers.push(name);+ }+ }+try {- const request = create(BatchGetUsersRequestSchema, {- names: pendingFetch,- });- const response = await userServiceClientConnect.batchGetUsers(request, {- contextValues: createContextValues().set(silentContextKey, true),- });- for (const user of response.users) {- setUser(user);+ const promises: Promise<void>[] = [];++ if (regularUsers.length > 0) {+ const userPromise = (async () => {+ const request = create(BatchGetUsersRequestSchema, {+ names: regularUsers,+ });+ const response = await userServiceClientConnect.batchGetUsers(+ request,+ {+ contextValues: createContextValues().set(silentContextKey, true),+ }+ );+ for (const user of response.users) {+ setUser(user);+ }+ })();+ promises.push(userPromise);}++ for (const email of serviceAccountEmails) {+ const saPromise = (async () => {+ try {+ const request = create(GetServiceAccountRequestSchema, {+ name: `serviceAccounts/${email}`,+ });+ const response =+ await serviceAccountServiceClientConnect.getServiceAccount(+ request,+ {+ contextValues: createContextValues().set(+ silentContextKey,+ true+ ),+ }+ );+ setUser(serviceAccountToUser(response));+ } catch {+ // Ignore errors for individual fetches+ }+ })();+ promises.push(saPromise);+ }++ for (const email of workloadIdentityEmails) {+ const wiPromise = (async () => {+ try {+ const request = create(GetWorkloadIdentityRequestSchema, {+ name: `workloadIdentities/${email}`,+ });+ const response =+ await workloadIdentityServiceClientConnect.getWorkloadIdentity(+ request,+ {+ contextValues: createContextValues().set(+ silentContextKey,+ true+ ),+ }+ );+ setUser(workloadIdentityToUser(response));+ } catch {+ // Ignore errors for individual fetches+ }+ })();+ promises.push(wiPromise);+ }++ await Promise.all(promises);} finally {return validList.map((name) => getUserByIdentifier(name) ?? unknownUser(name)diff --git a/frontend/src/types/proto-es/v1/iam_policy_pb.d.ts b/frontend/src/types/proto-es/v1/iam_policy_pb.d.tsindex e4e9cfee92..9d6af12253 100644--- a/frontend/src/types/proto-es/v1/iam_policy_pb.d.ts+++ b/frontend/src/types/proto-es/v1/iam_policy_pb.d.ts@@ -116,6 +116,8 @@ export declare type Binding = Message<"bytebase.v1.Binding"> & {* Specifies the principals requesting access for a Bytebase resource.* For users, the member should be: user:{email}* For groups, the member should be: group:{email}+ * For service accounts, the member should be: serviceAccount:{email}+ * For workload identities, the member should be: workloadIdentity:{email}** @generated from field: repeated string members = 2;*/diff --git a/frontend/src/types/v1/user.ts b/frontend/src/types/v1/user.tsindex 4c70712dc6..839eb36d47 100644--- a/frontend/src/types/v1/user.ts+++ b/frontend/src/types/v1/user.ts@@ -52,6 +52,18 @@ export const getGroupEmailInBinding = (email: string) => {return `${groupBindingPrefix}${email}`;};+export const serviceAccountBindingPrefix = "serviceAccount:";++export const getServiceAccountEmailInBinding = (email: string) => {+ return `${serviceAccountBindingPrefix}${email}`;+};++export const workloadIdentityBindingPrefix = "workloadIdentity:";++export const getWorkloadIdentityNameInBinding = (name: string) => {+ return `${workloadIdentityBindingPrefix}${name}`;+};+export const isValidUserName = (name: string) => {return (!!name &&diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex fea542026b..9723916205 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -11824,6 +11824,8 @@ components:Specifies the principals requesting access for a Bytebase resource.For users, the member should be: user:{email}For groups, the member should be: group:{email}+ For service accounts, the member should be: serviceAccount:{email}+ For workload identities, the member should be: workloadIdentity:{email}condition:title: conditiondescription: |-diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 9c5413f294..764fb19f76 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -2752,7 +2752,7 @@ Binding associates members with a role and optional conditions.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- || role | [string](#string) | | The role that is assigned to the members. Format: roles/{role} |-| members | [string](#string) | repeated | Specifies the principals requesting access for a Bytebase resource. For users, the member should be: user:{email} For groups, the member should be: group:{email} |+| members | [string](#string) | repeated | Specifies the principals requesting access for a Bytebase resource. For users, the member should be: user:{email} For groups, the member should be: group:{email} For service accounts, the member should be: serviceAccount:{email} For workload identities, the member should be: workloadIdentity:{email} || condition | [google.type.Expr](#google-type-Expr) | | The condition that is associated with this binding, only used in the project IAM policy. If the condition evaluates to true, then this binding applies to the current request. If the condition evaluates to false, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. The syntax and semantics of CEL are documented at https://github.com/google/cel-specSupport variables: resource.database: the database full name in "instances/{instance}/databases/{database}" format, used by the "roles/sqlEditorUser" role, support "==" operator. resource.schema_name: the schema name, used by the "roles/sqlEditorUser" role, support "==" operator. resource.table_name: the table name, used by the "roles/sqlEditorUser" role, support "==" operator. request.time: the expiration. Only support "<" operation in `request.time < timestamp("{ISO datetime string format}")`.diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 0f2fcaf2a9..1acbd9dda5 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -8296,7 +8296,9 @@ Format: roles/{role} </p></td><td>repeated</td><td><p>Specifies the principals requesting access for a Bytebase resource.For users, the member should be: user:{email}-For groups, the member should be: group:{email} </p></td>+For groups, the member should be: group:{email}+For service accounts, the member should be: serviceAccount:{email}+For workload identities, the member should be: workloadIdentity:{email} </p></td></tr><tr>diff --git a/proto/v1/v1/iam_policy.proto b/proto/v1/v1/iam_policy.protoindex 1605e0b4f6..5edd7b7b88 100644--- a/proto/v1/v1/iam_policy.proto+++ b/proto/v1/v1/iam_policy.proto@@ -57,6 +57,8 @@ message Binding {// Specifies the principals requesting access for a Bytebase resource.// For users, the member should be: user:{email}// For groups, the member should be: group:{email}+ // For service accounts, the member should be: serviceAccount:{email}+ // For workload identities, the member should be: workloadIdentity:{email}repeated string members = 2;// The condition that is associated with this binding, only used in the project IAM policy.