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: add risk.level as approval flow CEL factor (#18373)
p0nybdd70177bf2d
diff --git a/backend/common/cel.go b/backend/common/cel.goindex e9fdbfa791..98e61081ec 100644--- a/backend/common/cel.go+++ b/backend/common/cel.go@@ -33,6 +33,8 @@ var ApprovalFactors = []cel.EnvOption{// Request scopecel.Variable(CELAttributeRequestExpirationDays, cel.IntType),cel.Variable(CELAttributeRequestRole, cel.StringType),+ // Risk scope+ cel.Variable(CELAttributeRiskLevel, cel.StringType),// Size limitcel.ParserExpressionSizeLimit(celLimit),}diff --git a/backend/common/cel_attributes.go b/backend/common/cel_attributes.goindex 3f60eb66d4..65b653376a 100644--- a/backend/common/cel_attributes.go+++ b/backend/common/cel_attributes.go@@ -49,6 +49,12 @@ const (CELAttributeRequestTime = "request.time")+// CEL attribute names for risk scope.+const (+ // CELAttributeRiskLevel is the risk level of the issue (LOW, MODERATE, HIGH).+ CELAttributeRiskLevel = "risk.level"+)+// CEL attribute names for approval scope (deprecated, kept for backward compatibility).const (// CELAttributeLevel is the risk level (deprecated).diff --git a/backend/common/cel_test.go b/backend/common/cel_test.goindex cf41bd595a..b459cd44aa 100644--- a/backend/common/cel_test.go+++ b/backend/common/cel_test.go@@ -188,3 +188,36 @@ func TestValidateFallbackApprovalExpr(t *testing.T) {})}}++func TestApprovalFactorsIncludesRiskLevel(t *testing.T) {+ a := require.New(t)++ // Create env with approval factors+ e, err := cel.NewEnv(ApprovalFactors...)+ a.NoError(err)++ // risk.level should compile with equality operator+ _, issues := e.Compile(`risk.level == "HIGH"`)+ a.Nil(issues)++ // risk.level should compile with in operator+ _, issues = e.Compile(`risk.level in ["HIGH", "MODERATE"]`)+ a.Nil(issues)++ // risk.level combined with other factors should compile+ _, issues = e.Compile(`risk.level == "HIGH" && resource.environment_id == "prod"`)+ a.Nil(issues)+}++func TestFallbackFactorsDoNotIncludeRiskLevel(t *testing.T) {+ a := require.New(t)++ // Create env with fallback factors+ e, err := cel.NewEnv(FallbackApprovalFactors...)+ a.NoError(err)++ // risk.level should NOT compile in fallback factors+ _, issues := e.Compile(`risk.level == "HIGH"`)+ a.NotNil(issues)+ a.Error(issues.Err())+}diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex ab757c2ef9..fcc464265a 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -155,7 +155,15 @@ func (r *Runner) findApprovalTemplateForIssue(ctx context.Context, issue *store.return nil, nil, false, nil}- // Step 3: Find matching approval template+ // Step 3: Inject risk level into CEL variables for CHANGE_DATABASE issues+ // Risk level is calculated from statement types and injected so approval rules+ // can use conditions like: risk_level == "HIGH"+ if approvalSource == storepb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE {+ riskLevel := calculateRiskLevelFromCELVars(celVarsList)+ injectRiskLevelIntoCELVars(celVarsList, riskLevel)+ }++ // Step 4: Find matching approval templateapprovalTemplate, err := getApprovalTemplate(approvalSetting, approvalSource, celVarsList)if err != nil {return nil, nil, false, errors.Wrapf(err, "failed to get approval template for source: %v", approvalSource)@@ -274,6 +282,29 @@ func calculateRiskLevelFromCELVars(celVarsList []map[string]any) storepb.RiskLevreturn common.GetRiskLevelFromStatementTypes(statementTypes)}+// injectRiskLevelIntoCELVars adds the risk level to all CEL variable maps.+// This allows approval rules to use conditions like: risk_level == "HIGH"+func injectRiskLevelIntoCELVars(celVarsList []map[string]any, riskLevel storepb.RiskLevel) {+ riskLevelStr := riskLevelToString(riskLevel)+ for _, celVars := range celVarsList {+ celVars[common.CELAttributeRiskLevel] = riskLevelStr+ }+}++// riskLevelToString converts a RiskLevel enum to its string representation for CEL.+func riskLevelToString(level storepb.RiskLevel) string {+ switch level {+ case storepb.RiskLevel_LOW:+ return "LOW"+ case storepb.RiskLevel_MODERATE:+ return "MODERATE"+ case storepb.RiskLevel_HIGH:+ return "HIGH"+ default:+ return "LOW"+ }+}+// getApprovalTemplate finds the first matching approval template for the given source and CEL variables.// Uses two-phase matching:// Phase 1: Try source-specific rules (filtered by riskSource)diff --git a/backend/runner/approval/runner_test.go b/backend/runner/approval/runner_test.gonew file mode 100644index 0000000000..239df85f3d--- /dev/null+++ b/backend/runner/approval/runner_test.go@@ -0,0 +1,177 @@+package approval++import (+ "testing"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/common"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+)++func TestRiskLevelToString(t *testing.T) {+ tests := []struct {+ name string+ level storepb.RiskLevel+ want string+ }{+ {+ name: "LOW",+ level: storepb.RiskLevel_LOW,+ want: "LOW",+ },+ {+ name: "MODERATE",+ level: storepb.RiskLevel_MODERATE,+ want: "MODERATE",+ },+ {+ name: "HIGH",+ level: storepb.RiskLevel_HIGH,+ want: "HIGH",+ },+ {+ name: "UNSPECIFIED defaults to LOW",+ level: storepb.RiskLevel_RISK_LEVEL_UNSPECIFIED,+ want: "LOW",+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ a := require.New(t)+ got := riskLevelToString(tt.level)+ a.Equal(tt.want, got)+ })+ }+}++func TestInjectRiskLevelIntoCELVars(t *testing.T) {+ tests := []struct {+ name string+ celVars []map[string]any+ riskLevel storepb.RiskLevel+ wantValue string+ wantLength int+ }{+ {+ name: "inject HIGH into single map",+ celVars: []map[string]any{+ {"resource.environment_id": "prod"},+ },+ riskLevel: storepb.RiskLevel_HIGH,+ wantValue: "HIGH",+ wantLength: 1,+ },+ {+ name: "inject MODERATE into multiple maps",+ celVars: []map[string]any{+ {"resource.environment_id": "prod"},+ {"resource.environment_id": "test"},+ },+ riskLevel: storepb.RiskLevel_MODERATE,+ wantValue: "MODERATE",+ wantLength: 2,+ },+ {+ name: "inject into empty list",+ celVars: []map[string]any{},+ riskLevel: storepb.RiskLevel_LOW,+ wantValue: "LOW",+ wantLength: 0,+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ a := require.New(t)++ injectRiskLevelIntoCELVars(tt.celVars, tt.riskLevel)++ a.Len(tt.celVars, tt.wantLength)+ for _, vars := range tt.celVars {+ riskLevel, ok := vars[common.CELAttributeRiskLevel]+ a.True(ok, "risk.level should be present")+ a.Equal(tt.wantValue, riskLevel)+ }+ })+ }+}++func TestCalculateRiskLevelFromCELVars(t *testing.T) {+ tests := []struct {+ name string+ celVars []map[string]any+ want storepb.RiskLevel+ }{+ {+ name: "nil returns LOW",+ celVars: nil,+ want: storepb.RiskLevel_LOW,+ },+ {+ name: "empty returns LOW",+ celVars: []map[string]any{},+ want: storepb.RiskLevel_LOW,+ },+ {+ name: "SELECT returns LOW",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "SELECT"},+ },+ want: storepb.RiskLevel_LOW,+ },+ {+ name: "UPDATE returns MODERATE",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "UPDATE"},+ },+ want: storepb.RiskLevel_MODERATE,+ },+ {+ name: "DELETE returns MODERATE",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "DELETE"},+ },+ want: storepb.RiskLevel_MODERATE,+ },+ {+ name: "DROP_TABLE returns HIGH",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "DROP_TABLE"},+ },+ want: storepb.RiskLevel_HIGH,+ },+ {+ name: "TRUNCATE returns HIGH",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "TRUNCATE"},+ },+ want: storepb.RiskLevel_HIGH,+ },+ {+ name: "mixed SELECT and DROP_TABLE returns HIGH (highest)",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "SELECT"},+ {common.CELAttributeStatementSQLType: "DROP_TABLE"},+ },+ want: storepb.RiskLevel_HIGH,+ },+ {+ name: "mixed UPDATE and DELETE returns MODERATE",+ celVars: []map[string]any{+ {common.CELAttributeStatementSQLType: "UPDATE"},+ {common.CELAttributeStatementSQLType: "DELETE"},+ },+ want: storepb.RiskLevel_MODERATE,+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ a := require.New(t)+ got := calculateRiskLevelFromCELVars(tt.celVars)+ a.Equal(tt.want, got)+ })+ }+}diff --git a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts b/frontend/src/components/CustomApproval/Settings/components/common/utils.tsindex dc2289e50f..3ccf4466c1 100644--- a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts+++ b/frontend/src/components/CustomApproval/Settings/components/common/utils.ts@@ -40,6 +40,7 @@ import {CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RISK_LEVEL,CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,@@ -173,6 +174,25 @@ const getLevelOptions = () => {}));};+const getRiskLevelOptions = () => {+ // Risk level values as strings for CEL conditions (e.g., risk_level == "HIGH")+ const levels = [+ { label: t("custom-approval.risk-rule.risk.risk-level.low"), value: "LOW" },+ {+ label: t("custom-approval.risk-rule.risk.risk-level.moderate"),+ value: "MODERATE",+ },+ {+ label: t("custom-approval.risk-rule.risk.risk-level.high"),+ value: "HIGH",+ },+ ];+ return levels.map<SelectOption>(({ label, value }) => ({+ label,+ value,+ }));+};+const getSQLTypeOptions = (source: WorkspaceApprovalSetting_Rule_Source) => {const mapOptions = (values: readonly string[]) => {return values.map<SelectOption>((v) => ({@@ -228,6 +248,7 @@ export const ApprovalSourceFactorMap: Map<...commonFactorList,...schemaObjectNameFactorList,...migrationFactorList,+ CEL_ATTRIBUTE_RISK_LEVEL,],],[@@ -315,6 +336,9 @@ export const getApprovalOptionConfigMap = (case CEL_ATTRIBUTE_REQUEST_ROLE:options = getRoleOptions();break;+ case CEL_ATTRIBUTE_RISK_LEVEL:+ options = getRiskLevelOptions();+ break;default:break;}diff --git a/frontend/src/plugins/cel/types/factor.ts b/frontend/src/plugins/cel/types/factor.tsindex 2bbd3d461b..4b5aa83d7d 100644--- a/frontend/src/plugins/cel/types/factor.ts+++ b/frontend/src/plugins/cel/types/factor.ts@@ -13,6 +13,7 @@ import {CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RISK_LEVEL,CEL_ATTRIBUTE_SOURCE,CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,@@ -34,6 +35,7 @@ export const StringFactorList = [// Risk related factorsCEL_ATTRIBUTE_LEVEL,CEL_ATTRIBUTE_SOURCE,+ CEL_ATTRIBUTE_RISK_LEVEL,CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,diff --git a/frontend/src/plugins/cel/types/operator.ts b/frontend/src/plugins/cel/types/operator.tsindex bfd61d947f..c9ade5a1c2 100644--- a/frontend/src/plugins/cel/types/operator.ts+++ b/frontend/src/plugins/cel/types/operator.ts@@ -14,6 +14,7 @@ import {CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RISK_LEVEL,CEL_ATTRIBUTE_SOURCE,CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,@@ -94,6 +95,10 @@ const OperatorList: Record<Factor, Operator[]> = {...EqualityOperatorList,...CollectionOperatorList,]),+ [CEL_ATTRIBUTE_RISK_LEVEL]: uniq([+ ...EqualityOperatorList,+ ...CollectionOperatorList,+ ]),[CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID]: uniq([...EqualityOperatorList,diff --git a/frontend/src/utils/cel-attributes.ts b/frontend/src/utils/cel-attributes.tsindex 785cdeb6b9..2eec11617b 100644--- a/frontend/src/utils/cel-attributes.ts+++ b/frontend/src/utils/cel-attributes.ts@@ -24,6 +24,9 @@ export const CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS = "request.expiration_days";export const CEL_ATTRIBUTE_REQUEST_ROLE = "request.role";export const CEL_ATTRIBUTE_REQUEST_TIME = "request.time";+// CEL attribute names for risk scope.+export const CEL_ATTRIBUTE_RISK_LEVEL = "risk.level";+// CEL attribute names for approval scope (deprecated, kept for backward compatibility).export const CEL_ATTRIBUTE_LEVEL = "level";export const CEL_ATTRIBUTE_SOURCE = "source";