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: block self-approval when ALL_USERS is in approval candidates (#19143)
Kazumasa Hiratad39050b0c9c5
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.goindex 49950a97aa..d53e70ec88 100644--- a/backend/api/v1/issue_service.go+++ b/backend/api/v1/issue_service.go@@ -612,6 +612,10 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot approve because the user does not have the required permission"))}+ if !project.Setting.GetAllowSelfApproval() && issue.CreatorEmail == user.Email {+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot approve because self-approval is not allowed for this project"))+ }+payload.Approval.Approvers = append(payload.Approval.Approvers, &storepb.IssuePayloadApproval_Approver{Status: storepb.IssuePayloadApproval_Approver_APPROVED,Principal: common.FormatUserEmail(user.Email),@@ -713,6 +717,11 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1pif !canApprove {return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot reject because the user does not have the required permission"))}++ if !project.Setting.GetAllowSelfApproval() && issue.CreatorEmail == user.Email {+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot reject because self-approval is not allowed for this project"))+ }+payload.Approval.Approvers = append(payload.Approval.Approvers, &storepb.IssuePayloadApproval_Approver{Status: storepb.IssuePayloadApproval_Approver_REJECTED,Principal: common.FormatUserEmail(user.Email),diff --git a/backend/tests/approval_test.go b/backend/tests/approval_test.goindex 2ef95e14b2..dfecd244c6 100644--- a/backend/tests/approval_test.go+++ b/backend/tests/approval_test.go@@ -11,6 +11,7 @@ import ("github.com/google/uuid""github.com/stretchr/testify/require""google.golang.org/genproto/googleapis/type/expr"+ "google.golang.org/protobuf/types/known/fieldmaskpb"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")@@ -771,3 +772,210 @@ func TestSourceSpecificRuleTakesPriorityOverFallback(t *testing.T) {a.Equal("Source Specific Rule (should be used)", issue.GetApprovalTemplate().GetTitle(),"Source-specific rule should take priority over fallback even when fallback is first in list")}++// TestSelfApprovalBlocked tests that when a project has allowSelfApproval disabled,+// the issue creator cannot approve or reject their own issue, but another eligible user can.+func TestSelfApprovalBlocked(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}++ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ // Create a dedicated project (initially with self-approval enabled for database creation)+ projectID := generateRandomString("self-approval-test")+ projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{+ Project: &v1pb.Project{+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,+ },+ ProjectId: projectID,+ }))+ a.NoError(err)+ project := projectResp.Msg++ // Create instance+ instanceDir := t.TempDir()+ instanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("inst"),+ Instance: &v1pb.Instance{+ Title: "Prod Instance",+ Engine: v1pb.Engine_SQLITE,+ Environment: stringPtr("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{+ Type: v1pb.DataSourceType_ADMIN,+ Host: instanceDir,+ Id: "admin",+ }},+ },+ }))+ a.NoError(err)++ // Create database in the dedicated project+ dbName := generateRandomString("db")+ err = ctl.createDatabase(ctx, project, instanceResp.Msg, nil, dbName, "")+ a.NoError(err)++ // Now disable self-approval for the test+ _, err = ctl.projectServiceClient.UpdateProject(ctx, connect.NewRequest(&v1pb.UpdateProjectRequest{+ Project: &v1pb.Project{+ Name: project.Name,+ AllowSelfApproval: false,+ },+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"allow_self_approval"}},+ }))+ a.NoError(err)++ // Create approval rule requiring projectOwner for this project+ _, err = ctl.settingServiceClient.UpdateSetting(ctx, connect.NewRequest(&v1pb.UpdateSettingRequest{+ AllowMissing: true,+ Setting: &v1pb.Setting{+ Name: "settings/WORKSPACE_APPROVAL",+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{+ Rules: []*v1pb.WorkspaceApprovalSetting_Rule{+ {+ Source: v1pb.WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED,+ Condition: &expr.Expr{+ Expression: fmt.Sprintf(`resource.project_id == "%s"`, projectID),+ },+ Template: &v1pb.ApprovalTemplate{+ Title: "Project Owner Approval",+ Flow: &v1pb.ApprovalFlow{+ Roles: []string{"roles/projectOwner"},+ },+ },+ },+ },+ },+ },+ },+ },+ }))+ a.NoError(err)++ // [email protected] creates the issue (already has projectOwner role as project creator)+ sheet, err := ctl.sheetServiceClient.CreateSheet(ctx, connect.NewRequest(&v1pb.CreateSheetRequest{+ Parent: project.Name,+ Sheet: &v1pb.Sheet{+ Content: []byte("CREATE TABLE self_approval_test (id INTEGER PRIMARY KEY);"),+ },+ }))+ a.NoError(err)++ planResp, err := ctl.planServiceClient.CreatePlan(ctx, connect.NewRequest(&v1pb.CreatePlanRequest{+ Parent: project.Name,+ Plan: &v1pb.Plan{+ Title: "Self Approval Test Plan",+ Specs: []*v1pb.Plan_Spec{{+ Id: uuid.NewString(),+ Config: &v1pb.Plan_Spec_ChangeDatabaseConfig{+ ChangeDatabaseConfig: &v1pb.Plan_ChangeDatabaseConfig{+ Targets: []string{fmt.Sprintf("%s/databases/%s", instanceResp.Msg.Name, dbName)},+ Sheet: sheet.Msg.Name,+ },+ },+ }},+ },+ }))+ a.NoError(err)++ issueResp, err := ctl.issueServiceClient.CreateIssue(ctx, connect.NewRequest(&v1pb.CreateIssueRequest{+ Parent: project.Name,+ Issue: &v1pb.Issue{+ Title: "Self Approval Test Issue",+ Type: v1pb.Issue_DATABASE_CHANGE,+ Description: "Testing self-approval is blocked",+ Plan: planResp.Msg.Name,+ },+ }))+ a.NoError(err)++ // Wait for approval finding to complete+ var issue *v1pb.Issue+ for i := 0; i < 5; i++ {+ if i > 0 {+ time.Sleep(3 * time.Second)+ }+ issueGetResp, err := ctl.issueServiceClient.GetIssue(ctx, connect.NewRequest(&v1pb.GetIssueRequest{+ Name: issueResp.Msg.Name,+ }))+ a.NoError(err)+ issue = issueGetResp.Msg+ if issue.ApprovalStatus != v1pb.Issue_CHECKING {+ break+ }+ }+ a.NotNil(issue)+ a.Equal(v1pb.Issue_PENDING, issue.ApprovalStatus)++ // Try to approve as creator (should fail due to self-approval restriction)+ _, err = ctl.issueServiceClient.ApproveIssue(ctx, connect.NewRequest(&v1pb.ApproveIssueRequest{+ Name: issue.Name,+ }))+ a.Error(err, "Self-approval should be blocked")+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ // Try to reject as creator (should fail due to self-approval restriction)+ _, err = ctl.issueServiceClient.RejectIssue(ctx, connect.NewRequest(&v1pb.RejectIssueRequest{+ Name: issue.Name,+ }))+ a.Error(err, "Self-reject should be blocked")+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ // Create another project owner who can approve+ approverEmail := fmt.Sprintf("approver-%[email protected]", projectID)+ approverPassword := "1024bytebase"+ _, err = ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{+ User: &v1pb.User{+ Email: approverEmail,+ Password: approverPassword,+ Title: "Approver",+ UserType: v1pb.UserType_USER,+ },+ }))+ a.NoError(err)++ // Grant approver projectOwner role via project IAM+ approverPolicyResp, err := ctl.projectServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{+ Resource: project.Name,+ }))+ a.NoError(err)+ approverPolicy := approverPolicyResp.Msg+ approverPolicy.Bindings = append(approverPolicy.Bindings, &v1pb.Binding{+ Role: "roles/projectOwner",+ Members: []string{fmt.Sprintf("user:%s", approverEmail)},+ })+ _, err = ctl.projectServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{+ Resource: project.Name,+ Policy: approverPolicy,+ }))+ a.NoError(err)++ // Login as approver+ loginResp, err := ctl.authServiceClient.Login(ctx, connect.NewRequest(&v1pb.LoginRequest{+ Email: approverEmail,+ Password: approverPassword,+ }))+ a.NoError(err)+ ctl.authInterceptor.token = loginResp.Msg.Token++ // Approve as different user (should succeed)+ _, err = ctl.issueServiceClient.ApproveIssue(ctx, connect.NewRequest(&v1pb.ApproveIssueRequest{+ Name: issue.Name,+ }))+ a.NoError(err, "Approval by different user should succeed")++ // Verify the issue is now approved+ issueGetResp, err := ctl.issueServiceClient.GetIssue(ctx, connect.NewRequest(&v1pb.GetIssueRequest{+ Name: issue.Name,+ }))+ a.NoError(err)+ a.Equal(v1pb.Issue_APPROVED, issueGetResp.Msg.ApprovalStatus)+}diff --git a/backend/tests/gitops_test.go b/backend/tests/gitops_test.goindex d46561b5f2..3a377ce9f1 100644--- a/backend/tests/gitops_test.go+++ b/backend/tests/gitops_test.go@@ -26,8 +26,9 @@ func TestGitOpsCheck(t *testing.T) {projectID := generateRandomString("gitops-check")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -159,8 +160,9 @@ func TestGitOpsRollout(t *testing.T) {projectID := generateRandomString("gitops-rollout")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -324,8 +326,9 @@ func TestGitOpsRolloutMultiTarget(t *testing.T) {projectID := generateRandomString("gitops-multi")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -571,8 +574,9 @@ func TestGitOpsCheckAppliedButChanged(t *testing.T) {projectID := generateRandomString("gitops-changed")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -777,8 +781,9 @@ func TestGitOpsCheckDeclarative(t *testing.T) {projectID := generateRandomString("gitops-decl")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -917,8 +922,9 @@ ALTER TABLE public.users ADD COLUMN name VARCHAR(255);`,projectID := generateRandomString("gitops-disallow")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -1064,8 +1070,9 @@ func TestGitOpsCheckVersionedDependency(t *testing.T) {projectID := generateRandomString("gitops-dep")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))@@ -1193,8 +1200,9 @@ func TestGitOpsCheckDeclarativeMultipleFiles(t *testing.T) {projectID := generateRandomString("gitops-multi-decl")projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Name: fmt.Sprintf("projects/%s", projectID),- Title: projectID,+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))diff --git a/backend/tests/tenant_test.go b/backend/tests/tenant_test.goindex b6c05df66f..a9908da50c 100644--- a/backend/tests/tenant_test.go+++ b/backend/tests/tenant_test.go@@ -44,7 +44,11 @@ func TestTenantBackfill(t *testing.T) {projectID := generateRandomString("project")project, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{- Project: &v1pb.Project{Name: fmt.Sprintf("projects/%s", projectID), Title: projectID},+ Project: &v1pb.Project{+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ AllowSelfApproval: true,+ },ProjectId: projectID,}))a.NoError(err)diff --git a/backend/tests/tests.go b/backend/tests/tests.goindex f523c6c515..81955dc786 100644--- a/backend/tests/tests.go+++ b/backend/tests/tests.go@@ -204,7 +204,8 @@ func (ctl *controller) StartServerWithExternalPg(ctx context.Context) (context.CprojectID := "test-project"resp, err := ctl.projectServiceClient.CreateProject(metaCtx, connect.NewRequest(&v1pb.CreateProjectRequest{Project: &v1pb.Project{- Title: projectID,+ Title: projectID,+ AllowSelfApproval: true,},ProjectId: projectID,}))diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/registry/context.ts b/frontend/src/components/Plan/components/HeaderSection/Actions/registry/context.tsindex fea0691dfd..3d5220a6d2 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/registry/context.ts+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/registry/context.ts@@ -47,7 +47,8 @@ export interface ContextBuilderInput {function computeIsApprovalCandidate(issue: Issue | undefined,- currentUser: User+ currentUser: User,+ project: Project): boolean {if (!issue) return false;@@ -77,7 +78,16 @@ function computeIsApprovalCandidate(if (!currentRole) return false;const candidates = candidatesOfApprovalStepV1(issue, currentRole);- return isUserIncludedInList(currentUser.email, candidates);+ if (!isUserIncludedInList(currentUser.email, candidates)) return false;++ // Block self-approval even when matched via ALL_USERS+ if (+ !project.allowSelfApproval &&+ currentUser.email === extractUserId(issue.creator)+ ) {+ return false;+ }+ return true;}function computeExportArchiveReady(@@ -184,7 +194,11 @@ export function buildActionContext(input: ContextBuilderInput): ActionContext {(issue ? currentUserEmail === extractUserId(issue.creator) : false);// Compute permissions- const isApprovalCandidate = computeIsApprovalCandidate(issue, currentUser);+ const isApprovalCandidate = computeIsApprovalCandidate(+ issue,+ currentUser,+ project+ );const permissions: ActionPermissions = {updatePlan:currentUserEmail === extractUserId(plan.creator || "") ||