Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: remove masking from approved DATABASE_EXPORT tasks (#18456)

Danny Xubea90ce8cdfe
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index fb0ca1668f..911c9c30c8 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -12569,10 +12569,6 @@ components:
bytebase.v1.MaskingExceptionPolicy.MaskingException:
type: object
properties:
- action:
- title: action
- description: The action that the user can perform on sensitive data.
- $ref: '#/components/schemas/bytebase.v1.MaskingExceptionPolicy.MaskingException.Action'
member:
type: string
title: member
@@ -12604,14 +12600,6 @@ components:
title: MaskingException
additionalProperties: false
description: An exception allowing specific users to access masked data.
- bytebase.v1.MaskingExceptionPolicy.MaskingException.Action:
- type: string
- title: Action
- enum:
- - ACTION_UNSPECIFIED
- - QUERY
- - EXPORT
- description: The action that the exception permits.
bytebase.v1.MaskingReason:
type: object
properties:
diff --git a/backend/api/v1/masking_evaluator_test.go b/backend/api/v1/masking_evaluator_test.go
index e454e8d563..bd9ab9f560 100644
--- a/backend/api/v1/masking_evaluator_test.go
+++ b/backend/api/v1/masking_evaluator_test.go
@@ -131,7 +131,6 @@ func TestEvalMaskingLevelOfColumn(t *testing.T) {
},
filteredMaskingExceptions: []*storepb.MaskingExceptionPolicy_MaskingException{
{
- Action: storepb.MaskingExceptionPolicy_MaskingException_QUERY,
Condition: &expr.Expr{
Expression: `(resource.instance_id == "neon-host") && (resource.database_name == "bb") && (resource.schema_name == "hiring") && (resource.table_name == "employees") && (resource.column_name == "salary")`,
},
diff --git a/backend/api/v1/org_policy_service.go b/backend/api/v1/org_policy_service.go
index 0aa92743a6..32b60bbfb1 100644
--- a/backend/api/v1/org_policy_service.go
+++ b/backend/api/v1/org_policy_service.go
@@ -433,9 +433,6 @@ func validatePolicyPayload(policyType storepb.Policy_Type, policy *v1pb.Policy)
return connect.NewError(connect.CodeInvalidArgument, errors.New("masking exception policy must be set"))
}
for _, exception := range maskingExceptionPolicy.MaskingExceptionPolicy.MaskingExceptions {
- if exception.Action == v1pb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED {
- return connect.NewError(connect.CodeInvalidArgument, errors.New("masking exception must have action set"))
- }
if _, err := common.ValidateMaskingExceptionCELExpr(exception.Condition); err != nil {
return connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid masking exception expression: %v", err))
}
diff --git a/backend/api/v1/org_policy_service_converter.go b/backend/api/v1/org_policy_service_converter.go
index 2501178789..da5245df27 100644
--- a/backend/api/v1/org_policy_service_converter.go
+++ b/backend/api/v1/org_policy_service_converter.go
@@ -158,32 +158,6 @@ func ConvertToSQLReviewRules(rules []*v1pb.SQLReviewRule) ([]*storepb.SQLReviewR
return ruleList, nil
}
-func convertToV1PBAction(action storepb.MaskingExceptionPolicy_MaskingException_Action) v1pb.MaskingExceptionPolicy_MaskingException_Action {
- switch action {
- case storepb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED:
- return v1pb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
- case storepb.MaskingExceptionPolicy_MaskingException_QUERY:
- return v1pb.MaskingExceptionPolicy_MaskingException_QUERY
- case storepb.MaskingExceptionPolicy_MaskingException_EXPORT:
- return v1pb.MaskingExceptionPolicy_MaskingException_EXPORT
- default:
- }
- return v1pb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
-}
-
-func convertToStorePBAction(action v1pb.MaskingExceptionPolicy_MaskingException_Action) storepb.MaskingExceptionPolicy_MaskingException_Action {
- switch action {
- case v1pb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED:
- return storepb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
- case v1pb.MaskingExceptionPolicy_MaskingException_QUERY:
- return storepb.MaskingExceptionPolicy_MaskingException_QUERY
- case v1pb.MaskingExceptionPolicy_MaskingException_EXPORT:
- return storepb.MaskingExceptionPolicy_MaskingException_EXPORT
- default:
- }
- return storepb.MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
-}
-
func convertToV1RolloutPolicyPayload(payloadStr string) (*v1pb.Policy_RolloutPolicy, error) {
p := &v1pb.RolloutPolicy{}
if err := common.ProtojsonUnmarshaler.Unmarshal([]byte(payloadStr), p); err != nil {
@@ -282,7 +256,6 @@ func (s *OrgPolicyService) convertToStorePBMaskingExceptionPolicyPayload(ctx con
return nil, err
}
exceptions = append(exceptions, &storepb.MaskingExceptionPolicy_MaskingException{
- Action: convertToStorePBAction(exception.Action),
Member: member,
Condition: &expr.Expr{
Title: exception.Condition.Title,
@@ -307,7 +280,6 @@ func (s *OrgPolicyService) convertToV1PBMaskingExceptionPolicyPayload(ctx contex
}
exceptions = append(exceptions, &v1pb.MaskingExceptionPolicy_MaskingException{
- Action: convertToV1PBAction(exception.Action),
Member: memberInBinding,
Condition: &expr.Expr{
Title: exception.Condition.Title,
diff --git a/backend/api/v1/predicate_columns_check.go b/backend/api/v1/predicate_columns_check.go
index 88e6af7ed0..37a4d9f180 100644
--- a/backend/api/v1/predicate_columns_check.go
+++ b/backend/api/v1/predicate_columns_check.go
@@ -11,7 +11,7 @@ import (
"github.com/bytebase/bytebase/backend/utils"
)
-func (s *QueryResultMasker) ExtractSensitivePredicateColumns(ctx context.Context, spans []*base.QuerySpan, instance *store.InstanceMessage, user *store.UserMessage, action storepb.MaskingExceptionPolicy_MaskingException_Action) ([][]base.ColumnResource, error) {
+func (s *QueryResultMasker) ExtractSensitivePredicateColumns(ctx context.Context, spans []*base.QuerySpan, instance *store.InstanceMessage, user *store.UserMessage) ([][]base.ColumnResource, error) {
var result [][]base.ColumnResource
classificationSetting, err := s.store.GetDataClassificationSetting(ctx)
@@ -43,7 +43,6 @@ func (s *QueryResultMasker) ExtractSensitivePredicateColumns(ctx context.Context
instance,
span.PredicateColumns,
maskingExceptionPolicyMap,
- action,
user,
)
if err != nil {
@@ -61,7 +60,6 @@ func (s *QueryResultMasker) getSensitiveColumnsForPredicate(
instance *store.InstanceMessage,
predicateColumns base.SourceColumnSet,
maskingExceptionPolicyMap map[string]*storepb.MaskingExceptionPolicy,
- action storepb.MaskingExceptionPolicy_MaskingException_Action,
currentPrincipal *store.UserMessage,
) ([]base.ColumnResource, error) {
if instance != nil && !isPredicateColumnsCheckEnabled(instance.Metadata.GetEngine()) {
@@ -113,10 +111,6 @@ func (s *QueryResultMasker) getSensitiveColumnsForPredicate(
var maskingExceptionContainsCurrentPrincipal []*storepb.MaskingExceptionPolicy_MaskingException
if maskingExceptionPolicy != nil {
for _, maskingException := range maskingExceptionPolicy.MaskingExceptions {
- if maskingException.Action != action {
- continue
- }
-
if utils.MemberContainsUser(ctx, s.store, maskingException.Member, currentPrincipal) {
maskingExceptionContainsCurrentPrincipal = append(maskingExceptionContainsCurrentPrincipal, maskingException)
}
diff --git a/backend/api/v1/query_result_masker.go b/backend/api/v1/query_result_masker.go
index d449a38a30..e186db8184 100644
--- a/backend/api/v1/query_result_masker.go
+++ b/backend/api/v1/query_result_masker.go
@@ -26,7 +26,7 @@ func NewQueryResultMasker(store *store.Store) *QueryResultMasker {
}
// MaskResults masks the result in-place based on the dynamic masking policy, query-span, instance and action.
-func (s *QueryResultMasker) MaskResults(ctx context.Context, spans []*parserbase.QuerySpan, results []*v1pb.QueryResult, instance *store.InstanceMessage, user *store.UserMessage, action storepb.MaskingExceptionPolicy_MaskingException_Action) error {
+func (s *QueryResultMasker) MaskResults(ctx context.Context, spans []*parserbase.QuerySpan, results []*v1pb.QueryResult, instance *store.InstanceMessage, user *store.UserMessage) error {
classificationSetting, err := s.store.GetDataClassificationSetting(ctx)
if err != nil {
return errors.Wrapf(err, "failed to find classification setting")
@@ -63,7 +63,7 @@ func (s *QueryResultMasker) MaskResults(ctx context.Context, spans []*parserbase
if results[i].Error != "" && len(results[i].Rows) == 0 {
continue
}
- maskers, reasons, err := s.getMaskersForQuerySpan(ctx, m, instance, user, spans[i], action)
+ maskers, reasons, err := s.getMaskersForQuerySpan(ctx, m, instance, user, spans[i])
if err != nil {
return errors.Wrapf(err, "failed to get maskers for query span")
}
@@ -119,7 +119,7 @@ func buildSemanticTypeToMaskerMap(ctx context.Context, stores *store.Store) (map
}
// getMaskersForQuerySpan returns the maskers for the query span.
-func (s *QueryResultMasker) getMaskersForQuerySpan(ctx context.Context, m *maskingLevelEvaluator, instance *store.InstanceMessage, user *store.UserMessage, span *parserbase.QuerySpan, action storepb.MaskingExceptionPolicy_MaskingException_Action) ([]masker.Masker, []*v1pb.MaskingReason, error) {
+func (s *QueryResultMasker) getMaskersForQuerySpan(ctx context.Context, m *maskingLevelEvaluator, instance *store.InstanceMessage, user *store.UserMessage, span *parserbase.QuerySpan) ([]masker.Masker, []*v1pb.MaskingReason, error) {
if span == nil {
return nil, nil, nil
}
@@ -145,7 +145,7 @@ func (s *QueryResultMasker) getMaskersForQuerySpan(ctx context.Context, m *maski
var effectiveMaskers []masker.Masker
var effectiveReasons []*MaskingEvaluation
for column := range spanResult.SourceColumns {
- newMasker, reason, err := s.getMaskerForColumnResource(ctx, m, instance, column, maskingExceptionPolicyMap, action, user, semanticTypesToMasker)
+ newMasker, reason, err := s.getMaskerForColumnResource(ctx, m, instance, column, maskingExceptionPolicyMap, user, semanticTypesToMasker)
if err != nil {
return nil, nil, err
}
@@ -220,7 +220,6 @@ func (s *QueryResultMasker) getMaskerForColumnResource(
instance *store.InstanceMessage,
sourceColumn parserbase.ColumnResource,
maskingExceptionPolicyMap map[string]*storepb.MaskingExceptionPolicy,
- action storepb.MaskingExceptionPolicy_MaskingException_Action,
currentPrincipal *store.UserMessage,
semanticTypeToMasker map[string]masker.Masker,
) (masker.Masker, *MaskingEvaluation, error) {
@@ -274,10 +273,6 @@ func (s *QueryResultMasker) getMaskerForColumnResource(
var maskingExceptionContainsCurrentPrincipal []*storepb.MaskingExceptionPolicy_MaskingException
if maskingExceptionPolicy != nil {
for _, maskingException := range maskingExceptionPolicy.MaskingExceptions {
- if maskingException.Action != action {
- continue
- }
-
if utils.MemberContainsUser(ctx, s.store, maskingException.Member, currentPrincipal) {
maskingExceptionContainsCurrentPrincipal = append(maskingExceptionContainsCurrentPrincipal, maskingException)
}
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 89b5d38718..5e3a8d1837 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -249,7 +249,6 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
s.licenseService,
s.accessCheck,
s.schemaSyncer,
- storepb.MaskingExceptionPolicy_MaskingException_QUERY,
)
slog.Debug("query finished",
log.BBError(queryErr),
@@ -472,7 +471,6 @@ func queryRetry(
licenseService *enterprise.LicenseService,
optionalAccessCheck accessCheckFunc,
schemaSyncer *schemasync.Syncer,
- action storepb.MaskingExceptionPolicy_MaskingException_Action,
) ([]*v1pb.QueryResult, []*parserbase.QuerySpan, time.Duration, error) {
var spans []*parserbase.QuerySpan
var sensitivePredicateColumns [][]parserbase.ColumnResource
@@ -509,7 +507,7 @@ func queryRetry(
}
if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
- sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user, action)
+ sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
return nil, nil, time.Duration(0), connect.NewError(connect.CodeInternal, errors.New(err.Error()))
}
@@ -585,7 +583,7 @@ func queryRetry(
}
if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
- sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user, action)
+ sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
return nil, nil, time.Duration(0), connect.NewError(connect.CodeInternal, errors.New(err.Error()))
}
@@ -665,7 +663,7 @@ func queryRetry(
}
} else {
masker := NewQueryResultMasker(stores)
- if err := masker.MaskResults(ctx, spans, results, instance, user, action); err != nil {
+ if err := masker.MaskResults(ctx, spans, results, instance, user); err != nil {
return nil, nil, duration, connect.NewError(connect.CodeInternal, errors.New(err.Error()))
}
@@ -741,13 +739,12 @@ func queryRetryStopOnError(
licenseService *enterprise.LicenseService,
optionalAccessCheck accessCheckFunc,
schemaSyncer *schemasync.Syncer,
- action storepb.MaskingExceptionPolicy_MaskingException_Action,
) ([]*v1pb.QueryResult, []*parserbase.QuerySpan, time.Duration, error) {
// Split the statement into individual SQLs
statements, err := parserbase.SplitMultiSQL(instance.Metadata.GetEngine(), statement)
if err != nil {
// Fall back to executing as a single statement if splitting fails
- return queryRetry(ctx, stores, user, instance, database, driver, conn, statement, queryContext, licenseService, optionalAccessCheck, schemaSyncer, action)
+ return queryRetry(ctx, stores, user, instance, database, driver, conn, statement, queryContext, licenseService, optionalAccessCheck, schemaSyncer)
}
var allResults []*v1pb.QueryResult
@@ -760,7 +757,7 @@ func queryRetryStopOnError(
continue
}
- results, spans, duration, err := queryRetry(ctx, stores, user, instance, database, driver, conn, stmt.Text, queryContext, licenseService, optionalAccessCheck, schemaSyncer, action)
+ results, spans, duration, err := queryRetry(ctx, stores, user, instance, database, driver, conn, stmt.Text, queryContext, licenseService, optionalAccessCheck, schemaSyncer)
totalDuration += duration
if err != nil {
@@ -866,7 +863,7 @@ func (s *SQLService) Export(ctx context.Context, req *connect.Request[v1pb.Expor
if err != nil {
return nil, err
}
- bytes, duration, exportErr := DoExport(ctx, s.store, s.dbFactory, s.licenseService, request, user, instance, database, s.accessCheck, s.schemaSyncer, dataSource)
+ bytes, duration, exportErr := doExport(ctx, s.store, s.dbFactory, s.licenseService, request, user, instance, database, s.accessCheck, s.schemaSyncer, dataSource)
s.createQueryHistory(database, store.QueryHistoryTypeExport, statement, user.Email, duration, exportErr)
@@ -975,8 +972,10 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)
}, nil
}
-// DoExport does the export.
-func DoExport(
+// doExport performs SQL Editor exports with masking applied.
+// This is used for ad-hoc exports where users have the EXPORTER role.
+// For approved DATABASE_EXPORT tasks, see data_export_executor.go which exports without masking.
+func doExport(
ctx context.Context,
stores *store.Store,
dbFactory *dbfactory.DBFactory,
@@ -1042,7 +1041,6 @@ func DoExport(
licenseService,
optionalAccessCheck,
schemaSyncer,
- storepb.MaskingExceptionPolicy_MaskingException_EXPORT,
)
if queryErr != nil {
return nil, duration, queryErr
@@ -1050,7 +1048,7 @@ func DoExport(
if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
- if err := masker.MaskResults(ctx, spans, results, instance, user, storepb.MaskingExceptionPolicy_MaskingException_EXPORT); err != nil {
+ if err := masker.MaskResults(ctx, spans, results, instance, user); err != nil {
return nil, duration, err
}
}
diff --git a/backend/generated-go/store/policy.pb.go b/backend/generated-go/store/policy.pb.go
index ac75c55e44..8d149246d2 100644
--- a/backend/generated-go/store/policy.pb.go
+++ b/backend/generated-go/store/policy.pb.go
@@ -139,55 +139,6 @@ func (Policy_Resource) EnumDescriptor() ([]byte, []int) {
return file_store_policy_proto_rawDescGZIP(), []int{0, 1}
}
-type MaskingExceptionPolicy_MaskingException_Action int32
-
-const (
- MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED MaskingExceptionPolicy_MaskingException_Action = 0
- MaskingExceptionPolicy_MaskingException_QUERY MaskingExceptionPolicy_MaskingException_Action = 1
- MaskingExceptionPolicy_MaskingException_EXPORT MaskingExceptionPolicy_MaskingException_Action = 2
-)
-
-// Enum value maps for MaskingExceptionPolicy_MaskingException_Action.
-var (
- MaskingExceptionPolicy_MaskingException_Action_name = map[int32]string{
- 0: "ACTION_UNSPECIFIED",
- 1: "QUERY",
- 2: "EXPORT",
- }
- MaskingExceptionPolicy_MaskingException_Action_value = map[string]int32{
- "ACTION_UNSPECIFIED": 0,
- "QUERY": 1,
- "EXPORT": 2,
- }
-)
-
-func (x MaskingExceptionPolicy_MaskingException_Action) Enum() *MaskingExceptionPolicy_MaskingException_Action {
- p := new(MaskingExceptionPolicy_MaskingException_Action)
- *p = x
- return p
-}
-
-func (x MaskingExceptionPolicy_MaskingException_Action) String() string {
- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MaskingExceptionPolicy_MaskingException_Action) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[2].Descriptor()
-}
-
-func (MaskingExceptionPolicy_MaskingException_Action) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[2]
-}
-
-func (x MaskingExceptionPolicy_MaskingException_Action) Number() protoreflect.EnumNumber {
- return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MaskingExceptionPolicy_MaskingException_Action.Descriptor instead.
-func (MaskingExceptionPolicy_MaskingException_Action) EnumDescriptor() ([]byte, []int) {
- return file_store_policy_proto_rawDescGZIP(), []int{2, 0, 0}
-}
-
type EnvironmentTierPolicy_EnvironmentTier int32
const (
@@ -221,11 +172,11 @@ func (x EnvironmentTierPolicy_EnvironmentTier) String() string {
}
func (EnvironmentTierPolicy_EnvironmentTier) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[3].Descriptor()
+ return file_store_policy_proto_enumTypes[2].Descriptor()
}
func (EnvironmentTierPolicy_EnvironmentTier) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[3]
+ return &file_store_policy_proto_enumTypes[2]
}
func (x EnvironmentTierPolicy_EnvironmentTier) Number() protoreflect.EnumNumber {
@@ -272,11 +223,11 @@ func (x DataSourceQueryPolicy_Restriction) String() string {
}
func (DataSourceQueryPolicy_Restriction) Descriptor() protoreflect.EnumDescriptor {
- return file_store_policy_proto_enumTypes[4].Descriptor()
+ return file_store_policy_proto_enumTypes[3].Descriptor()
}
func (DataSourceQueryPolicy_Restriction) Type() protoreflect.EnumType {
- return &file_store_policy_proto_enumTypes[4]
+ return &file_store_policy_proto_enumTypes[3]
}
func (x DataSourceQueryPolicy_Restriction) Number() protoreflect.EnumNumber {
@@ -827,8 +778,6 @@ func (x *DataSourceQueryPolicy) GetDisallowDml() bool {
type MaskingExceptionPolicy_MaskingException struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // action is the action by which the user can access sensitive data.
- Action MaskingExceptionPolicy_MaskingException_Action `protobuf:"varint,1,opt,name=action,proto3,enum=bytebase.store.MaskingExceptionPolicy_MaskingException_Action" json:"action,omitempty"`
// Member is the principal who binds to this exception policy instance.
//
// Format: users/{email} or groups/{group email}
@@ -869,13 +818,6 @@ func (*MaskingExceptionPolicy_MaskingException) Descriptor() ([]byte, []int) {
return file_store_policy_proto_rawDescGZIP(), []int{2, 0}
}
-func (x *MaskingExceptionPolicy_MaskingException) GetAction() MaskingExceptionPolicy_MaskingException_Action {
- if x != nil {
- return x.Action
- }
- return MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
-}
-
func (x *MaskingExceptionPolicy_MaskingException) GetMember() string {
if x != nil {
return x.Member
@@ -975,18 +917,12 @@ const file_store_policy_proto_rawDesc = "" +
"\aPROJECT\x10\x03\"C\n" +
"\rRolloutPolicy\x12\x1c\n" +
"\tautomatic\x18\x01 \x01(\bR\tautomatic\x12\x14\n" +
- "\x05roles\x18\x02 \x03(\tR\x05roles\"\xef\x02\n" +
+ "\x05roles\x18\x02 \x03(\tR\x05roles\"\xdd\x01\n" +
"\x16MaskingExceptionPolicy\x12f\n" +
- "\x12masking_exceptions\x18\x01 \x03(\v27.bytebase.store.MaskingExceptionPolicy.MaskingExceptionR\x11maskingExceptions\x1a\xec\x01\n" +
- "\x10MaskingException\x12V\n" +
- "\x06action\x18\x01 \x01(\x0e2>.bytebase.store.MaskingExceptionPolicy.MaskingException.ActionR\x06action\x12\x16\n" +
+ "\x12masking_exceptions\x18\x01 \x03(\v27.bytebase.store.MaskingExceptionPolicy.MaskingExceptionR\x11maskingExceptions\x1a[\n" +
+ "\x10MaskingException\x12\x16\n" +
"\x06member\x18\x04 \x01(\tR\x06member\x12/\n" +
- "\tcondition\x18\x05 \x01(\v2\x11.google.type.ExprR\tcondition\"7\n" +
- "\x06Action\x12\x16\n" +
- "\x12ACTION_UNSPECIFIED\x10\x00\x12\t\n" +
- "\x05QUERY\x10\x01\x12\n" +
- "\n" +
- "\x06EXPORT\x10\x02\"\xcd\x01\n" +
+ "\tcondition\x18\x05 \x01(\v2\x11.google.type.ExprR\tcondition\"\xcd\x01\n" +
"\x11MaskingRulePolicy\x12C\n" +
"\x05rules\x18\x01 \x03(\v2-.bytebase.store.MaskingRulePolicy.MaskingRuleR\x05rules\x1as\n" +
"\vMaskingRule\x12\x0e\n" +
@@ -1039,47 +975,45 @@ func file_store_policy_proto_rawDescGZIP() []byte {
return file_store_policy_proto_rawDescData
}
-var file_store_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
+var file_store_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
var file_store_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_store_policy_proto_goTypes = []any{
- (Policy_Type)(0), // 0: bytebase.store.Policy.Type
- (Policy_Resource)(0), // 1: bytebase.store.Policy.Resource
- (MaskingExceptionPolicy_MaskingException_Action)(0), // 2: bytebase.store.MaskingExceptionPolicy.MaskingException.Action
- (EnvironmentTierPolicy_EnvironmentTier)(0), // 3: bytebase.store.EnvironmentTierPolicy.EnvironmentTier
- (DataSourceQueryPolicy_Restriction)(0), // 4: bytebase.store.DataSourceQueryPolicy.Restriction
- (*Policy)(nil), // 5: bytebase.store.Policy
- (*RolloutPolicy)(nil), // 6: bytebase.store.RolloutPolicy
- (*MaskingExceptionPolicy)(nil), // 7: bytebase.store.MaskingExceptionPolicy
- (*MaskingRulePolicy)(nil), // 8: bytebase.store.MaskingRulePolicy
- (*TagPolicy)(nil), // 9: bytebase.store.TagPolicy
- (*Binding)(nil), // 10: bytebase.store.Binding
- (*IamPolicy)(nil), // 11: bytebase.store.IamPolicy
- (*EnvironmentTierPolicy)(nil), // 12: bytebase.store.EnvironmentTierPolicy
- (*QueryDataPolicy)(nil), // 13: bytebase.store.QueryDataPolicy
- (*DataSourceQueryPolicy)(nil), // 14: bytebase.store.DataSourceQueryPolicy
- (*MaskingExceptionPolicy_MaskingException)(nil), // 15: bytebase.store.MaskingExceptionPolicy.MaskingException
- (*MaskingRulePolicy_MaskingRule)(nil), // 16: bytebase.store.MaskingRulePolicy.MaskingRule
- nil, // 17: bytebase.store.TagPolicy.TagsEntry
- (*expr.Expr)(nil), // 18: google.type.Expr
- (*durationpb.Duration)(nil), // 19: google.protobuf.Duration
+ (Policy_Type)(0), // 0: bytebase.store.Policy.Type
+ (Policy_Resource)(0), // 1: bytebase.store.Policy.Resource
+ (EnvironmentTierPolicy_EnvironmentTier)(0), // 2: bytebase.store.EnvironmentTierPolicy.EnvironmentTier
+ (DataSourceQueryPolicy_Restriction)(0), // 3: bytebase.store.DataSourceQueryPolicy.Restriction
+ (*Policy)(nil), // 4: bytebase.store.Policy
+ (*RolloutPolicy)(nil), // 5: bytebase.store.RolloutPolicy
+ (*MaskingExceptionPolicy)(nil), // 6: bytebase.store.MaskingExceptionPolicy
+ (*MaskingRulePolicy)(nil), // 7: bytebase.store.MaskingRulePolicy
+ (*TagPolicy)(nil), // 8: bytebase.store.TagPolicy
+ (*Binding)(nil), // 9: bytebase.store.Binding
+ (*IamPolicy)(nil), // 10: bytebase.store.IamPolicy
+ (*EnvironmentTierPolicy)(nil), // 11: bytebase.store.EnvironmentTierPolicy
+ (*QueryDataPolicy)(nil), // 12: bytebase.store.QueryDataPolicy
+ (*DataSourceQueryPolicy)(nil), // 13: bytebase.store.DataSourceQueryPolicy
+ (*MaskingExceptionPolicy_MaskingException)(nil), // 14: bytebase.store.MaskingExceptionPolicy.MaskingException
+ (*MaskingRulePolicy_MaskingRule)(nil), // 15: bytebase.store.MaskingRulePolicy.MaskingRule
+ nil, // 16: bytebase.store.TagPolicy.TagsEntry
+ (*expr.Expr)(nil), // 17: google.type.Expr
+ (*durationpb.Duration)(nil), // 18: google.protobuf.Duration
}
var file_store_policy_proto_depIdxs = []int32{
- 15, // 0: bytebase.store.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException
- 16, // 1: bytebase.store.MaskingRulePolicy.rules:type_name -> bytebase.store.MaskingRulePolicy.MaskingRule
- 17, // 2: bytebase.store.TagPolicy.tags:type_name -> bytebase.store.TagPolicy.TagsEntry
- 18, // 3: bytebase.store.Binding.condition:type_name -> google.type.Expr
- 10, // 4: bytebase.store.IamPolicy.bindings:type_name -> bytebase.store.Binding
- 3, // 5: bytebase.store.EnvironmentTierPolicy.environment_tier:type_name -> bytebase.store.EnvironmentTierPolicy.EnvironmentTier
- 19, // 6: bytebase.store.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
- 4, // 7: bytebase.store.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.store.DataSourceQueryPolicy.Restriction
- 2, // 8: bytebase.store.MaskingExceptionPolicy.MaskingException.action:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException.Action
- 18, // 9: bytebase.store.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
- 18, // 10: bytebase.store.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
- 11, // [11:11] is the sub-list for method output_type
- 11, // [11:11] is the sub-list for method input_type
- 11, // [11:11] is the sub-list for extension type_name
- 11, // [11:11] is the sub-list for extension extendee
- 0, // [0:11] is the sub-list for field type_name
+ 14, // 0: bytebase.store.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.store.MaskingExceptionPolicy.MaskingException
+ 15, // 1: bytebase.store.MaskingRulePolicy.rules:type_name -> bytebase.store.MaskingRulePolicy.MaskingRule
+ 16, // 2: bytebase.store.TagPolicy.tags:type_name -> bytebase.store.TagPolicy.TagsEntry
+ 17, // 3: bytebase.store.Binding.condition:type_name -> google.type.Expr
+ 9, // 4: bytebase.store.IamPolicy.bindings:type_name -> bytebase.store.Binding
+ 2, // 5: bytebase.store.EnvironmentTierPolicy.environment_tier:type_name -> bytebase.store.EnvironmentTierPolicy.EnvironmentTier
+ 18, // 6: bytebase.store.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
+ 3, // 7: bytebase.store.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.store.DataSourceQueryPolicy.Restriction
+ 17, // 8: bytebase.store.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
+ 17, // 9: bytebase.store.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
+ 10, // [10:10] is the sub-list for method output_type
+ 10, // [10:10] is the sub-list for method input_type
+ 10, // [10:10] is the sub-list for extension type_name
+ 10, // [10:10] is the sub-list for extension extendee
+ 0, // [0:10] is the sub-list for field type_name
}
func init() { file_store_policy_proto_init() }
@@ -1092,7 +1026,7 @@ func file_store_policy_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_policy_proto_rawDesc), len(file_store_policy_proto_rawDesc)),
- NumEnums: 5,
+ NumEnums: 4,
NumMessages: 13,
NumExtensions: 0,
NumServices: 0,
diff --git a/backend/generated-go/store/policy_equal.pb.go b/backend/generated-go/store/policy_equal.pb.go
index a096694dc6..612ed34bb1 100644
--- a/backend/generated-go/store/policy_equal.pb.go
+++ b/backend/generated-go/store/policy_equal.pb.go
@@ -46,9 +46,6 @@ func (x *MaskingExceptionPolicy_MaskingException) Equal(y *MaskingExceptionPolic
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.Action != y.Action {
- return false
- }
if x.Member != y.Member {
return false
}
diff --git a/backend/generated-go/v1/org_policy_service.pb.go b/backend/generated-go/v1/org_policy_service.pb.go
index 6a1295eb51..7d2b757630 100644
--- a/backend/generated-go/v1/org_policy_service.pb.go
+++ b/backend/generated-go/v1/org_policy_service.pb.go
@@ -204,59 +204,6 @@ func (RolloutPolicy_Checkers_PlanCheckEnforcement) EnumDescriptor() ([]byte, []i
return file_v1_org_policy_service_proto_rawDescGZIP(), []int{7, 0, 0}
}
-// The action that the exception permits.
-type MaskingExceptionPolicy_MaskingException_Action int32
-
-const (
- // Unspecified action.
- MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED MaskingExceptionPolicy_MaskingException_Action = 0
- // Allow querying sensitive data.
- MaskingExceptionPolicy_MaskingException_QUERY MaskingExceptionPolicy_MaskingException_Action = 1
- // Allow exporting sensitive data.
- MaskingExceptionPolicy_MaskingException_EXPORT MaskingExceptionPolicy_MaskingException_Action = 2
-)
-
-// Enum value maps for MaskingExceptionPolicy_MaskingException_Action.
-var (
- MaskingExceptionPolicy_MaskingException_Action_name = map[int32]string{
- 0: "ACTION_UNSPECIFIED",
- 1: "QUERY",
- 2: "EXPORT",
- }
- MaskingExceptionPolicy_MaskingException_Action_value = map[string]int32{
- "ACTION_UNSPECIFIED": 0,
- "QUERY": 1,
- "EXPORT": 2,
- }
-)
-
-func (x MaskingExceptionPolicy_MaskingException_Action) Enum() *MaskingExceptionPolicy_MaskingException_Action {
- p := new(MaskingExceptionPolicy_MaskingException_Action)
- *p = x
- return p
-}
-
-func (x MaskingExceptionPolicy_MaskingException_Action) String() string {
- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MaskingExceptionPolicy_MaskingException_Action) Descriptor() protoreflect.EnumDescriptor {
- return file_v1_org_policy_service_proto_enumTypes[3].Descriptor()
-}
-
-func (MaskingExceptionPolicy_MaskingException_Action) Type() protoreflect.EnumType {
- return &file_v1_org_policy_service_proto_enumTypes[3]
-}
-
-func (x MaskingExceptionPolicy_MaskingException_Action) Number() protoreflect.EnumNumber {
- return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MaskingExceptionPolicy_MaskingException_Action.Descriptor instead.
-func (MaskingExceptionPolicy_MaskingException_Action) EnumDescriptor() ([]byte, []int) {
- return file_v1_org_policy_service_proto_rawDescGZIP(), []int{9, 0, 0}
-}
-
// Restriction level for admin data source access.
type DataSourceQueryPolicy_Restriction int32
@@ -294,11 +241,11 @@ func (x DataSourceQueryPolicy_Restriction) String() string {
}
func (DataSourceQueryPolicy_Restriction) Descriptor() protoreflect.EnumDescriptor {
- return file_v1_org_policy_service_proto_enumTypes[4].Descriptor()
+ return file_v1_org_policy_service_proto_enumTypes[3].Descriptor()
}
func (DataSourceQueryPolicy_Restriction) Type() protoreflect.EnumType {
- return &file_v1_org_policy_service_proto_enumTypes[4]
+ return &file_v1_org_policy_service_proto_enumTypes[3]
}
func (x DataSourceQueryPolicy_Restriction) Number() protoreflect.EnumNumber {
@@ -1305,8 +1252,6 @@ func (x *RolloutPolicy_Checkers_RequiredStatusChecks) GetPlanCheckEnforcement()
// An exception allowing specific users to access masked data.
type MaskingExceptionPolicy_MaskingException struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // The action that the user can perform on sensitive data.
- Action MaskingExceptionPolicy_MaskingException_Action `protobuf:"varint,1,opt,name=action,proto3,enum=bytebase.v1.MaskingExceptionPolicy_MaskingException_Action" json:"action,omitempty"`
// Member is the principal who bind to this exception policy instance.
//
// - `user:{email}`: An email address that represents a specific Bytebase account. For example, `[email protected]`.
@@ -1363,13 +1308,6 @@ func (*MaskingExceptionPolicy_MaskingException) Descriptor() ([]byte, []int) {
return file_v1_org_policy_service_proto_rawDescGZIP(), []int{9, 0}
}
-func (x *MaskingExceptionPolicy_MaskingException) GetAction() MaskingExceptionPolicy_MaskingException_Action {
- if x != nil {
- return x.Action
- }
- return MaskingExceptionPolicy_MaskingException_ACTION_UNSPECIFIED
-}
-
func (x *MaskingExceptionPolicy_MaskingException) GetMember() string {
if x != nil {
return x.Member
@@ -1533,18 +1471,12 @@ const file_v1_org_policy_service_proto_rawDesc = "" +
"\x0edisable_export\x18\x02 \x01(\bR\rdisableExport\x12.\n" +
"\x13maximum_result_size\x18\x03 \x01(\x03R\x11maximumResultSize\x12.\n" +
"\x13maximum_result_rows\x18\x04 \x01(\x05R\x11maximumResultRows\x12*\n" +
- "\x11disable_copy_data\x18\x05 \x01(\bR\x0fdisableCopyData\"\xe9\x02\n" +
+ "\x11disable_copy_data\x18\x05 \x01(\bR\x0fdisableCopyData\"\xda\x01\n" +
"\x16MaskingExceptionPolicy\x12c\n" +
- "\x12masking_exceptions\x18\x01 \x03(\v24.bytebase.v1.MaskingExceptionPolicy.MaskingExceptionR\x11maskingExceptions\x1a\xe9\x01\n" +
- "\x10MaskingException\x12S\n" +
- "\x06action\x18\x01 \x01(\x0e2;.bytebase.v1.MaskingExceptionPolicy.MaskingException.ActionR\x06action\x12\x16\n" +
+ "\x12masking_exceptions\x18\x01 \x03(\v24.bytebase.v1.MaskingExceptionPolicy.MaskingExceptionR\x11maskingExceptions\x1a[\n" +
+ "\x10MaskingException\x12\x16\n" +
"\x06member\x18\x03 \x01(\tR\x06member\x12/\n" +
- "\tcondition\x18\x04 \x01(\v2\x11.google.type.ExprR\tcondition\"7\n" +
- "\x06Action\x12\x16\n" +
- "\x12ACTION_UNSPECIFIED\x10\x00\x12\t\n" +
- "\x05QUERY\x10\x01\x12\n" +
- "\n" +
- "\x06EXPORT\x10\x02\"\xca\x01\n" +
+ "\tcondition\x18\x04 \x01(\v2\x11.google.type.ExprR\tcondition\"\xca\x01\n" +
"\x11MaskingRulePolicy\x12@\n" +
"\x05rules\x18\x01 \x03(\v2*.bytebase.v1.MaskingRulePolicy.MaskingRuleR\x05rules\x1as\n" +
"\vMaskingRule\x12\x0e\n" +
@@ -1600,78 +1532,76 @@ func file_v1_org_policy_service_proto_rawDescGZIP() []byte {
return file_v1_org_policy_service_proto_rawDescData
}
-var file_v1_org_policy_service_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
+var file_v1_org_policy_service_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
var file_v1_org_policy_service_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
var file_v1_org_policy_service_proto_goTypes = []any{
(PolicyType)(0), // 0: bytebase.v1.PolicyType
(PolicyResourceType)(0), // 1: bytebase.v1.PolicyResourceType
(RolloutPolicy_Checkers_PlanCheckEnforcement)(0), // 2: bytebase.v1.RolloutPolicy.Checkers.PlanCheckEnforcement
- (MaskingExceptionPolicy_MaskingException_Action)(0), // 3: bytebase.v1.MaskingExceptionPolicy.MaskingException.Action
- (DataSourceQueryPolicy_Restriction)(0), // 4: bytebase.v1.DataSourceQueryPolicy.Restriction
- (*CreatePolicyRequest)(nil), // 5: bytebase.v1.CreatePolicyRequest
- (*UpdatePolicyRequest)(nil), // 6: bytebase.v1.UpdatePolicyRequest
- (*DeletePolicyRequest)(nil), // 7: bytebase.v1.DeletePolicyRequest
- (*GetPolicyRequest)(nil), // 8: bytebase.v1.GetPolicyRequest
- (*ListPoliciesRequest)(nil), // 9: bytebase.v1.ListPoliciesRequest
- (*ListPoliciesResponse)(nil), // 10: bytebase.v1.ListPoliciesResponse
- (*Policy)(nil), // 11: bytebase.v1.Policy
- (*RolloutPolicy)(nil), // 12: bytebase.v1.RolloutPolicy
- (*QueryDataPolicy)(nil), // 13: bytebase.v1.QueryDataPolicy
- (*MaskingExceptionPolicy)(nil), // 14: bytebase.v1.MaskingExceptionPolicy
- (*MaskingRulePolicy)(nil), // 15: bytebase.v1.MaskingRulePolicy
- (*TagPolicy)(nil), // 16: bytebase.v1.TagPolicy
- (*DataSourceQueryPolicy)(nil), // 17: bytebase.v1.DataSourceQueryPolicy
- (*RolloutPolicy_Checkers)(nil), // 18: bytebase.v1.RolloutPolicy.Checkers
- (*RolloutPolicy_Checkers_RequiredStatusChecks)(nil), // 19: bytebase.v1.RolloutPolicy.Checkers.RequiredStatusChecks
- (*MaskingExceptionPolicy_MaskingException)(nil), // 20: bytebase.v1.MaskingExceptionPolicy.MaskingException
- (*MaskingRulePolicy_MaskingRule)(nil), // 21: bytebase.v1.MaskingRulePolicy.MaskingRule
- nil, // 22: bytebase.v1.TagPolicy.TagsEntry
- (*fieldmaskpb.FieldMask)(nil), // 23: google.protobuf.FieldMask
- (*durationpb.Duration)(nil), // 24: google.protobuf.Duration
- (*expr.Expr)(nil), // 25: google.type.Expr
- (*emptypb.Empty)(nil), // 26: google.protobuf.Empty
+ (DataSourceQueryPolicy_Restriction)(0), // 3: bytebase.v1.DataSourceQueryPolicy.Restriction
+ (*CreatePolicyRequest)(nil), // 4: bytebase.v1.CreatePolicyRequest
+ (*UpdatePolicyRequest)(nil), // 5: bytebase.v1.UpdatePolicyRequest
+ (*DeletePolicyRequest)(nil), // 6: bytebase.v1.DeletePolicyRequest
+ (*GetPolicyRequest)(nil), // 7: bytebase.v1.GetPolicyRequest
+ (*ListPoliciesRequest)(nil), // 8: bytebase.v1.ListPoliciesRequest
+ (*ListPoliciesResponse)(nil), // 9: bytebase.v1.ListPoliciesResponse
+ (*Policy)(nil), // 10: bytebase.v1.Policy
+ (*RolloutPolicy)(nil), // 11: bytebase.v1.RolloutPolicy
+ (*QueryDataPolicy)(nil), // 12: bytebase.v1.QueryDataPolicy
+ (*MaskingExceptionPolicy)(nil), // 13: bytebase.v1.MaskingExceptionPolicy
+ (*MaskingRulePolicy)(nil), // 14: bytebase.v1.MaskingRulePolicy
+ (*TagPolicy)(nil), // 15: bytebase.v1.TagPolicy
+ (*DataSourceQueryPolicy)(nil), // 16: bytebase.v1.DataSourceQueryPolicy
+ (*RolloutPolicy_Checkers)(nil), // 17: bytebase.v1.RolloutPolicy.Checkers
+ (*RolloutPolicy_Checkers_RequiredStatusChecks)(nil), // 18: bytebase.v1.RolloutPolicy.Checkers.RequiredStatusChecks
+ (*MaskingExceptionPolicy_MaskingException)(nil), // 19: bytebase.v1.MaskingExceptionPolicy.MaskingException
+ (*MaskingRulePolicy_MaskingRule)(nil), // 20: bytebase.v1.MaskingRulePolicy.MaskingRule
+ nil, // 21: bytebase.v1.TagPolicy.TagsEntry
+ (*fieldmaskpb.FieldMask)(nil), // 22: google.protobuf.FieldMask
+ (*durationpb.Duration)(nil), // 23: google.protobuf.Duration
+ (*expr.Expr)(nil), // 24: google.type.Expr
+ (*emptypb.Empty)(nil), // 25: google.protobuf.Empty
}
var file_v1_org_policy_service_proto_depIdxs = []int32{
- 11, // 0: bytebase.v1.CreatePolicyRequest.policy:type_name -> bytebase.v1.Policy
+ 10, // 0: bytebase.v1.CreatePolicyRequest.policy:type_name -> bytebase.v1.Policy
0, // 1: bytebase.v1.CreatePolicyRequest.type:type_name -> bytebase.v1.PolicyType
- 11, // 2: bytebase.v1.UpdatePolicyRequest.policy:type_name -> bytebase.v1.Policy
- 23, // 3: bytebase.v1.UpdatePolicyRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 10, // 2: bytebase.v1.UpdatePolicyRequest.policy:type_name -> bytebase.v1.Policy
+ 22, // 3: bytebase.v1.UpdatePolicyRequest.update_mask:type_name -> google.protobuf.FieldMask
0, // 4: bytebase.v1.ListPoliciesRequest.policy_type:type_name -> bytebase.v1.PolicyType
- 11, // 5: bytebase.v1.ListPoliciesResponse.policies:type_name -> bytebase.v1.Policy
+ 10, // 5: bytebase.v1.ListPoliciesResponse.policies:type_name -> bytebase.v1.Policy
0, // 6: bytebase.v1.Policy.type:type_name -> bytebase.v1.PolicyType
- 12, // 7: bytebase.v1.Policy.rollout_policy:type_name -> bytebase.v1.RolloutPolicy
- 15, // 8: bytebase.v1.Policy.masking_rule_policy:type_name -> bytebase.v1.MaskingRulePolicy
- 14, // 9: bytebase.v1.Policy.masking_exception_policy:type_name -> bytebase.v1.MaskingExceptionPolicy
- 16, // 10: bytebase.v1.Policy.tag_policy:type_name -> bytebase.v1.TagPolicy
- 17, // 11: bytebase.v1.Policy.data_source_query_policy:type_name -> bytebase.v1.DataSourceQueryPolicy
- 13, // 12: bytebase.v1.Policy.query_data_policy:type_name -> bytebase.v1.QueryDataPolicy
+ 11, // 7: bytebase.v1.Policy.rollout_policy:type_name -> bytebase.v1.RolloutPolicy
+ 14, // 8: bytebase.v1.Policy.masking_rule_policy:type_name -> bytebase.v1.MaskingRulePolicy
+ 13, // 9: bytebase.v1.Policy.masking_exception_policy:type_name -> bytebase.v1.MaskingExceptionPolicy
+ 15, // 10: bytebase.v1.Policy.tag_policy:type_name -> bytebase.v1.TagPolicy
+ 16, // 11: bytebase.v1.Policy.data_source_query_policy:type_name -> bytebase.v1.DataSourceQueryPolicy
+ 12, // 12: bytebase.v1.Policy.query_data_policy:type_name -> bytebase.v1.QueryDataPolicy
1, // 13: bytebase.v1.Policy.resource_type:type_name -> bytebase.v1.PolicyResourceType
- 18, // 14: bytebase.v1.RolloutPolicy.checkers:type_name -> bytebase.v1.RolloutPolicy.Checkers
- 24, // 15: bytebase.v1.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
- 20, // 16: bytebase.v1.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.v1.MaskingExceptionPolicy.MaskingException
- 21, // 17: bytebase.v1.MaskingRulePolicy.rules:type_name -> bytebase.v1.MaskingRulePolicy.MaskingRule
- 22, // 18: bytebase.v1.TagPolicy.tags:type_name -> bytebase.v1.TagPolicy.TagsEntry
- 4, // 19: bytebase.v1.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.v1.DataSourceQueryPolicy.Restriction
- 19, // 20: bytebase.v1.RolloutPolicy.Checkers.required_status_checks:type_name -> bytebase.v1.RolloutPolicy.Checkers.RequiredStatusChecks
+ 17, // 14: bytebase.v1.RolloutPolicy.checkers:type_name -> bytebase.v1.RolloutPolicy.Checkers
+ 23, // 15: bytebase.v1.QueryDataPolicy.timeout:type_name -> google.protobuf.Duration
+ 19, // 16: bytebase.v1.MaskingExceptionPolicy.masking_exceptions:type_name -> bytebase.v1.MaskingExceptionPolicy.MaskingException
+ 20, // 17: bytebase.v1.MaskingRulePolicy.rules:type_name -> bytebase.v1.MaskingRulePolicy.MaskingRule
+ 21, // 18: bytebase.v1.TagPolicy.tags:type_name -> bytebase.v1.TagPolicy.TagsEntry
+ 3, // 19: bytebase.v1.DataSourceQueryPolicy.admin_data_source_restriction:type_name -> bytebase.v1.DataSourceQueryPolicy.Restriction
+ 18, // 20: bytebase.v1.RolloutPolicy.Checkers.required_status_checks:type_name -> bytebase.v1.RolloutPolicy.Checkers.RequiredStatusChecks
2, // 21: bytebase.v1.RolloutPolicy.Checkers.RequiredStatusChecks.plan_check_enforcement:type_name -> bytebase.v1.RolloutPolicy.Checkers.PlanCheckEnforcement
- 3, // 22: bytebase.v1.MaskingExceptionPolicy.MaskingException.action:type_name -> bytebase.v1.MaskingExceptionPolicy.MaskingException.Action
- 25, // 23: bytebase.v1.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
- 25, // 24: bytebase.v1.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
- 8, // 25: bytebase.v1.OrgPolicyService.GetPolicy:input_type -> bytebase.v1.GetPolicyRequest
- 9, // 26: bytebase.v1.OrgPolicyService.ListPolicies:input_type -> bytebase.v1.ListPoliciesRequest
- 5, // 27: bytebase.v1.OrgPolicyService.CreatePolicy:input_type -> bytebase.v1.CreatePolicyRequest
- 6, // 28: bytebase.v1.OrgPolicyService.UpdatePolicy:input_type -> bytebase.v1.UpdatePolicyRequest
- 7, // 29: bytebase.v1.OrgPolicyService.DeletePolicy:input_type -> bytebase.v1.DeletePolicyRequest
- 11, // 30: bytebase.v1.OrgPolicyService.GetPolicy:output_type -> bytebase.v1.Policy
- 10, // 31: bytebase.v1.OrgPolicyService.ListPolicies:output_type -> bytebase.v1.ListPoliciesResponse
- 11, // 32: bytebase.v1.OrgPolicyService.CreatePolicy:output_type -> bytebase.v1.Policy
- 11, // 33: bytebase.v1.OrgPolicyService.UpdatePolicy:output_type -> bytebase.v1.Policy
- 26, // 34: bytebase.v1.OrgPolicyService.DeletePolicy:output_type -> google.protobuf.Empty
- 30, // [30:35] is the sub-list for method output_type
- 25, // [25:30] is the sub-list for method input_type
- 25, // [25:25] is the sub-list for extension type_name
- 25, // [25:25] is the sub-list for extension extendee
- 0, // [0:25] is the sub-list for field type_name
+ 24, // 22: bytebase.v1.MaskingExceptionPolicy.MaskingException.condition:type_name -> google.type.Expr
+ 24, // 23: bytebase.v1.MaskingRulePolicy.MaskingRule.condition:type_name -> google.type.Expr
+ 7, // 24: bytebase.v1.OrgPolicyService.GetPolicy:input_type -> bytebase.v1.GetPolicyRequest
+ 8, // 25: bytebase.v1.OrgPolicyService.ListPolicies:input_type -> bytebase.v1.ListPoliciesRequest
+ 4, // 26: bytebase.v1.OrgPolicyService.CreatePolicy:input_type -> bytebase.v1.CreatePolicyRequest
+ 5, // 27: bytebase.v1.OrgPolicyService.UpdatePolicy:input_type -> bytebase.v1.UpdatePolicyRequest
+ 6, // 28: bytebase.v1.OrgPolicyService.DeletePolicy:input_type -> bytebase.v1.DeletePolicyRequest
+ 10, // 29: bytebase.v1.OrgPolicyService.GetPolicy:output_type -> bytebase.v1.Policy
+ 9, // 30: bytebase.v1.OrgPolicyService.ListPolicies:output_type -> bytebase.v1.ListPoliciesResponse
+ 10, // 31: bytebase.v1.OrgPolicyService.CreatePolicy:output_type -> bytebase.v1.Policy
+ 10, // 32: bytebase.v1.OrgPolicyService.UpdatePolicy:output_type -> bytebase.v1.Policy
+ 25, // 33: bytebase.v1.OrgPolicyService.DeletePolicy:output_type -> google.protobuf.Empty
+ 29, // [29:34] is the sub-list for method output_type
+ 24, // [24:29] is the sub-list for method input_type
+ 24, // [24:24] is the sub-list for extension type_name
+ 24, // [24:24] is the sub-list for extension extendee
+ 0, // [0:24] is the sub-list for field type_name
}
func init() { file_v1_org_policy_service_proto_init() }
@@ -1694,7 +1624,7 @@ func file_v1_org_policy_service_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_org_policy_service_proto_rawDesc), len(file_v1_org_policy_service_proto_rawDesc)),
- NumEnums: 5,
+ NumEnums: 4,
NumMessages: 18,
NumExtensions: 0,
NumServices: 1,
diff --git a/backend/generated-go/v1/org_policy_service_equal.pb.go b/backend/generated-go/v1/org_policy_service_equal.pb.go
index c45e1f60bf..7a002f3901 100644
--- a/backend/generated-go/v1/org_policy_service_equal.pb.go
+++ b/backend/generated-go/v1/org_policy_service_equal.pb.go
@@ -242,9 +242,6 @@ func (x *MaskingExceptionPolicy_MaskingException) Equal(y *MaskingExceptionPolic
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.Action != y.Action {
- return false
- }
if x.Member != y.Member {
return false
}
diff --git a/backend/migrator/migration/3.13/0026##remove_action_from_masking_exception.sql b/backend/migrator/migration/3.13/0026##remove_action_from_masking_exception.sql
new file mode 100644
index 0000000000..04c2cdb32d
--- /dev/null
+++ b/backend/migrator/migration/3.13/0026##remove_action_from_masking_exception.sql
@@ -0,0 +1,9 @@
+UPDATE policy
+SET payload = (
+ SELECT jsonb_build_object(
+ 'maskingExceptions',
+ COALESCE(jsonb_agg(elem - 'action'), '[]'::jsonb)
+ )
+ FROM jsonb_array_elements(payload -> 'maskingExceptions') AS elem
+)
+WHERE type = 'MASKING_EXCEPTION';
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 95941c2801..d5d31bc897 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.13.25"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.26"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.go
index 3613d77bcd..5bff6628b8 100644
--- a/backend/runner/taskrun/data_export_executor.go
+++ b/backend/runner/taskrun/data_export_executor.go
@@ -1,20 +1,32 @@
package taskrun
import (
+ "bytes"
"context"
+ "database/sql"
+ "fmt"
+ "io"
+ "log/slog"
+ "math"
+ "strings"
+ "time"
+ "github.com/alexmullins/zip"
"github.com/pkg/errors"
+ "google.golang.org/protobuf/types/known/durationpb"
apiv1 "github.com/bytebase/bytebase/backend/api/v1"
"github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/component/dbfactory"
+ "github.com/bytebase/bytebase/backend/component/export"
"github.com/bytebase/bytebase/backend/component/state"
"github.com/bytebase/bytebase/backend/enterprise"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+ "github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/runner/schemasync"
-
"github.com/bytebase/bytebase/backend/store"
)
@@ -68,12 +80,6 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
}
dataSource := apiv1.GetQueriableDataSource(instance)
- exportRequest := &v1pb.ExportRequest{
- Name: common.FormatDatabase(instance.ResourceID, database.DatabaseName),
- Statement: statement,
- Format: v1pb.ExportFormat(task.Payload.GetFormat()),
- Password: "", /* do not pass the password, we will encrypt the files will password when users download them */
- }
creatorUser, err := exec.store.GetUserByEmail(ctx, issue.CreatorEmail)
if err != nil {
return true, nil, errors.Wrapf(err, "failed to get creator user for issue %d", issue.UID)
@@ -81,7 +87,10 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
if creatorUser == nil {
return true, nil, errors.Errorf("creator user not found for issue %d", issue.UID)
}
- bytes, _, exportErr := apiv1.DoExport(ctx, exec.store, exec.dbFactory, exec.license, exportRequest, creatorUser /* user */, instance, database, nil /* access check */, exec.schemaSyncer, dataSource)
+
+ // Execute the export without masking.
+ // For approved DATABASE_EXPORT tasks, the approval itself authorizes access to the data.
+ bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, task.Payload.GetFormat(), creatorUser)
if exportErr != nil {
return true, nil, errors.Wrap(exportErr, "failed to export data")
}
@@ -101,3 +110,245 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
ExportArchiveUid: int32(exportArchive.UID),
}, nil
}
+
+// executeExport performs the actual export without applying any masking.
+// This is used for approved DATABASE_EXPORT tasks where the approval itself
+// authorizes access to the data.
+func (exec *DataExportExecutor) executeExport(
+ ctx context.Context,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ dataSource *storepb.DataSource,
+ statement string,
+ format storepb.ExportFormat,
+ user *store.UserMessage,
+) ([]byte, error) {
+ if dataSource == nil {
+ return nil, errors.Errorf("cannot find valid data source")
+ }
+
+ // 1. Get driver and connection
+ driver, err := exec.dbFactory.GetDataSourceDriver(ctx, instance, dataSource, db.ConnectionContext{
+ DatabaseName: database.DatabaseName,
+ DataShare: database.Metadata.GetDatashare(),
+ ReadOnly: true,
+ })
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to get database driver")
+ }
+ defer driver.Close(ctx)
+
+ sqlDB := driver.GetDB()
+ var conn *sql.Conn
+ if sqlDB != nil {
+ conn, err = sqlDB.Conn(ctx)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to get database connection")
+ }
+ defer conn.Close()
+ }
+
+ // 2. Get query restrictions from workspace policy
+ queryRestriction := exec.getEffectiveQueryDataPolicy(ctx, database.ProjectID)
+
+ // 3. Build query context with limits
+ queryContext := db.QueryContext{
+ Limit: int(queryRestriction.MaximumResultRows),
+ OperatorEmail: user.Email,
+ MaximumSQLResultSize: queryRestriction.MaximumResultSize,
+ }
+ if queryRestriction.MaxQueryTimeoutInSeconds > 0 {
+ queryContext.Timeout = &durationpb.Duration{
+ Seconds: queryRestriction.MaxQueryTimeoutInSeconds,
+ }
+ }
+
+ // 4. Execute query with timeout
+ queryCtx := ctx
+ if queryContext.Timeout != nil {
+ timeout := queryContext.Timeout.AsDuration()
+ slog.Debug("create query context with timeout", slog.Duration("timeout", timeout))
+ newCtx, cancelCtx := context.WithTimeout(ctx, timeout)
+ defer cancelCtx()
+ queryCtx = newCtx
+ }
+
+ start := time.Now()
+ results, err := driver.QueryConn(queryCtx, conn, statement, queryContext)
+ select {
+ case <-queryCtx.Done():
+ // canceled or timed out
+ return nil, errors.Errorf("timeout reached: %v", queryContext.Timeout.AsDuration())
+ default:
+ // So the select will not block
+ }
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to execute query")
+ }
+ slog.Debug("execute success", slog.String("instance", instance.ResourceID), slog.String("statement", statement), slog.Duration("duration", time.Since(start)))
+
+ // 5. Format and zip results (NO MASKING)
+ return exec.formatAndZipResults(ctx, results, instance, database, format, statement)
+}
+
+// getEffectiveQueryDataPolicy gets the effective query data policy for a project.
+func (exec *DataExportExecutor) getEffectiveQueryDataPolicy(
+ ctx context.Context,
+ projectID string,
+) *store.EffectiveQueryDataPolicy {
+ value := &store.EffectiveQueryDataPolicy{
+ MaximumResultSize: common.DefaultMaximumSQLResultSize,
+ MaximumResultRows: math.MaxInt32,
+ }
+ if err := exec.license.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_QUERY_POLICY); err == nil {
+ policy, err := exec.store.GetEffectiveQueryDataPolicy(ctx, common.FormatProject(projectID))
+ if err != nil {
+ slog.Error("failed to get the query data policy", log.BBError(err))
+ return value
+ }
+ value = policy
+ }
+ if value.MaximumResultRows == math.MaxInt32 {
+ value.MaximumResultRows = 0
+ }
+ return value
+}
+
+// formatAndZipResults formats query results and packages them into a ZIP archive.
+func (exec *DataExportExecutor) formatAndZipResults(
+ ctx context.Context,
+ results []*v1pb.QueryResult,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ format storepb.ExportFormat,
+ statement string,
+) ([]byte, error) {
+ var buf bytes.Buffer
+ zipw := zip.NewWriter(&buf)
+
+ exportCount := 0
+ for i, result := range results {
+ if result.GetError() != "" {
+ logExportError(database, "failed to query result", errors.New(result.GetError()))
+ continue
+ }
+
+ if err := exec.exportResultToZip(ctx, zipw, instance, database, result, format, statement, i+1); err != nil {
+ logExportError(database, "failed to export result to zip", err)
+ continue
+ }
+
+ exportCount++
+ // Help GC by clearing the result data we've already processed
+ result.Rows = nil
+ }
+
+ if exportCount == 0 {
+ return nil, errors.Errorf("empty export data for database %s", database.DatabaseName)
+ }
+
+ if err := zipw.Close(); err != nil {
+ return nil, errors.Wrap(err, "failed to close zip writer")
+ }
+
+ return buf.Bytes(), nil
+}
+
+// exportResultToZip exports a single query result to the ZIP archive.
+// It writes both the SQL statement and the formatted result data.
+func (exec *DataExportExecutor) exportResultToZip(
+ ctx context.Context,
+ zipw *zip.Writer,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ result *v1pb.QueryResult,
+ format storepb.ExportFormat,
+ statement string,
+ statementNumber int,
+) error {
+ baseFilename := fmt.Sprintf("%s/%s/statement-%d", database.InstanceID, database.DatabaseName, statementNumber)
+
+ // Write statement file
+ statementFilename := fmt.Sprintf("%s.sql", baseFilename)
+ if err := export.WriteZipEntry(zipw, statementFilename, []byte(statement), ""); err != nil {
+ return errors.Wrap(err, "failed to write statement")
+ }
+
+ // Write result file by streaming directly to ZIP
+ resultExt := strings.ToLower(v1pb.ExportFormat(format).String())
+ resultFilename := fmt.Sprintf("%s.result.%s", baseFilename, resultExt)
+ if err := exec.formatExportToZip(ctx, zipw, resultFilename, instance, database, result, format); err != nil {
+ return errors.Wrap(err, "failed to write formatted result")
+ }
+
+ return nil
+}
+
+// formatExportToZip formats query results and writes them directly to a ZIP entry.
+// This function streams the formatted data to minimize memory usage.
+func (exec *DataExportExecutor) formatExportToZip(
+ ctx context.Context,
+ zipw *zip.Writer,
+ filename string,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ result *v1pb.QueryResult,
+ format storepb.ExportFormat,
+) error {
+ writer, err := export.CreateZipWriter(zipw, filename, "")
+ if err != nil {
+ return err
+ }
+
+ switch v1pb.ExportFormat(format) {
+ case v1pb.ExportFormat_CSV:
+ return export.CSVToWriter(writer, result)
+ case v1pb.ExportFormat_JSON:
+ return export.JSONToWriter(writer, result)
+ case v1pb.ExportFormat_SQL:
+ return exec.exportSQLWithContext(ctx, writer, instance, database, result)
+ case v1pb.ExportFormat_XLSX:
+ return export.XLSXToWriter(writer, result)
+ default:
+ return errors.Errorf("unsupported export format: %s", v1pb.ExportFormat(format).String())
+ }
+}
+
+// exportSQLWithContext exports SQL INSERT statements with proper context.
+func (exec *DataExportExecutor) exportSQLWithContext(
+ ctx context.Context,
+ w io.Writer,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ result *v1pb.QueryResult,
+) error {
+ resourceList, err := export.GetResources(
+ ctx,
+ exec.store,
+ instance.Metadata.GetEngine(),
+ database.DatabaseName,
+ result.Statement,
+ instance,
+ apiv1.BuildGetDatabaseMetadataFunc(exec.store),
+ apiv1.BuildListDatabaseNamesFunc(exec.store),
+ apiv1.BuildGetLinkedDatabaseMetadataFunc(exec.store, instance.Metadata.GetEngine()),
+ )
+ if err != nil {
+ return errors.Wrapf(err, "failed to extract resource list")
+ }
+ statementPrefix, err := export.SQLStatementPrefix(instance.Metadata.GetEngine(), resourceList, result.ColumnNames)
+ if err != nil {
+ return err
+ }
+ return export.SQLToWriter(w, instance.Metadata.GetEngine(), statementPrefix, result)
+}
+
+// logExportError logs export-related errors with consistent database context.
+func logExportError(database *store.DatabaseMessage, message string, err error) {
+ slog.Error(message,
+ log.BBError(err),
+ slog.String("instance", database.InstanceID),
+ slog.String("database", database.DatabaseName),
+ slog.String("project", database.ProjectID),
+ )
+}
diff --git a/backend/tests/user_test.go b/backend/tests/user_test.go
index dc60b1a70e..538842c482 100644
--- a/backend/tests/user_test.go
+++ b/backend/tests/user_test.go
@@ -223,7 +223,6 @@ func TestUpdateUserEmail(t *testing.T) {
MaskingExceptionPolicy: &v1pb.MaskingExceptionPolicy{
MaskingExceptions: []*v1pb.MaskingExceptionPolicy_MaskingException{
{
- Action: v1pb.MaskingExceptionPolicy_MaskingException_QUERY,
Member: fmt.Sprintf("user:%s", originalEmail),
Condition: &expr.Expr{}, // Empty condition means access all databases without expiration
},
diff --git a/frontend/src/components/SensitiveData/GrantAccessForm.vue b/frontend/src/components/SensitiveData/GrantAccessForm.vue
index 4b5822cd78..83059f194d 100644
--- a/frontend/src/components/SensitiveData/GrantAccessForm.vue
+++ b/frontend/src/components/SensitiveData/GrantAccessForm.vue
@@ -17,29 +17,6 @@
/>
</div>
- <div class="w-full">
- <div class="flex items-center gap-x-1 mb-2">
- <span class="text-main">
- {{ $t("settings.sensitive-data.action.self") }}
- </span>
- <RequiredStar />
- </div>
- <div class="flex gap-x-4">
- <NCheckbox
- v-for="action in ACTIONS"
- :key="action"
- :checked="state.supportActions.has(action)"
- @update:checked="toggleAction(action, $event)"
- >
- {{
- $t(
- `settings.sensitive-data.action.${MaskingExceptionPolicy_MaskingException_Action[action].toLowerCase()}`
- )
- }}
- </NCheckbox>
- </div>
- </div>
-
<div class="w-full">
<p class="mb-2 text-main">
{{ $t("common.reason") }}
@@ -98,7 +75,7 @@
<script lang="tsx" setup>
import { create } from "@bufbuild/protobuf";
import { isUndefined } from "lodash-es";
-import { NButton, NCheckbox, NDatePicker, NInput } from "naive-ui";
+import { NButton, NDatePicker, NInput } from "naive-ui";
import { computed, reactive } from "vue";
import { useI18n } from "vue-i18n";
import DatabaseResourceForm from "@/components/GrantRequestPanel/DatabaseResourceForm/index.vue";
@@ -113,7 +90,6 @@ import type {
Policy,
} from "@/types/proto-es/v1/org_policy_service_pb";
import {
- MaskingExceptionPolicy_MaskingException_Action,
MaskingExceptionPolicy_MaskingExceptionSchema,
MaskingExceptionPolicySchema,
PolicyResourceType,
@@ -138,20 +114,13 @@ interface LocalState {
memberList: string[];
expirationTimestamp?: number;
processing: boolean;
- supportActions: Set<MaskingExceptionPolicy_MaskingException_Action>;
databaseResources?: DatabaseResource[];
description: string;
}
-const ACTIONS = [
- MaskingExceptionPolicy_MaskingException_Action.EXPORT,
- MaskingExceptionPolicy_MaskingException_Action.QUERY,
-];
-
const state = reactive<LocalState>({
memberList: [],
processing: false,
- supportActions: new Set(ACTIONS),
databaseResources: props.columnList.map(
convertSensitiveColumnToDatabaseResource
),
@@ -163,7 +132,6 @@ const { t } = useI18n();
const resetState = () => {
state.expirationTimestamp = undefined;
- state.supportActions = new Set(ACTIONS);
state.memberList = [];
state.databaseResources = undefined;
state.processing = false;
@@ -178,9 +146,6 @@ const submitDisabled = computed(() => {
if (state.memberList.length === 0) {
return true;
}
- if (state.supportActions.size === 0) {
- return true;
- }
if (
!isUndefined(state.databaseResources) &&
state.databaseResources?.length === 0
@@ -224,29 +189,26 @@ const getPendingUpdatePolicy = async (
);
}
- for (const action of state.supportActions.values()) {
- for (const member of state.memberList) {
- const resourceExpressions = state.databaseResources?.map(
- getExpressionsForDatabaseResource
- ) ?? [[""]];
- for (const expressionList of resourceExpressions) {
- const resourceExpression = [...expressionList, ...expressions].filter(
- (e) => e
- );
- maskingExceptions.push(
- create(MaskingExceptionPolicy_MaskingExceptionSchema, {
- member,
- action,
- condition: create(ExprSchema, {
- description: state.description,
- expression:
- resourceExpression.length > 0
- ? resourceExpression.join(" && ")
- : "",
- }),
- })
- );
- }
+ for (const member of state.memberList) {
+ const resourceExpressions = state.databaseResources?.map(
+ getExpressionsForDatabaseResource
+ ) ?? [[""]];
+ for (const expressionList of resourceExpressions) {
+ const resourceExpression = [...expressionList, ...expressions].filter(
+ (e) => e
+ );
+ maskingExceptions.push(
+ create(MaskingExceptionPolicy_MaskingExceptionSchema, {
+ member,
+ condition: create(ExprSchema, {
+ description: state.description,
+ expression:
+ resourceExpression.length > 0
+ ? resourceExpression.join(" && ")
+ : "",
+ }),
+ })
+ );
}
}
@@ -270,15 +232,4 @@ const getPendingUpdatePolicy = async (
},
};
};
-
-const toggleAction = (
- action: MaskingExceptionPolicy_MaskingException_Action,
- check: boolean
-) => {
- if (check) {
- state.supportActions.add(action);
- } else {
- state.supportActions.delete(action);
- }
-};
</script>
diff --git a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
index 7d2a5121d1..1abe29587c 100644
--- a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
+++ b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
@@ -17,13 +17,7 @@ import { create } from "@bufbuild/protobuf";
import { orderBy } from "lodash-es";
import { InfoIcon, TrashIcon } from "lucide-vue-next";
import type { DataTableColumn } from "naive-ui";
-import {
- NCheckbox,
- NDataTable,
- NDatePicker,
- NTooltip,
- useDialog,
-} from "naive-ui";
+import { NDataTable, NDatePicker, NTooltip, useDialog } from "naive-ui";
import type { VNodeChild } from "vue";
import { computed, h, reactive, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
@@ -53,7 +47,6 @@ import {
import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";
import type { MaskingExceptionPolicy_MaskingException } from "@/types/proto-es/v1/org_policy_service_pb";
import {
- MaskingExceptionPolicy_MaskingException_Action,
MaskingExceptionPolicySchema,
PolicyType,
} from "@/types/proto-es/v1/org_policy_service_pb";
@@ -213,7 +206,6 @@ const getAccessUsers = async (
type: "user",
key: `${exception.member}:${expression}.${description}`,
expirationTimestamp,
- supportActions: new Set([exception.action]),
rawExpression: expression,
description,
databaseResource: condition.databaseResources
@@ -257,17 +249,6 @@ const updateAccessUserList = async () => {
return;
}
- // Exec data merge, we will merge data with same expiration time and level.
- // For example, the exception list and merge exec should be:
- // - 1. user1, action:export, level:FULL, expires at 2023-09-03
- // - 2. user1, action:export, level:FULL, expires at 2023-09-04
- // - 3. user1, action:export, level:PARTIAL, expires at 2023-09-04
- // - 4. user1, action:query, level:PARTIAL, expires at 2023-09-04
- // - 5. user1, action:query, level:FULL, expires at 2023-09-03
- // After the merge we should get:
- // - 1 & 5 is merged: user1, action:export+action, level:FULL, expires at 2023-09-03
- // - 2 cannot merge: user1, action:export, level:FULL, expires at 2023-09-04
- // - 3 & 4 is merged: user1, action:export+action, level:PARTIAL, expires at 2023-09-04
const memberMap = new Map<string, AccessUser>();
const { maskingExceptions } = policy.value.policy.value;
const expressionList = maskingExceptions.map((e) =>
@@ -284,13 +265,7 @@ const updateAccessUserList = async () => {
continue;
}
- const target = memberMap.get(item.key) ?? item;
- if (memberMap.has(item.key)) {
- for (const action of item.supportActions) {
- target.supportActions.add(action);
- }
- }
- memberMap.set(item.key, target);
+ memberMap.set(item.key, item);
}
state.rawAccessList = orderBy(
@@ -363,66 +338,6 @@ const accessTableColumns = computed(
return getDatabaseAccessResource(item);
},
},
- {
- key: "export",
- title: t("settings.sensitive-data.action.export"),
- width: "5rem",
- render: (item: AccessUser) => {
- return (
- <NCheckbox
- checked={item.supportActions.has(
- MaskingExceptionPolicy_MaskingException_Action.EXPORT
- )}
- disabled={!hasPermission.value || props.disabled}
- onUpdateChecked={() =>
- onAccessControlUpdate(
- item,
- (item) =>
- toggleAction(
- item,
- MaskingExceptionPolicy_MaskingException_Action.EXPORT
- ),
- (item) =>
- toggleAction(
- item,
- MaskingExceptionPolicy_MaskingException_Action.EXPORT
- )
- )
- }
- />
- );
- },
- },
- {
- key: "query",
- title: t("settings.sensitive-data.action.query"),
- width: "5rem",
- render: (item: AccessUser) => {
- return (
- <NCheckbox
- checked={item.supportActions.has(
- MaskingExceptionPolicy_MaskingException_Action.QUERY
- )}
- disabled={!hasPermission.value || props.disabled}
- onUpdate:checked={() =>
- onAccessControlUpdate(
- item,
- (item) =>
- toggleAction(
- item,
- MaskingExceptionPolicy_MaskingException_Action.QUERY
- ),
- (item) =>
- toggleAction(
- item,
- MaskingExceptionPolicy_MaskingException_Action.QUERY
- )
- )
- }
- />
- );
- },
- },
{
key: "expire",
title: t("common.expiration"),
@@ -476,21 +391,7 @@ const accessTableColumns = computed(
}
);
-const toggleAction = (
- item: AccessUser,
- action: MaskingExceptionPolicy_MaskingException_Action
-) => {
- if (item.supportActions.has(action)) {
- item.supportActions.delete(action);
- } else {
- item.supportActions.add(action);
- }
-};
-
-const revokeAccessAlert = (
- item: AccessUser,
- revert: (item: AccessUser) => void = () => {}
-) => {
+const revokeAccessAlert = (item: AccessUser) => {
$dialog.warning({
title: t("common.warning"),
content: () => {
@@ -510,11 +411,9 @@ const revokeAccessAlert = (
positiveText: t("common.confirm"),
closeOnEsc: false,
maskClosable: false,
- onClose: () => revert(item),
onPositiveClick: async () => {
await onRemove(item);
},
- onNegativeClick: () => revert(item),
});
};
@@ -529,15 +428,10 @@ const onRemove = async (item: AccessUser) => {
const onAccessControlUpdate = async (
item: AccessUser,
- callback: (item: AccessUser) => void,
- revert: (item: AccessUser) => void = () => {}
+ callback: (item: AccessUser) => void
) => {
callback(item);
- if (item.supportActions.size === 0) {
- revokeAccessAlert(item, revert);
- } else {
- await onSubmit();
- }
+ await onSubmit();
};
const onSubmit = async () => {
@@ -591,16 +485,13 @@ const updateExceptionPolicy = async () => {
);
}
const member = getMemberBinding(accessUser);
- for (const action of accessUser.supportActions) {
- exceptions.push({
- action,
- member,
- condition: create(ExprSchema, {
- description: accessUser.description,
- expression: expressions.join(" && "),
- }),
- });
- }
+ exceptions.push({
+ member,
+ condition: create(ExprSchema, {
+ description: accessUser.description,
+ expression: expressions.join(" && "),
+ }),
+ });
}
policy.policy = {
diff --git a/frontend/src/components/SensitiveData/components/MaskingActionDropdown.vue b/frontend/src/components/SensitiveData/components/MaskingActionDropdown.vue
deleted file mode 100644
index de346b279a..0000000000
--- a/frontend/src/components/SensitiveData/components/MaskingActionDropdown.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
- <NSelect
- :value="action"
- :options="options"
- :disabled="disabled"
- :clearable="clearable"
- :placeholder="$t('settings.sensitive-data.action.select-action')"
- @update:value="$emit('update:action', $event)"
- />
-</template>
-
-<script lang="ts" setup>
-import type { SelectOption } from "naive-ui";
-import { NSelect } from "naive-ui";
-import { computed } from "vue";
-import { useI18n } from "vue-i18n";
-import { MaskingExceptionPolicy_MaskingException_Action as Action } from "@/types/proto-es/v1/org_policy_service_pb";
-
-const props = defineProps<{
- disabled?: boolean;
- clearable?: boolean;
- action?: Action;
- actionList: Action[];
-}>();
-
-defineEmits<{
- (event: "update:action", action: Action | undefined): void;
-}>();
-
-const { t } = useI18n();
-
-// Helper function to convert Action enum to string
-const actionToString = (action: Action): string => {
- switch (action) {
- case Action.ACTION_UNSPECIFIED:
- return "ACTION_UNSPECIFIED";
- case Action.QUERY:
- return "QUERY";
- case Action.EXPORT:
- return "EXPORT";
- default:
- return "UNKNOWN";
- }
-};
-
-const options = computed(() => {
- return props.actionList.map<SelectOption>((action) => ({
- label: t(
- `settings.sensitive-data.action.${actionToString(action).toLowerCase()}`
- ),
- value: action,
- }));
-});
-</script>
diff --git a/frontend/src/components/SensitiveData/types.ts b/frontend/src/components/SensitiveData/types.ts
index 6527223b38..d27677fe53 100644
--- a/frontend/src/components/SensitiveData/types.ts
+++ b/frontend/src/components/SensitiveData/types.ts
@@ -5,7 +5,6 @@ import type {
TableCatalog,
} from "@/types/proto-es/v1/database_catalog_service_pb";
import type { Group } from "@/types/proto-es/v1/group_service_pb";
-import type { MaskingExceptionPolicy_MaskingException_Action } from "@/types/proto-es/v1/org_policy_service_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
export interface MaskData {
@@ -29,7 +28,6 @@ export interface AccessUser {
key: string;
group?: Group;
user?: User;
- supportActions: Set<MaskingExceptionPolicy_MaskingException_Action>;
expirationTimestamp?: number;
rawExpression: string;
description: string;
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 4f007ac9db..6a58f11124 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -874,12 +874,6 @@
"suffix-length": "Suffix Length"
}
},
- "action": {
- "self": "Action",
- "select-action": "Select action",
- "query": "Query",
- "export": "Export"
- },
"classification": {
"upload": "Upload classification",
"upload-label": "You can upload classification file with JSON format.",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index aa48d8befb..c9d707177a 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -874,12 +874,6 @@
"suffix-length": "Longitud del sufijo"
}
},
- "action": {
- "self": "Acción",
- "select-action": "Seleccionar acción",
- "query": "Consulta",
- "export": "Exportar"
- },
"classification": {
"upload": "Subir clasificación",
"upload-label": "Puede cargar un archivo de clasificación con formato JSON.",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index bda4017902..56e71218e1 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -874,12 +874,6 @@
"suffix-length": "サフィックスの長さ"
}
},
- "action": {
- "self": "操作の種類",
- "select-action": "アクションを選択",
- "query": "クエリ",
- "export": "出力"
- },
"classification": {
"upload": "分類をアップロード",
"upload-label": "データを分類・分類したJSON形式ファイルをアップロードできます。",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 23b8992cb0..e16ab3869b 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -874,12 +874,6 @@
"suffix-length": "Độ dài hậu tố"
}
},
- "action": {
- "self": "Hành động",
- "select-action": "Chọn hành động",
- "query": "Truy vấn",
- "export": "Xuất"
- },
"classification": {
"upload": "Tải lên phân loại",
"upload-label": "Bạn có thể tải lên tệp phân loại với định dạng JSON.",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index fefd02bd32..9786cddf91 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -874,12 +874,6 @@
"suffix-length": "后缀长度"
}
},
- "action": {
- "self": "操作类型",
- "select-action": "选择操作",
- "query": "查询",
- "export": "导出"
- },
"classification": {
"upload": "导入分类分级",
"upload-label": "您可以上传数据分类分级的 JSON 格式文件。",
diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
index d7c62af12a..efe67ec2ce 100644
--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
@@ -460,13 +460,6 @@ export declare const MaskingExceptionPolicySchema: GenMessage<MaskingExceptionPo
* @generated from message bytebase.v1.MaskingExceptionPolicy.MaskingException
*/
export declare type MaskingExceptionPolicy_MaskingException = Message<"bytebase.v1.MaskingExceptionPolicy.MaskingException"> & {
- /**
- * The action that the user can perform on sensitive data.
- *
- * @generated from field: bytebase.v1.MaskingExceptionPolicy.MaskingException.Action action = 1;
- */
- action: MaskingExceptionPolicy_MaskingException_Action;
-
/**
* Member is the principal who bind to this exception policy instance.
*
@@ -506,39 +499,6 @@ export declare type MaskingExceptionPolicy_MaskingException = Message<"bytebase.
*/
export declare const MaskingExceptionPolicy_MaskingExceptionSchema: GenMessage<MaskingExceptionPolicy_MaskingException>;
-/**
- * The action that the exception permits.
- *
- * @generated from enum bytebase.v1.MaskingExceptionPolicy.MaskingException.Action
- */
-export enum MaskingExceptionPolicy_MaskingException_Action {
- /**
- * Unspecified action.
- *
- * @generated from enum value: ACTION_UNSPECIFIED = 0;
- */
- ACTION_UNSPECIFIED = 0,
-
- /**
- * Allow querying sensitive data.
- *
- * @generated from enum value: QUERY = 1;
- */
- QUERY = 1,
-
- /**
- * Allow exporting sensitive data.
- *
- * @generated from enum value: EXPORT = 2;
- */
- EXPORT = 2,
-}
-
-/**
- * Describes the enum bytebase.v1.MaskingExceptionPolicy.MaskingException.Action.
- */
-export declare const MaskingExceptionPolicy_MaskingException_ActionSchema: GenEnum<MaskingExceptionPolicy_MaskingException_Action>;
-
/**
* Policy for configuring data masking rules.
*
diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.js b/frontend/src/types/proto-es/v1/org_policy_service_pb.js
index 2739503290..482ef11a3b 100644
--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.js
+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/org_policy_service.proto.
*/
export const file_v1_org_policy_service = /*@__PURE__*/
- fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kilQYKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYBCABKAgSJQoEdHlwZRgFIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYEyABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgRIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGNlcHRpb25fcG9saWN5GBIgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4Y2VwdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYFSABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABJGChhkYXRhX3NvdXJjZV9xdWVyeV9wb2xpY3kYFiABKAsyIi5ieXRlYmFzZS52MS5EYXRhU291cmNlUXVlcnlQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgYIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYDSABKAgSOwoNcmVzb3VyY2VfdHlwZRgOIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOuUB6kHhAQoTYnl0ZWJhc2UuY29tL1BvbGljeRIRcG9saWNpZXMve3BvbGljeX0SJHByb2plY3RzL3twcm9qZWN0fS9wb2xpY2llcy97cG9saWN5fRIsZW52aXJvbm1lbnRzL3tlbnZpcm9ubWVudH0vcG9saWNpZXMve3BvbGljeX0SJmluc3RhbmNlcy97aW5zdGFuY2V9L3BvbGljaWVzL3twb2xpY3l9EjtpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9wb2xpY2llcy97cG9saWN5fUIICgZwb2xpY3lKBAgCEANKBAgXEBgivgMKDVJvbGxvdXRQb2xpY3kSEQoJYXV0b21hdGljGAEgASgIEg0KBXJvbGVzGAIgAygJEjUKCGNoZWNrZXJzGAQgASgLMiMuYnl0ZWJhc2UudjEuUm9sbG91dFBvbGljeS5DaGVja2VycxrTAgoIQ2hlY2tlcnMSHwoXcmVxdWlyZWRfaXNzdWVfYXBwcm92YWwYASABKAgSWAoWcmVxdWlyZWRfc3RhdHVzX2NoZWNrcxgCIAEoCzI4LmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMuUmVxdWlyZWRTdGF0dXNDaGVja3MacAoUUmVxdWlyZWRTdGF0dXNDaGVja3MSWAoWcGxhbl9jaGVja19lbmZvcmNlbWVudBgBIAEoDjI4LmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMuUGxhbkNoZWNrRW5mb3JjZW1lbnQiWgoUUGxhbkNoZWNrRW5mb3JjZW1lbnQSJgoiUExBTl9DSEVDS19FTkZPUkNFTUVOVF9VTlNQRUNJRklFRBAAEg4KCkVSUk9SX09OTFkQARIKCgZTVFJJQ1QQAiKqAQoPUXVlcnlEYXRhUG9saWN5EioKB3RpbWVvdXQYASABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SFgoOZGlzYWJsZV9leHBvcnQYAiABKAgSGwoTbWF4aW11bV9yZXN1bHRfc2l6ZRgDIAEoAxIbChNtYXhpbXVtX3Jlc3VsdF9yb3dzGAQgASgFEhkKEWRpc2FibGVfY29weV9kYXRhGAUgASgIIrsCChZNYXNraW5nRXhjZXB0aW9uUG9saWN5ElAKEm1hc2tpbmdfZXhjZXB0aW9ucxgBIAMoCzI0LmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kuTWFza2luZ0V4Y2VwdGlvbhrOAQoQTWFza2luZ0V4Y2VwdGlvbhJLCgZhY3Rpb24YASABKA4yOy5ieXRlYmFzZS52MS5NYXNraW5nRXhjZXB0aW9uUG9saWN5Lk1hc2tpbmdFeGNlcHRpb24uQWN0aW9uEg4KBm1lbWJlchgDIAEoCRIkCgljb25kaXRpb24YBCABKAsyES5nb29nbGUudHlwZS5FeHByIjcKBkFjdGlvbhIWChJBQ1RJT05fVU5TUEVDSUZJRUQQABIJCgVRVUVSWRABEgoKBkVYUE9SVBACIqYBChFNYXNraW5nUnVsZVBvbGljeRI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5Lk1hc2tpbmdSdWxlGlYKC01hc2tpbmdSdWxlEgoKAmlkGAEgASgJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISFQoNc2VtYW50aWNfdHlwZRgDIAEoCSJoCglUYWdQb2xpY3kSLgoEdGFncxgBIAMoCzIgLmJ5dGViYXNlLnYxLlRhZ1BvbGljeS5UYWdzRW50cnkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEi4gEKFURhdGFTb3VyY2VRdWVyeVBvbGljeRJVCh1hZG1pbl9kYXRhX3NvdXJjZV9yZXN0cmljdGlvbhgBIAEoDjIuLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VRdWVyeVBvbGljeS5SZXN0cmljdGlvbhIUCgxkaXNhbGxvd19kZGwYAiABKAgSFAoMZGlzYWxsb3dfZG1sGAMgASgIIkYKC1Jlc3RyaWN0aW9uEhsKF1JFU1RSSUNUSU9OX1VOU1BFQ0lGSUVEEAASDAoIRkFMTEJBQ0sQARIMCghESVNBTExPVxACKsABCgpQb2xpY3lUeXBlEhsKF1BPTElDWV9UWVBFX1VOU1BFQ0lGSUVEEAASEgoOUk9MTE9VVF9QT0xJQ1kQCxIQCgxNQVNLSU5HX1JVTEUQCRIVChFNQVNLSU5HX0VYQ0VQVElPThAKEgcKA1RBRxANEhUKEURBVEFfU09VUkNFX1FVRVJZEA4SDgoKREFUQV9RVUVSWRAQIgQIAhACIgQIBBAEIgQIBhAGIgQIBRAFIgQIBxAHIgQIDBAMIgQIDxAPKmAKElBvbGljeVJlc291cmNlVHlwZRIdChlSRVNPVVJDRV9UWVBFX1VOU1BFQ0lGSUVEEAASDQoJV09SS1NQQUNFEAESDwoLRU5WSVJPTk1FTlQQAhILCgdQUk9KRUNUEAMy9AwKEE9yZ1BvbGljeVNlcnZpY2USoAIKCUdldFBvbGljeRIdLmJ5dGViYXNlLnYxLkdldFBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3ki3gHaQQRuYW1liuowD2JiLnBvbGljaWVzLmdldJDqMAGC0+STArkBWiISIC92MS97bmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WiYSJC92MS97bmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVojEiEvdjEve25hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aLxItL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9EhUvdjEve25hbWU9cG9saWNpZXMvKn0SqAIKDExpc3RQb2xpY2llcxIgLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UG9saWNpZXNSZXNwb25zZSLSAdpBAIrqMBBiYi5wb2xpY2llcy5saXN0kOowAYLT5JMCsAFaIhIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcG9saWNpZXNaJhIkL3YxL3twYXJlbnQ9ZW52aXJvbm1lbnRzLyp9L3BvbGljaWVzWiMSIS92MS97cGFyZW50PWluc3RhbmNlcy8qfS9wb2xpY2llc1ovEi0vdjEve3BhcmVudD1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn0vcG9saWNpZXMSDC92MS9wb2xpY2llcxLVAgoMQ3JlYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuQ3JlYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSKNAtpBDXBhcmVudCxwb2xpY3mK6jASYmIucG9saWNpZXMuY3JlYXRlkOowAZjqMAGC0+STAtgBOgZwb2xpY3laKjoGcG9saWN5IiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1ouOgZwb2xpY3kiJC92MS97cGFyZW50PWVudmlyb25tZW50cy8qfS9wb2xpY2llc1orOgZwb2xpY3kiIS92MS97cGFyZW50PWluc3RhbmNlcy8qfS9wb2xpY2llc1o3OgZwb2xpY3kiLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcyIML3YxL3BvbGljaWVzEoYDCgxVcGRhdGVQb2xpY3kSIC5ieXRlYmFzZS52MS5VcGRhdGVQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5Ir4C2kEScG9saWN5LHVwZGF0ZV9tYXNriuowEmJiLnBvbGljaWVzLnVwZGF0ZZDqMAGY6jABgtPkkwKEAjoGcG9saWN5WjE6BnBvbGljeTInL3YxL3twb2xpY3kubmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WjU6BnBvbGljeTIrL3YxL3twb2xpY3kubmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVoyOgZwb2xpY3kyKC92MS97cG9saWN5Lm5hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aPjoGcG9saWN5MjQvdjEve3BvbGljeS5uYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9MhwvdjEve3BvbGljeS5uYW1lPXBvbGljaWVzLyp9ErACCgxEZWxldGVQb2xpY3kSIC5ieXRlYmFzZS52MS5EZWxldGVQb2xpY3lSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IuUB2kEEbmFtZYrqMBJiYi5wb2xpY2llcy5kZWxldGWQ6jABmOowAYLT5JMCuQFaIiogL3YxL3tuYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aJiokL3YxL3tuYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WiMqIS92MS97bmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVovKi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0qFS92MS97bmFtZT1wb2xpY2llcy8qfUKrAQoPY29tLmJ5dGViYXNlLnYxQhVPcmdQb2xpY3lTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);
+ fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kilQYKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYBCABKAgSJQoEdHlwZRgFIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYEyABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgRIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGNlcHRpb25fcG9saWN5GBIgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4Y2VwdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYFSABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABJGChhkYXRhX3NvdXJjZV9xdWVyeV9wb2xpY3kYFiABKAsyIi5ieXRlYmFzZS52MS5EYXRhU291cmNlUXVlcnlQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgYIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYDSABKAgSOwoNcmVzb3VyY2VfdHlwZRgOIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOuUB6kHhAQoTYnl0ZWJhc2UuY29tL1BvbGljeRIRcG9saWNpZXMve3BvbGljeX0SJHByb2plY3RzL3twcm9qZWN0fS9wb2xpY2llcy97cG9saWN5fRIsZW52aXJvbm1lbnRzL3tlbnZpcm9ubWVudH0vcG9saWNpZXMve3BvbGljeX0SJmluc3RhbmNlcy97aW5zdGFuY2V9L3BvbGljaWVzL3twb2xpY3l9EjtpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9wb2xpY2llcy97cG9saWN5fUIICgZwb2xpY3lKBAgCEANKBAgXEBgivgMKDVJvbGxvdXRQb2xpY3kSEQoJYXV0b21hdGljGAEgASgIEg0KBXJvbGVzGAIgAygJEjUKCGNoZWNrZXJzGAQgASgLMiMuYnl0ZWJhc2UudjEuUm9sbG91dFBvbGljeS5DaGVja2VycxrTAgoIQ2hlY2tlcnMSHwoXcmVxdWlyZWRfaXNzdWVfYXBwcm92YWwYASABKAgSWAoWcmVxdWlyZWRfc3RhdHVzX2NoZWNrcxgCIAEoCzI4LmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMuUmVxdWlyZWRTdGF0dXNDaGVja3MacAoUUmVxdWlyZWRTdGF0dXNDaGVja3MSWAoWcGxhbl9jaGVja19lbmZvcmNlbWVudBgBIAEoDjI4LmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMuUGxhbkNoZWNrRW5mb3JjZW1lbnQiWgoUUGxhbkNoZWNrRW5mb3JjZW1lbnQSJgoiUExBTl9DSEVDS19FTkZPUkNFTUVOVF9VTlNQRUNJRklFRBAAEg4KCkVSUk9SX09OTFkQARIKCgZTVFJJQ1QQAiKqAQoPUXVlcnlEYXRhUG9saWN5EioKB3RpbWVvdXQYASABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SFgoOZGlzYWJsZV9leHBvcnQYAiABKAgSGwoTbWF4aW11bV9yZXN1bHRfc2l6ZRgDIAEoAxIbChNtYXhpbXVtX3Jlc3VsdF9yb3dzGAQgASgFEhkKEWRpc2FibGVfY29weV9kYXRhGAUgASgIIrQBChZNYXNraW5nRXhjZXB0aW9uUG9saWN5ElAKEm1hc2tpbmdfZXhjZXB0aW9ucxgBIAMoCzI0LmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kuTWFza2luZ0V4Y2VwdGlvbhpIChBNYXNraW5nRXhjZXB0aW9uEg4KBm1lbWJlchgDIAEoCRIkCgljb25kaXRpb24YBCABKAsyES5nb29nbGUudHlwZS5FeHByIqYBChFNYXNraW5nUnVsZVBvbGljeRI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5Lk1hc2tpbmdSdWxlGlYKC01hc2tpbmdSdWxlEgoKAmlkGAEgASgJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISFQoNc2VtYW50aWNfdHlwZRgDIAEoCSJoCglUYWdQb2xpY3kSLgoEdGFncxgBIAMoCzIgLmJ5dGViYXNlLnYxLlRhZ1BvbGljeS5UYWdzRW50cnkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEi4gEKFURhdGFTb3VyY2VRdWVyeVBvbGljeRJVCh1hZG1pbl9kYXRhX3NvdXJjZV9yZXN0cmljdGlvbhgBIAEoDjIuLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VRdWVyeVBvbGljeS5SZXN0cmljdGlvbhIUCgxkaXNhbGxvd19kZGwYAiABKAgSFAoMZGlzYWxsb3dfZG1sGAMgASgIIkYKC1Jlc3RyaWN0aW9uEhsKF1JFU1RSSUNUSU9OX1VOU1BFQ0lGSUVEEAASDAoIRkFMTEJBQ0sQARIMCghESVNBTExPVxACKsABCgpQb2xpY3lUeXBlEhsKF1BPTElDWV9UWVBFX1VOU1BFQ0lGSUVEEAASEgoOUk9MTE9VVF9QT0xJQ1kQCxIQCgxNQVNLSU5HX1JVTEUQCRIVChFNQVNLSU5HX0VYQ0VQVElPThAKEgcKA1RBRxANEhUKEURBVEFfU09VUkNFX1FVRVJZEA4SDgoKREFUQV9RVUVSWRAQIgQIAhACIgQIBBAEIgQIBhAGIgQIBRAFIgQIBxAHIgQIDBAMIgQIDxAPKmAKElBvbGljeVJlc291cmNlVHlwZRIdChlSRVNPVVJDRV9UWVBFX1VOU1BFQ0lGSUVEEAASDQoJV09SS1NQQUNFEAESDwoLRU5WSVJPTk1FTlQQAhILCgdQUk9KRUNUEAMy9AwKEE9yZ1BvbGljeVNlcnZpY2USoAIKCUdldFBvbGljeRIdLmJ5dGViYXNlLnYxLkdldFBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3ki3gHaQQRuYW1liuowD2JiLnBvbGljaWVzLmdldJDqMAGC0+STArkBWiISIC92MS97bmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WiYSJC92MS97bmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVojEiEvdjEve25hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aLxItL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9EhUvdjEve25hbWU9cG9saWNpZXMvKn0SqAIKDExpc3RQb2xpY2llcxIgLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UG9saWNpZXNSZXNwb25zZSLSAdpBAIrqMBBiYi5wb2xpY2llcy5saXN0kOowAYLT5JMCsAFaIhIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcG9saWNpZXNaJhIkL3YxL3twYXJlbnQ9ZW52aXJvbm1lbnRzLyp9L3BvbGljaWVzWiMSIS92MS97cGFyZW50PWluc3RhbmNlcy8qfS9wb2xpY2llc1ovEi0vdjEve3BhcmVudD1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn0vcG9saWNpZXMSDC92MS9wb2xpY2llcxLVAgoMQ3JlYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuQ3JlYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSKNAtpBDXBhcmVudCxwb2xpY3mK6jASYmIucG9saWNpZXMuY3JlYXRlkOowAZjqMAGC0+STAtgBOgZwb2xpY3laKjoGcG9saWN5IiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1ouOgZwb2xpY3kiJC92MS97cGFyZW50PWVudmlyb25tZW50cy8qfS9wb2xpY2llc1orOgZwb2xpY3kiIS92MS97cGFyZW50PWluc3RhbmNlcy8qfS9wb2xpY2llc1o3OgZwb2xpY3kiLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcyIML3YxL3BvbGljaWVzEoYDCgxVcGRhdGVQb2xpY3kSIC5ieXRlYmFzZS52MS5VcGRhdGVQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5Ir4C2kEScG9saWN5LHVwZGF0ZV9tYXNriuowEmJiLnBvbGljaWVzLnVwZGF0ZZDqMAGY6jABgtPkkwKEAjoGcG9saWN5WjE6BnBvbGljeTInL3YxL3twb2xpY3kubmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WjU6BnBvbGljeTIrL3YxL3twb2xpY3kubmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVoyOgZwb2xpY3kyKC92MS97cG9saWN5Lm5hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aPjoGcG9saWN5MjQvdjEve3BvbGljeS5uYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9MhwvdjEve3BvbGljeS5uYW1lPXBvbGljaWVzLyp9ErACCgxEZWxldGVQb2xpY3kSIC5ieXRlYmFzZS52MS5EZWxldGVQb2xpY3lSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IuUB2kEEbmFtZYrqMBJiYi5wb2xpY2llcy5kZWxldGWQ6jABmOowAYLT5JMCuQFaIiogL3YxL3tuYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aJiokL3YxL3tuYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WiMqIS92MS97bmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVovKi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0qFS92MS97bmFtZT1wb2xpY2llcy8qfUKrAQoPY29tLmJ5dGViYXNlLnYxQhVPcmdQb2xpY3lTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);
/**
* Describes the message bytebase.v1.CreatePolicyRequest.
@@ -120,20 +120,6 @@ export const MaskingExceptionPolicySchema = /*@__PURE__*/
export const MaskingExceptionPolicy_MaskingExceptionSchema = /*@__PURE__*/
messageDesc(file_v1_org_policy_service, 9, 0);
-/**
- * Describes the enum bytebase.v1.MaskingExceptionPolicy.MaskingException.Action.
- */
-export const MaskingExceptionPolicy_MaskingException_ActionSchema = /*@__PURE__*/
- enumDesc(file_v1_org_policy_service, 9, 0, 0);
-
-/**
- * The action that the exception permits.
- *
- * @generated from enum bytebase.v1.MaskingExceptionPolicy.MaskingException.Action
- */
-export const MaskingExceptionPolicy_MaskingException_Action = /*@__PURE__*/
- tsEnum(MaskingExceptionPolicy_MaskingException_ActionSchema);
-
/**
* Describes the message bytebase.v1.MaskingRulePolicy.
* Use `create(MaskingRulePolicySchema)` to create a new message.
diff --git a/frontend/src/views/project/ProjectMaskingExemption.vue b/frontend/src/views/project/ProjectMaskingExemption.vue
index 9e58091617..8609f8c0bd 100644
--- a/frontend/src/views/project/ProjectMaskingExemption.vue
+++ b/frontend/src/views/project/ProjectMaskingExemption.vue
@@ -10,12 +10,6 @@
:project-name="project.name"
v-model:database-name="state.selectedDatabaseName"
/>
- <MaskingActionDropdown
- v-model:action="state.selectedAction"
- style="width: 12rem"
- :clearable="true"
- :action-list="[Action.EXPORT, Action.QUERY]"
- />
</NInputGroup>
<div class="flex-1 flex flex-row items-center justify-end gap-x-2">
@@ -73,14 +67,12 @@ import { NButton, NInputGroup } from "naive-ui";
import { computed, reactive } from "vue";
import { useRouter } from "vue-router";
import { FeatureBadge, FeatureModal } from "@/components/FeatureGuard";
-import MaskingActionDropdown from "@/components/SensitiveData/components/MaskingActionDropdown.vue";
import MaskingExceptionUserTable from "@/components/SensitiveData/MaskingExceptionUserTable.vue";
import { type AccessUser } from "@/components/SensitiveData/types";
import { DatabaseSelect, SearchBox } from "@/components/v2";
import { PROJECT_V1_ROUTE_MASKING_EXEMPTION_CREATE } from "@/router/dashboard/projectV1";
import { hasFeature, useProjectByName } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
-import { MaskingExceptionPolicy_MaskingException_Action as Action } from "@/types/proto-es/v1/org_policy_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import { hasProjectPermissionV2 } from "@/utils";
@@ -88,7 +80,6 @@ interface LocalState {
searchText: string;
showFeatureModal: boolean;
selectedDatabaseName?: string;
- selectedAction?: Action;
}
const props = defineProps<{
@@ -117,9 +108,6 @@ const allowCreate = computed(() => {
});
const filterAccessUser = (user: AccessUser): boolean => {
- if (state.selectedAction && !user.supportActions.has(state.selectedAction)) {
- return false;
- }
if (
state.searchText.trim() &&
!user.key.toLowerCase().includes(state.searchText.trim())
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index e16d557165..245da333d2 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -11730,14 +11730,6 @@ components:
MaskingExceptionPolicy_MaskingException:
type: object
properties:
- action:
- enum:
- - ACTION_UNSPECIFIED
- - QUERY
- - EXPORT
- type: string
- description: The action that the user can perform on sensitive data.
- format: enum
member:
type: string
description: |-
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 0a17f42d29..34b1074e5a 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -217,7 +217,6 @@
- [DataSourceQueryPolicy.Restriction](#bytebase-store-DataSourceQueryPolicy-Restriction)
- [EnvironmentTierPolicy.EnvironmentTier](#bytebase-store-EnvironmentTierPolicy-EnvironmentTier)
- - [MaskingExceptionPolicy.MaskingException.Action](#bytebase-store-MaskingExceptionPolicy-MaskingException-Action)
- [Policy.Resource](#bytebase-store-Policy-Resource)
- [Policy.Type](#bytebase-store-Policy-Type)
@@ -3517,7 +3516,6 @@ MaskingExceptionPolicy is the allowlist of users who can access sensitive data.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| action | [MaskingExceptionPolicy.MaskingException.Action](#bytebase-store-MaskingExceptionPolicy-MaskingException-Action) | | action is the action by which the user can access sensitive data. |
| member | [string](#string) | | Member is the principal who binds to this exception policy instance.
Format: users/{email} or groups/{group email} |
@@ -3664,19 +3662,6 @@ QueryDataPolicy is the policy configuration for querying data.
-<a name="bytebase-store-MaskingExceptionPolicy-MaskingException-Action"></a>
-
-### MaskingExceptionPolicy.MaskingException.Action
-
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| ACTION_UNSPECIFIED | 0 | |
-| QUERY | 1 | |
-| EXPORT | 2 | |
-
-
-
<a name="bytebase-store-Policy-Resource"></a>
### Policy.Resource
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 9650563995..a7f829e8e5 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -1030,10 +1030,6 @@
<a href="#bytebase.store.EnvironmentTierPolicy.EnvironmentTier"><span class="badge">E</span>EnvironmentTierPolicy.EnvironmentTier</a>
</li>
- <li>
- <a href="#bytebase.store.MaskingExceptionPolicy.MaskingException.Action"><span class="badge">E</span>MaskingExceptionPolicy.MaskingException.Action</a>
- </li>
-
<li>
<a href="#bytebase.store.Policy.Resource"><span class="badge">E</span>Policy.Resource</a>
</li>
@@ -9794,13 +9790,6 @@ A binding binds one or more members or groups to a single role. </p></td>
</thead>
<tbody>
- <tr>
- <td>action</td>
- <td><a href="#bytebase.store.MaskingExceptionPolicy.MaskingException.Action">MaskingExceptionPolicy.MaskingException.Action</a></td>
- <td></td>
- <td><p>action is the action by which the user can access sensitive data. </p></td>
- </tr>
-
<tr>
<td>member</td>
<td><a href="#string">string</a></td>
@@ -10094,35 +10083,6 @@ For example, the environment resource can have the SQL review config tag, such a
</tbody>
</table>
- <h3 id="bytebase.store.MaskingExceptionPolicy.MaskingException.Action">MaskingExceptionPolicy.MaskingException.Action</h3>
- <p></p>
- <table class="enum-table">
- <thead>
- <tr><td>Name</td><td>Number</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>ACTION_UNSPECIFIED</td>
- <td>0</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>QUERY</td>
- <td>1</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>EXPORT</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
- </tbody>
- </table>
-
<h3 id="bytebase.store.Policy.Resource">Policy.Resource</h3>
<p></p>
<table class="enum-table">
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 2afeffebea..177f48d2c6 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -412,7 +412,6 @@
- [UpdatePolicyRequest](#bytebase-v1-UpdatePolicyRequest)
- [DataSourceQueryPolicy.Restriction](#bytebase-v1-DataSourceQueryPolicy-Restriction)
- - [MaskingExceptionPolicy.MaskingException.Action](#bytebase-v1-MaskingExceptionPolicy-MaskingException-Action)
- [PolicyResourceType](#bytebase-v1-PolicyResourceType)
- [PolicyType](#bytebase-v1-PolicyType)
- [RolloutPolicy.Checkers.PlanCheckEnforcement](#bytebase-v1-RolloutPolicy-Checkers-PlanCheckEnforcement)
@@ -6726,7 +6725,6 @@ An exception allowing specific users to access masked data.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| action | [MaskingExceptionPolicy.MaskingException.Action](#bytebase-v1-MaskingExceptionPolicy-MaskingException-Action) | | The action that the user can perform on sensitive data. |
| member | [string](#string) | | Member is the principal who bind to this exception policy instance.
- `user:{email}`: An email address that represents a specific Bytebase account. For example, `[email protected]`. - `group:{email}`: An email address for group. |
@@ -6936,19 +6934,6 @@ Restriction level for admin data source access.
-<a name="bytebase-v1-MaskingExceptionPolicy-MaskingException-Action"></a>
-
-### MaskingExceptionPolicy.MaskingException.Action
-The action that the exception permits.
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| ACTION_UNSPECIFIED | 0 | Unspecified action. |
-| QUERY | 1 | Allow querying sensitive data. |
-| EXPORT | 2 | Allow exporting sensitive data. |
-
-
-
<a name="bytebase-v1-PolicyResourceType"></a>
### PolicyResourceType
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 4ce7699073..4beb5d2616 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -1750,10 +1750,6 @@
<a href="#bytebase.v1.DataSourceQueryPolicy.Restriction"><span class="badge">E</span>DataSourceQueryPolicy.Restriction</a>
</li>
- <li>
- <a href="#bytebase.v1.MaskingExceptionPolicy.MaskingException.Action"><span class="badge">E</span>MaskingExceptionPolicy.MaskingException.Action</a>
- </li>
-
<li>
<a href="#bytebase.v1.PolicyResourceType"><span class="badge">E</span>PolicyResourceType</a>
</li>
@@ -18924,13 +18920,6 @@ Format: {resource type}/{resource id} </p></td>
</thead>
<tbody>
- <tr>
- <td>action</td>
- <td><a href="#bytebase.v1.MaskingExceptionPolicy.MaskingException.Action">MaskingExceptionPolicy.MaskingException.Action</a></td>
- <td></td>
- <td><p>The action that the user can perform on sensitive data. </p></td>
- </tr>
-
<tr>
<td>member</td>
<td><a href="#string">string</a></td>
@@ -19434,35 +19423,6 @@ In this situation, `update_mask` is ignored. </p></td>
</tbody>
</table>
- <h3 id="bytebase.v1.MaskingExceptionPolicy.MaskingException.Action">MaskingExceptionPolicy.MaskingException.Action</h3>
- <p>The action that the exception permits.</p>
- <table class="enum-table">
- <thead>
- <tr><td>Name</td><td>Number</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>ACTION_UNSPECIFIED</td>
- <td>0</td>
- <td><p>Unspecified action.</p></td>
- </tr>
-
- <tr>
- <td>QUERY</td>
- <td>1</td>
- <td><p>Allow querying sensitive data.</p></td>
- </tr>
-
- <tr>
- <td>EXPORT</td>
- <td>2</td>
- <td><p>Allow exporting sensitive data.</p></td>
- </tr>
-
- </tbody>
- </table>
-
<h3 id="bytebase.v1.PolicyResourceType">PolicyResourceType</h3>
<p>The resource type that a policy can be attached to.</p>
<table class="enum-table">
diff --git a/proto/store/store/policy.proto b/proto/store/store/policy.proto
index 95cc509349..10ce5b9a92 100644
--- a/proto/store/store/policy.proto
+++ b/proto/store/store/policy.proto
@@ -35,14 +35,6 @@ message RolloutPolicy {
// MaskingExceptionPolicy is the allowlist of users who can access sensitive data.
message MaskingExceptionPolicy {
message MaskingException {
- enum Action {
- ACTION_UNSPECIFIED = 0;
- QUERY = 1;
- EXPORT = 2;
- }
- // action is the action by which the user can access sensitive data.
- Action action = 1;
-
// Member is the principal who binds to this exception policy instance.
//
// Format: users/{email} or groups/{group email}
diff --git a/proto/v1/v1/org_policy_service.proto b/proto/v1/v1/org_policy_service.proto
index 0975414895..6c1970cc6b 100644
--- a/proto/v1/v1/org_policy_service.proto
+++ b/proto/v1/v1/org_policy_service.proto
@@ -339,18 +339,6 @@ message QueryDataPolicy {
message MaskingExceptionPolicy {
// An exception allowing specific users to access masked data.
message MaskingException {
- // The action that the exception permits.
- enum Action {
- // Unspecified action.
- ACTION_UNSPECIFIED = 0;
- // Allow querying sensitive data.
- QUERY = 1;
- // Allow exporting sensitive data.
- EXPORT = 2;
- }
- // The action that the user can perform on sensitive data.
- Action action = 1;
-
// Member is the principal who bind to this exception policy instance.
//
// - `user:{email}`: An email address that represents a specific Bytebase account. For example, `[email protected]`.