Skip to content

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

feat: implement export jit backend (#20487)

ecmadao5f22911ac6c9
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index cb8529c8f3..7eafae87c5 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -7878,6 +7878,10 @@ components:
reason:
type: string
title: reason
+ export:
+ type: boolean
+ title: export
+ description: Whether export the query result.
- oneOf:
- type: object
properties:
@@ -11392,6 +11396,13 @@ components:
title: content
format: byte
description: The export file content.
+ appliedAccessGrant:
+ type: string
+ title: applied_access_grant
+ description: |-
+ The just-in-time access grant applied to this export, if any.
+ Format: projects/{project}/accessGrants/{accessGrant}.
+ Empty when the user was authorized through normal ACL rather than a grant.
title: ExportResponse
additionalProperties: false
bytebase.v1.ExportVCSProviderUsersRequest:
@@ -12949,6 +12960,8 @@ components:
- create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
- query: the access query, support "==" and ".contains(xx)" operator
- target: the target database fullname, support "==" operator.
+ - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
Examples:
- creator == "users/[email protected]"
@@ -12958,6 +12971,8 @@ components:
- issue == "projects/x/issues/123"
- status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
- target == "instances/sample/databases/employee"
+ - unmask == true
+ - export == true && status == "ACTIVE"
orderBy:
type: string
title: order_by
@@ -15854,6 +15869,13 @@ components:
$ref: '#/components/schemas/bytebase.v1.QueryResult'
title: results
description: The query results.
+ appliedAccessGrant:
+ type: string
+ title: applied_access_grant
+ description: |-
+ The just-in-time access grant applied to this query, if any.
+ Format: projects/{project}/accessGrants/{accessGrant}.
+ Empty when the user was authorized through normal ACL rather than a grant.
title: QueryResponse
additionalProperties: false
bytebase.v1.QueryResult:
@@ -20487,7 +20509,7 @@ components:
When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
- When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+ When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
For examples:
resource.environment_id == "prod" && statement.affected_rows >= 100
diff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.go
index 02f1e50fc0..9c455853ed 100644
--- a/backend/api/v1/access_grant_service.go
+++ b/backend/api/v1/access_grant_service.go
@@ -202,6 +202,7 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
Targets: ag.Targets,
Query: ag.Query,
Unmask: ag.Unmask,
+ Export: ag.Export,
Reason: ag.Reason,
RequestedDuration: requestedDuration,
},
@@ -428,6 +429,7 @@ func convertToAccessGrant(msg *store.AccessGrantMessage) *v1pb.AccessGrant {
ag.Targets = p.Targets
ag.Query = p.Query
ag.Unmask = p.Unmask
+ ag.Export = p.Export
if p.IssueId != 0 {
ag.Issue = common.FormatIssue(msg.ProjectID, p.IssueId)
}
diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.go
index ffdcd06eab..6db8dae513 100644
--- a/backend/api/v1/audit.go
+++ b/backend/api/v1/audit.go
@@ -499,7 +499,7 @@ func getResponseString(response any) (string, error) {
case *v1pb.AdminExecuteResponse:
return redactAdminExecuteResponse(r)
case *v1pb.ExportResponse:
- return nil
+ return redactExportResponse(r)
case *v1pb.LoginResponse:
return redactLoginResponse(r)
case *v1pb.ExchangeTokenResponse:
@@ -536,6 +536,17 @@ func redactExportRequest(r *v1pb.ExportRequest) *v1pb.ExportRequest {
return r
}
+// redactExportResponse drops the exported file content but keeps the applied
+// access grant so audit logs record which grant authorized the export.
+func redactExportResponse(r *v1pb.ExportResponse) *v1pb.ExportResponse {
+ if r == nil || r.AppliedAccessGrant == "" {
+ return nil
+ }
+ return &v1pb.ExportResponse{
+ AppliedAccessGrant: r.AppliedAccessGrant,
+ }
+}
+
func redactLoginRequest(r *v1pb.LoginRequest) *v1pb.LoginRequest {
if r == nil {
return nil
@@ -733,7 +744,8 @@ func redactQueryResponse(r *v1pb.QueryResponse) *v1pb.QueryResponse {
return nil
}
n := &v1pb.QueryResponse{
- Results: nil,
+ Results: nil,
+ AppliedAccessGrant: r.AppliedAccessGrant,
}
for _, result := range r.Results {
n.Results = append(n.Results, &v1pb.QueryResult{
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 07caed4d5d..2e53406a96 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -162,10 +162,50 @@ func (s *SQLService) AdminExecute(ctx context.Context, stream *connect.BidiStrea
}
}
-// preCheckAccess finds and returns the best matching active access grant for the query.
-// It lists access grants filtered by project, creator, status, statement, target database,
-// and expiry, then prefers the grant with unmask=true if available.
-func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequest, instance *store.InstanceMessage, database *store.DatabaseMessage) *store.AccessGrantMessage {
+// buildExportQueryContext assembles the db.QueryContext for an export request.
+// SkipMasking has to be set here (not only checked around the post-execution
+// MaskResults pass) because some drivers mask at query time via SQL rewrites
+// — by the time the second pass runs the rows would already be masked, and
+// a JIT grant with unmask=true would silently export masked data. See PR
+// #20487 review (RainbowDashy).
+func buildExportQueryContext(restriction *store.EffectiveQueryDataPolicy, userEmail string, schema *string, skipMasking bool) db.QueryContext {
+ qc := db.QueryContext{
+ Limit: int(restriction.MaximumResultRows),
+ OperatorEmail: userEmail,
+ MaximumSQLResultSize: restriction.MaximumResultSize,
+ SkipMasking: skipMasking,
+ }
+ if restriction.MaxQueryTimeoutInSeconds > 0 {
+ qc.Timeout = &durationpb.Duration{Seconds: restriction.MaxQueryTimeoutInSeconds}
+ }
+ if schema != nil {
+ qc.Schema = *schema
+ }
+ return qc
+}
+
+// accessOperation distinguishes between Query and Export so preCheckAccess can pick
+// a grant whose capabilities actually authorize the operation in question.
+type accessOperation int
+
+const (
+ accessOperationQuery accessOperation = iota
+ accessOperationExport
+)
+
+// preCheckAccess finds and returns the best matching active access grant for the
+// requested operation. It lists active grants filtered by project, creator,
+// statement, target database, and expiry, then narrows and ranks them per
+// operation:
+//
+// - Query: any matching grant confers ACL bypass; among them, prefer Unmask=true
+// so SkipMasking can be turned on when the user is entitled to unmasked data.
+// - Export: only grants with Export=true authorize the export, so filter to
+// those first; among them, prefer Unmask=true to also skip masking.
+//
+// The returned grant is guaranteed to have a non-nil Payload — callers may
+// deref Payload.Unmask / Payload.Export without an additional check.
+func (s *SQLService) preCheckAccess(ctx context.Context, statement string, instance *store.InstanceMessage, database *store.DatabaseMessage, operation accessOperation) *store.AccessGrantMessage {
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &database.ProjectID,
@@ -195,7 +235,7 @@ func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequ
`status == "ACTIVE" && target == %q && expire_time > %q && query == %q`,
databaseFullName,
now,
- strings.TrimSpace(request.Statement),
+ strings.TrimSpace(statement),
)
filterQ, err := store.GetListAccessGrantFilter(filter)
if err != nil {
@@ -217,7 +257,7 @@ func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequ
if len(grants) == 0 {
return nil
}
- readOnly, err := isReadOnlyStatementForAccessGrant(ctx, instance.Metadata.GetEngine(), request.Statement)
+ readOnly, err := isReadOnlyStatementForAccessGrant(ctx, instance.Metadata.GetEngine(), statement)
if err != nil {
slog.Warn("failed to validate access grant query", log.BBError(err))
return nil
@@ -226,13 +266,35 @@ func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequ
slog.Warn("skip access grant for non-read-only query", slog.String("instance", instance.ResourceID), slog.String("database", database.DatabaseName))
return nil
}
- // Pick the best grant (prefer unmask=true).
+ // Narrow to grants whose capabilities actually authorize this operation,
+ // then prefer Unmask=true so the caller can set SkipMasking when the
+ // user is entitled to unmasked data. Filtering keeps Query from ever
+ // being "covered" by an export-only grant (which would still bypass the
+ // ACL check) when an unmask grant exists in the same set — see the
+ // review note that the old combined score conflated the two dimensions.
+ var candidates []*store.AccessGrantMessage
for _, grant := range grants {
- if grant.Payload != nil && grant.Payload.Unmask {
- return grant
+ if grant.Payload == nil {
+ // Defensive: a nil payload means we can't read Unmask/Export
+ // anyway, so it can't authorize anything beyond raw ACL bypass.
+ // Skipping here also lets downstream callers deref Payload safely.
+ continue
+ }
+ if operation == accessOperationExport && !grant.Payload.Export {
+ continue
+ }
+ candidates = append(candidates, grant)
+ }
+ if len(candidates) == 0 {
+ return nil
+ }
+ best := candidates[0]
+ for _, grant := range candidates[1:] {
+ if !best.Payload.Unmask && grant.Payload.Unmask {
+ best = grant
}
}
- return grants[0]
+ return best
}
func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryRequest]) (*connect.Response[v1pb.QueryResponse], error) {
@@ -243,7 +305,7 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
return nil, err
}
- accessGrant := s.preCheckAccess(ctx, request, instance, database)
+ accessGrant := s.preCheckAccess(ctx, request.Statement, instance, database, accessOperationQuery)
statement := request.Statement
// In Redshift datashare, Rewrite query used for parser.
@@ -319,10 +381,12 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
queryContext.Timeout = &durationpb.Duration{Seconds: queryRestriction.MaxQueryTimeoutInSeconds}
}
- var optionalAccessCheck accessCheckFunc
- if accessGrant == nil {
- optionalAccessCheck = s.accessCheck
- }
+ // Span-level ACL still runs even when a JIT grant matched. The grant
+ // authorizes only its target databases — any cross-database reference
+ // (e.g. `SELECT * FROM db_b.secret` from a grant on `db_a`) still has
+ // to clear the regular IAM check on the foreign database. See PR
+ // #20487 review for the cross-DB exfiltration scenario this guards.
+ optionalAccessCheck := s.accessCheckWithGrant(accessGrant)
results, _, duration, queryErr := queryRetryStopOnError(
ctx,
s.store,
@@ -392,6 +456,9 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
response := &v1pb.QueryResponse{
Results: results,
}
+ if accessGrant != nil {
+ response.AppliedAccessGrant = common.FormatAccessGrant(accessGrant.ProjectID, accessGrant.ID)
+ }
return connect.NewResponse(response), nil
}
@@ -886,6 +953,12 @@ func (s *SQLService) Export(ctx context.Context, req *connect.Request[v1pb.Expor
statement = strings.ReplaceAll(statement, fmt.Sprintf("%s.", database.DatabaseName), "")
}
+ // When an active access grant covers this export request, the user is already
+ // authorized and we skip the regular ACL check, just like the Query request.
+ // `preCheckAccess(..., accessOperationExport)` only returns grants with
+ // Export=true, so the presence of a grant here is sufficient to bypass ACL.
+ accessGrant := s.preCheckAccess(ctx, request.Statement, instance, database, accessOperationExport)
+
// Validate the request.
// New query ACL experience.
if instance.Metadata.GetEngine() != storepb.Engine_MYSQL {
@@ -903,7 +976,16 @@ 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)
+
+ // Same cross-database guardrail as Query: the JIT grant authorizes only
+ // its target databases, so span-level ACL still runs and only the
+ // granted targets are exempted from IAM. See PR #20487 review.
+ optionalAccessCheck := s.accessCheckWithGrant(accessGrant)
+ skipMasking := false
+ if accessGrant != nil {
+ skipMasking = accessGrant.Payload.Unmask
+ }
+ bytes, duration, exportErr := doExport(ctx, s.store, s.dbFactory, s.licenseService, request, user, instance, database, optionalAccessCheck, s.schemaSyncer, dataSource, skipMasking)
s.createQueryHistory(database, store.QueryHistoryTypeExport, statement, user.Email, duration, exportErr)
@@ -911,9 +993,14 @@ func (s *SQLService) Export(ctx context.Context, req *connect.Request[v1pb.Expor
return nil, connect.NewError(connect.CodeInternal, errors.New(exportErr.Error()))
}
- return connect.NewResponse(&v1pb.ExportResponse{
+ exportResponse := &v1pb.ExportResponse{
Content: bytes,
- }), nil
+ }
+ if accessGrant != nil {
+ exportResponse.AppliedAccessGrant = common.FormatAccessGrant(accessGrant.ProjectID, accessGrant.ID)
+ }
+
+ return connect.NewResponse(exportResponse), nil
}
func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string) (*v1pb.ExportResponse, error) {
@@ -1043,6 +1130,7 @@ func doExport(
optionalAccessCheck accessCheckFunc,
schemaSyncer *schemasync.Syncer,
dataSource *storepb.DataSource,
+ skipMasking bool,
) ([]byte, time.Duration, error) {
if dataSource == nil {
return nil, 0, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot found valid data source"))
@@ -1073,17 +1161,7 @@ func doExport(
request.Limit,
database.ProjectID,
)
- queryContext := db.QueryContext{
- Limit: int(queryRestriction.MaximumResultRows),
- OperatorEmail: user.Email,
- MaximumSQLResultSize: queryRestriction.MaximumResultSize,
- }
- if queryRestriction.MaxQueryTimeoutInSeconds > 0 {
- queryContext.Timeout = &durationpb.Duration{Seconds: queryRestriction.MaxQueryTimeoutInSeconds}
- }
- if request.Schema != nil {
- queryContext.Schema = *request.Schema
- }
+ queryContext := buildExportQueryContext(queryRestriction, user.Email, request.Schema, skipMasking)
// Split the statement for span analysis
statements, err := parserbase.SplitMultiSQL(instance.Metadata.GetEngine(), request.Statement)
@@ -1111,7 +1189,7 @@ func doExport(
return nil, duration, queryErr
}
- if licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if !skipMasking && licenseService.IsFeatureEnabledForInstance(ctx, common.GetWorkspaceIDFromContext(ctx), v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
if err := masker.MaskResults(ctx, spans, results, instance, user); err != nil {
return nil, duration, err
@@ -1481,6 +1559,40 @@ func (s *SQLService) accessCheck(
user *store.UserMessage,
spans []*parserbase.QuerySpan,
isExplain bool,
+) error {
+ return s.accessCheckWithGrantedTargets(ctx, instance, database, user, spans, isExplain, nil)
+}
+
+// accessCheckWithGrant returns an accessCheckFunc that exempts the access
+// grant's target databases from IAM checks while keeping span-level checks for
+// every other source database. This preserves JIT-grant behavior for the
+// grant's target (the user is already authorized there) but blocks cross-
+// database exfiltration via cross-DB references like `SELECT * FROM db_b.t`
+// from a grant targeting `db_a` — see PR #20487 review.
+//
+// Pass `accessGrant == nil` to skip wrapping; callers in that case should
+// reference `s.accessCheck` directly.
+func (s *SQLService) accessCheckWithGrant(accessGrant *store.AccessGrantMessage) accessCheckFunc {
+ if accessGrant == nil || accessGrant.Payload == nil {
+ return s.accessCheck
+ }
+ grantedTargets := make(map[string]struct{}, len(accessGrant.Payload.Targets))
+ for _, t := range accessGrant.Payload.Targets {
+ grantedTargets[t] = struct{}{}
+ }
+ return func(ctx context.Context, instance *store.InstanceMessage, database *store.DatabaseMessage, user *store.UserMessage, spans []*parserbase.QuerySpan, isExplain bool) error {
+ return s.accessCheckWithGrantedTargets(ctx, instance, database, user, spans, isExplain, grantedTargets)
+ }
+}
+
+func (s *SQLService) accessCheckWithGrantedTargets(
+ ctx context.Context,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ user *store.UserMessage,
+ spans []*parserbase.QuerySpan,
+ isExplain bool,
+ grantedTargets map[string]struct{},
) error {
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), ResourceID: &database.ProjectID})
if err != nil {
@@ -1502,6 +1614,9 @@ func (s *SQLService) accessCheck(
checkDatabaseAccess := func(perm permission.Permission) error {
databaseFullName := common.FormatDatabase(instance.ResourceID, database.DatabaseName)
+ if _, granted := grantedTargets[databaseFullName]; granted {
+ return nil
+ }
attributes := map[string]any{
common.CELAttributeRequestTime: time.Now(),
common.CELAttributeResourceDatabase: databaseFullName,
@@ -1585,9 +1700,13 @@ func (s *SQLService) accessCheck(
var deniedResources []string
for column := range span.SourceColumns {
+ columnDatabaseFullName := common.FormatDatabase(instance.ResourceID, column.Database)
+ if _, granted := grantedTargets[columnDatabaseFullName]; granted {
+ continue
+ }
attributes := map[string]any{
common.CELAttributeRequestTime: time.Now(),
- common.CELAttributeResourceDatabase: common.FormatDatabase(instance.ResourceID, column.Database),
+ common.CELAttributeResourceDatabase: columnDatabaseFullName,
common.CELAttributeResourceSchemaName: column.Schema,
common.CELAttributeResourceTableName: column.Table,
}
diff --git a/backend/api/v1/sql_service_test.go b/backend/api/v1/sql_service_test.go
index ab79c7f4e8..e6de5ace43 100644
--- a/backend/api/v1/sql_service_test.go
+++ b/backend/api/v1/sql_service_test.go
@@ -10,6 +10,63 @@ import (
"github.com/bytebase/bytebase/backend/store"
)
+// TestBuildExportQueryContextPropagatesSkipMasking pins the bug fix from PR
+// #20487: when an export is authorized by a JIT grant with unmask=true,
+// SkipMasking must reach db.QueryContext so the driver doesn't mask rows at
+// query time. The earlier code only consulted skipMasking around the
+// post-execution MaskResults pass — by then drivers like postgres with
+// query-time masking rewrites had already returned masked rows.
+func TestBuildExportQueryContextPropagatesSkipMasking(t *testing.T) {
+ restriction := &store.EffectiveQueryDataPolicy{
+ MaximumResultRows: 1000,
+ MaximumResultSize: 1 << 20,
+ }
+
+ t.Run("grant with unmask=true sets SkipMasking", func(t *testing.T) {
+ qc := buildExportQueryContext(restriction, "[email protected]", nil, true)
+ require.True(t, qc.SkipMasking, "SkipMasking must propagate so driver-level masking is bypassed")
+ })
+
+ t.Run("grant with unmask=false keeps SkipMasking false", func(t *testing.T) {
+ qc := buildExportQueryContext(restriction, "[email protected]", nil, false)
+ require.False(t, qc.SkipMasking, "SkipMasking must stay false so masking still applies")
+ })
+}
+
+// TestBuildExportQueryContextPropagatesOtherFields guards against accidental
+// drops of the surrounding fields if buildExportQueryContext is edited.
+func TestBuildExportQueryContextPropagatesOtherFields(t *testing.T) {
+ schema := "public"
+ restriction := &store.EffectiveQueryDataPolicy{
+ MaximumResultRows: 500,
+ MaximumResultSize: 2 << 20,
+ MaxQueryTimeoutInSeconds: 30,
+ }
+
+ qc := buildExportQueryContext(restriction, "[email protected]", &schema, false)
+
+ require.Equal(t, 500, qc.Limit)
+ require.Equal(t, "[email protected]", qc.OperatorEmail)
+ require.Equal(t, int64(2<<20), qc.MaximumSQLResultSize)
+ require.Equal(t, "public", qc.Schema)
+ require.NotNil(t, qc.Timeout)
+ require.Equal(t, int64(30), qc.Timeout.Seconds)
+}
+
+// TestBuildExportQueryContextOmitsTimeoutWhenZero verifies that an unset
+// MaxQueryTimeoutInSeconds doesn't leak a zero-Duration timeout into the
+// query context (which the driver layer treats differently from "no timeout").
+func TestBuildExportQueryContextOmitsTimeoutWhenZero(t *testing.T) {
+ restriction := &store.EffectiveQueryDataPolicy{
+ MaximumResultRows: 100,
+ MaximumResultSize: 1 << 20,
+ }
+
+ qc := buildExportQueryContext(restriction, "[email protected]", nil, false)
+ require.Nil(t, qc.Timeout)
+ require.Equal(t, "", qc.Schema)
+}
+
func TestResolveDataSourceIDUsesAdminForNonReadOnlyAutomaticQueryWhenAllowed(t *testing.T) {
instance := &store.InstanceMessage{
Metadata: &storepb.Instance{
diff --git a/backend/common/cel.go b/backend/common/cel.go
index fa283a6f49..7faf0136a9 100644
--- a/backend/common/cel.go
+++ b/backend/common/cel.go
@@ -34,6 +34,7 @@ var ApprovalFactors = []cel.EnvOption{
cel.Variable(CELAttributeRequestExpirationDays, cel.IntType),
cel.Variable(CELAttributeRequestRole, cel.StringType),
cel.Variable(CELAttributeRequestUnmask, cel.BoolType),
+ cel.Variable(CELAttributeRequestExport, cel.BoolType),
// Risk scope
cel.Variable(CELAttributeRiskLevel, cel.StringType),
// Size limit
diff --git a/backend/common/cel_attributes.go b/backend/common/cel_attributes.go
index 9d18645b1d..2e48741533 100644
--- a/backend/common/cel_attributes.go
+++ b/backend/common/cel_attributes.go
@@ -47,6 +47,8 @@ const (
CELAttributeRequestRole = "request.role"
// CELAttributeRequestUnmask indicates whether the request includes unmask permission.
CELAttributeRequestUnmask = "request.unmask"
+ // CELAttributeRequestExport indicates whether the request includes export permission.
+ CELAttributeRequestExport = "request.data_export"
// CELAttributeRequestTime is the timestamp of the request.
CELAttributeRequestTime = "request.time"
)
diff --git a/backend/generated-go/store/access_grant.pb.go b/backend/generated-go/store/access_grant.pb.go
index 5897bf8bad..820ce7ada0 100644
--- a/backend/generated-go/store/access_grant.pb.go
+++ b/backend/generated-go/store/access_grant.pb.go
@@ -126,8 +126,10 @@ type AccessGrantPayload struct {
// Stored when the user provides a TTL instead of an absolute expire_time.
// The server computes expire_time from this value at activation time.
RequestedDuration *durationpb.Duration `protobuf:"bytes,6,opt,name=requested_duration,json=requestedDuration,proto3" json:"requested_duration,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Whether export the query result.
+ Export bool `protobuf:"varint,7,opt,name=export,proto3" json:"export,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *AccessGrantPayload) Reset() {
@@ -202,6 +204,13 @@ func (x *AccessGrantPayload) GetRequestedDuration() *durationpb.Duration {
return nil
}
+func (x *AccessGrantPayload) GetExport() bool {
+ if x != nil {
+ return x.Export
+ }
+ return false
+}
+
var File_store_access_grant_proto protoreflect.FileDescriptor
const file_store_access_grant_proto_rawDesc = "" +
@@ -213,14 +222,15 @@ const file_store_access_grant_proto_rawDesc = "" +
"\aPENDING\x10\x01\x12\n" +
"\n" +
"\x06ACTIVE\x10\x02\x12\v\n" +
- "\aREVOKED\x10\x03\"\xd9\x01\n" +
+ "\aREVOKED\x10\x03\"\xf1\x01\n" +
"\x12AccessGrantPayload\x12\x19\n" +
"\bissue_id\x18\x01 \x01(\x03R\aissueId\x12\x18\n" +
"\atargets\x18\x02 \x03(\tR\atargets\x12\x14\n" +
"\x05query\x18\x03 \x01(\tR\x05query\x12\x16\n" +
"\x06unmask\x18\x04 \x01(\bR\x06unmask\x12\x16\n" +
"\x06reason\x18\x05 \x01(\tR\x06reason\x12H\n" +
- "\x12requested_duration\x18\x06 \x01(\v2\x19.google.protobuf.DurationR\x11requestedDurationB\x93\x01\n" +
+ "\x12requested_duration\x18\x06 \x01(\v2\x19.google.protobuf.DurationR\x11requestedDuration\x12\x16\n" +
+ "\x06export\x18\a \x01(\bR\x06exportB\x93\x01\n" +
"\x12com.bytebase.storeB\x10AccessGrantProtoP\x01Z\x12generated-go/store\xa2\x02\x03BSX\xaa\x02\x0eBytebase.Store\xca\x02\x0eBytebase\\Store\xe2\x02\x1aBytebase\\Store\\GPBMetadata\xea\x02\x0fBytebase::Storeb\x06proto3"
var (
diff --git a/backend/generated-go/store/access_grant_equal.pb.go b/backend/generated-go/store/access_grant_equal.pb.go
index 269b937497..ad6fb5984e 100644
--- a/backend/generated-go/store/access_grant_equal.pb.go
+++ b/backend/generated-go/store/access_grant_equal.pb.go
@@ -43,5 +43,8 @@ func (x *AccessGrantPayload) Equal(y *AccessGrantPayload) bool {
if p, q := x.RequestedDuration, y.RequestedDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
return false
}
+ if x.Export != y.Export {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/access_grant_service.pb.go b/backend/generated-go/v1/access_grant_service.pb.go
index ce444879de..ba36ce4004 100644
--- a/backend/generated-go/v1/access_grant_service.pb.go
+++ b/backend/generated-go/v1/access_grant_service.pb.go
@@ -114,10 +114,12 @@ type AccessGrant struct {
// The query permission granted.
Query string `protobuf:"bytes,7,opt,name=query,proto3" json:"query,omitempty"`
// Whether the grant allows unmasking sensitive data.
- Unmask bool `protobuf:"varint,8,opt,name=unmask,proto3" json:"unmask,omitempty"`
- CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
- UpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
- Reason string `protobuf:"bytes,12,opt,name=reason,proto3" json:"reason,omitempty"`
+ Unmask bool `protobuf:"varint,8,opt,name=unmask,proto3" json:"unmask,omitempty"`
+ CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+ UpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+ Reason string `protobuf:"bytes,12,opt,name=reason,proto3" json:"reason,omitempty"`
+ // Whether export the query result.
+ Export bool `protobuf:"varint,13,opt,name=export,proto3" json:"export,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -247,6 +249,13 @@ func (x *AccessGrant) GetReason() string {
return ""
}
+func (x *AccessGrant) GetExport() bool {
+ if x != nil {
+ return x.Export
+ }
+ return false
+}
+
type isAccessGrant_Expiration interface {
isAccessGrant_Expiration()
}
@@ -331,6 +340,8 @@ type ListAccessGrantsRequest struct {
// - create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
// - query: the access query, support "==" and ".contains(xx)" operator
// - target: the target database fullname, support "==" operator.
+ // - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ // - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
//
// Examples:
// - creator == "users/[email protected]"
@@ -340,6 +351,8 @@ type ListAccessGrantsRequest struct {
// - issue == "projects/x/issues/123"
// - status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
// - target == "instances/sample/databases/employee"
+ // - unmask == true
+ // - export == true && status == "ACTIVE"
Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
// The order by of access grants.
// Support creator, expire_time, create_time. The default sorting order is ascending.
@@ -760,7 +773,7 @@ var File_v1_access_grant_service_proto protoreflect.FileDescriptor
const file_v1_access_grant_service_proto_rawDesc = "" +
"\n" +
- "\x1dv1/access_grant_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\"\x9a\x05\n" +
+ "\x1dv1/access_grant_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\"\xb2\x05\n" +
"\vAccessGrant\x12\x12\n" +
"\x04name\x18\x01 \x01(\tR\x04name\x12\x1d\n" +
"\acreator\x18\x02 \x01(\tB\x03\xe0A\x02R\acreator\x12<\n" +
@@ -777,7 +790,8 @@ const file_v1_access_grant_service_proto_rawDesc = "" +
"\vupdate_time\x18\n" +
" \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +
"updateTime\x12\x16\n" +
- "\x06reason\x18\f \x01(\tR\x06reason\"F\n" +
+ "\x06reason\x18\f \x01(\tR\x06reason\x12\x16\n" +
+ "\x06export\x18\r \x01(\bR\x06export\"F\n" +
"\x06Status\x12\x16\n" +
"\x12STATUS_UNSPECIFIED\x10\x00\x12\v\n" +
"\aPENDING\x10\x01\x12\n" +
diff --git a/backend/generated-go/v1/access_grant_service_equal.pb.go b/backend/generated-go/v1/access_grant_service_equal.pb.go
index 35cf69eda0..0e34eba682 100644
--- a/backend/generated-go/v1/access_grant_service_equal.pb.go
+++ b/backend/generated-go/v1/access_grant_service_equal.pb.go
@@ -51,6 +51,9 @@ func (x *AccessGrant) Equal(y *AccessGrant) bool {
if x.Reason != y.Reason {
return false
}
+ if x.Export != y.Export {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index 646379e70b..7b6307741c 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -2514,7 +2514,7 @@ type WorkspaceApprovalSetting_Rule struct {
// When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
// When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
// When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
- // When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+ // When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
//
// For examples:
// resource.environment_id == "prod" && statement.affected_rows >= 100
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index 8a04dc1097..4e995a4623 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -659,9 +659,13 @@ func (x *QueryRequest) GetContainer() string {
type QueryResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The query results.
- Results []*QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ Results []*QueryResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
+ // The just-in-time access grant applied to this query, if any.
+ // Format: projects/{project}/accessGrants/{accessGrant}.
+ // Empty when the user was authorized through normal ACL rather than a grant.
+ AppliedAccessGrant string `protobuf:"bytes,2,opt,name=applied_access_grant,json=appliedAccessGrant,proto3" json:"applied_access_grant,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *QueryResponse) Reset() {
@@ -701,6 +705,13 @@ func (x *QueryResponse) GetResults() []*QueryResult {
return nil
}
+func (x *QueryResponse) GetAppliedAccessGrant() string {
+ if x != nil {
+ return x.AppliedAccessGrant
+ }
+ return ""
+}
+
type QueryOption struct {
state protoimpl.MessageState `protogen:"open.v1"`
RedisRunCommandsOn QueryOption_RedisRunCommandsOn `protobuf:"varint,1,opt,name=redis_run_commands_on,json=redisRunCommandsOn,proto3,enum=bytebase.v1.QueryOption_RedisRunCommandsOn" json:"redis_run_commands_on,omitempty"`
@@ -1578,9 +1589,13 @@ func (x *ExportRequest) GetSchema() string {
type ExportResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The export file content.
- Content []byte `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ Content []byte `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"`
+ // The just-in-time access grant applied to this export, if any.
+ // Format: projects/{project}/accessGrants/{accessGrant}.
+ // Empty when the user was authorized through normal ACL rather than a grant.
+ AppliedAccessGrant string `protobuf:"bytes,2,opt,name=applied_access_grant,json=appliedAccessGrant,proto3" json:"applied_access_grant,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *ExportResponse) Reset() {
@@ -1620,6 +1635,13 @@ func (x *ExportResponse) GetContent() []byte {
return nil
}
+func (x *ExportResponse) GetAppliedAccessGrant() string {
+ if x != nil {
+ return x.AppliedAccessGrant
+ }
+ return ""
+}
+
type DiffMetadataRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The metadata of the source schema.
@@ -2723,9 +2745,10 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\tcontainer\x18\b \x01(\tH\x01R\tcontainer\x88\x01\x01B\t\n" +
"\a_schemaB\f\n" +
"\n" +
- "_container\"C\n" +
+ "_container\"u\n" +
"\rQueryResponse\x122\n" +
- "\aresults\x18\x01 \x03(\v2\x18.bytebase.v1.QueryResultR\aresults\"\xa1\x03\n" +
+ "\aresults\x18\x01 \x03(\v2\x18.bytebase.v1.QueryResultR\aresults\x120\n" +
+ "\x14applied_access_grant\x18\x02 \x01(\tR\x12appliedAccessGrant\"\xa1\x03\n" +
"\vQueryOption\x12^\n" +
"\x15redis_run_commands_on\x18\x01 \x01(\x0e2+.bytebase.v1.QueryOption.RedisRunCommandsOnR\x12redisRunCommandsOn\x12]\n" +
"\x14mssql_explain_format\x18\x02 \x01(\x0e2+.bytebase.v1.QueryOption.MSSQLExplainFormatR\x12mssqlExplainFormat\"[\n" +
@@ -2866,9 +2889,10 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\bpassword\x18\x06 \x01(\tR\bpassword\x12$\n" +
"\x0edata_source_id\x18\a \x01(\tR\fdataSourceId\x12\x1b\n" +
"\x06schema\x18\b \x01(\tH\x00R\x06schema\x88\x01\x01B\t\n" +
- "\a_schema\"*\n" +
+ "\a_schema\"\\\n" +
"\x0eExportResponse\x12\x18\n" +
- "\acontent\x18\x01 \x01(\fR\acontent\"\xdc\x01\n" +
+ "\acontent\x18\x01 \x01(\fR\acontent\x120\n" +
+ "\x14applied_access_grant\x18\x02 \x01(\tR\x12appliedAccessGrant\"\xdc\x01\n" +
"\x13DiffMetadataRequest\x12K\n" +
"\x0fsource_metadata\x18\x01 \x01(\v2\x1d.bytebase.v1.DatabaseMetadataB\x03\xe0A\x02R\x0esourceMetadata\x12K\n" +
"\x0ftarget_metadata\x18\x02 \x01(\v2\x1d.bytebase.v1.DatabaseMetadataB\x03\xe0A\x02R\x0etargetMetadata\x12+\n" +
diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.go
index 4935bbd657..029bd3d6ba 100644
--- a/backend/generated-go/v1/sql_service_equal.pb.go
+++ b/backend/generated-go/v1/sql_service_equal.pb.go
@@ -101,6 +101,9 @@ func (x *QueryResponse) Equal(y *QueryResponse) bool {
return false
}
}
+ if x.AppliedAccessGrant != y.AppliedAccessGrant {
+ return false
+ }
return true
}
@@ -510,6 +513,9 @@ func (x *ExportResponse) Equal(y *ExportResponse) bool {
if string(x.Content) != string(y.Content) {
return false
}
+ if x.AppliedAccessGrant != y.AppliedAccessGrant {
+ return false
+ }
return true
}
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index b98e56b188..e82998734c 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -856,6 +856,7 @@ func buildCELVariablesForAccessGrant(ctx context.Context, stores *store.Store, i
baseVars := map[string]any{
common.CELAttributeResourceProjectID: issue.ProjectID,
common.CELAttributeRequestUnmask: accessGrant.Payload.Unmask,
+ common.CELAttributeRequestExport: accessGrant.Payload.Export,
}
targets := accessGrant.Payload.Targets
diff --git a/backend/store/access_grant.go b/backend/store/access_grant.go
index dc3c3ceda0..71d6836291 100644
--- a/backend/store/access_grant.go
+++ b/backend/store/access_grant.go
@@ -402,6 +402,18 @@ func GetListAccessGrantFilter(filter string) (*qb.Query, error) {
return nil, errors.Errorf("target value must be a string")
}
return qb.Q().Space("access_grant.payload->'targets' @> jsonb_build_array(to_jsonb(?::text))", targetStr), nil
+ case "unmask":
+ boolVal, ok := value.(bool)
+ if !ok {
+ return nil, errors.Errorf("unmask value must be a boolean")
+ }
+ return qb.Q().Space("COALESCE((access_grant.payload->>'unmask')::boolean, false) = ?", boolVal), nil
+ case "export":
+ boolVal, ok := value.(bool)
+ if !ok {
+ return nil, errors.Errorf("export value must be a boolean")
+ }
+ return qb.Q().Space("COALESCE((access_grant.payload->>'export')::boolean, false) = ?", boolVal), nil
default:
return nil, errors.Errorf("unsupported variable %q", variable)
}
diff --git a/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts b/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts
index 2b902b5617..1e63cc80d3 100644
--- a/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/access_grant_service_pb.d.ts
@@ -113,6 +113,13 @@ export declare type AccessGrant = Message<"bytebase.v1.AccessGrant"> & {
* @generated from field: string reason = 12;
*/
reason: string;
+
+ /**
+ * Whether export the query result.
+ *
+ * @generated from field: bool export = 13;
+ */
+ export: boolean;
};
/**
@@ -216,6 +223,8 @@ export declare type ListAccessGrantsRequest = Message<"bytebase.v1.ListAccessGra
* - create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
* - query: the access query, support "==" and ".contains(xx)" operator
* - target: the target database fullname, support "==" operator.
+ * - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ * - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
*
* Examples:
* - creator == "users/[email protected]"
@@ -225,6 +234,8 @@ export declare type ListAccessGrantsRequest = Message<"bytebase.v1.ListAccessGra
* - issue == "projects/x/issues/123"
* - status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
* - target == "instances/sample/databases/employee"
+ * - unmask == true
+ * - export == true && status == "ACTIVE"
*
* @generated from field: string filter = 4;
*/
diff --git a/frontend/src/types/proto-es/v1/access_grant_service_pb.js b/frontend/src/types/proto-es/v1/access_grant_service_pb.js
index fd46d96f10..755126b1bc 100644
--- a/frontend/src/types/proto-es/v1/access_grant_service_pb.js
+++ b/frontend/src/types/proto-es/v1/access_grant_service_pb.js
@@ -14,7 +14,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/access_grant_service.proto.
*/
export const file_v1_access_grant_service = /*@__PURE__*/
- fileDesc("Ch12MS9hY2Nlc3NfZ3JhbnRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiswQKC0FjY2Vzc0dyYW50EgwKBG5hbWUYASABKAkSFAoHY3JlYXRvchgCIAEoCUID4EECEjQKBnN0YXR1cxgDIAEoDjIfLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50LlN0YXR1c0ID4EEDEjEKC2V4cGlyZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAEi0KA3R0bBgLIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEESAASEgoFaXNzdWUYBSABKAlCA+BBAxIUCgd0YXJnZXRzGAYgAygJQgPgQQISDQoFcXVlcnkYByABKAkSDgoGdW5tYXNrGAggASgIEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEg4KBnJlYXNvbhgMIAEoCSJGCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgoKBkFDVElWRRACEgsKB1JFVk9LRUQQAzpN6kFKChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQSLnByb2plY3RzL3twcm9qZWN0fS9hY2Nlc3NHcmFudHMve2FjY2Vzc19ncmFudH1CDAoKZXhwaXJhdGlvbiJHChVHZXRBY2Nlc3NHcmFudFJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQikAEKF0xpc3RBY2Nlc3NHcmFudHNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiZAoYTGlzdEFjY2Vzc0dyYW50c1Jlc3BvbnNlEi8KDWFjY2Vzc19ncmFudHMYASADKAsyGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkifQoYQ3JlYXRlQWNjZXNzR3JhbnRSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIzCgxhY2Nlc3NfZ3JhbnQYAiABKAsyGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudEID4EECIkwKGkFjdGl2YXRlQWNjZXNzR3JhbnRSZXF1ZXN0Ei4KBG5hbWUYASABKAlCIOBBAvpBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50IkoKGFJldm9rZUFjY2Vzc0dyYW50UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudCKUAQobU2VhcmNoTXlBY2Nlc3NHcmFudHNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiaAocU2VhcmNoTXlBY2Nlc3NHcmFudHNSZXNwb25zZRIvCg1hY2Nlc3NfZ3JhbnRzGAEgAygLMhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJMvAIChJBY2Nlc3NHcmFudFNlcnZpY2USngEKDkdldEFjY2Vzc0dyYW50EiIuYnl0ZWJhc2UudjEuR2V0QWNjZXNzR3JhbnRSZXF1ZXN0GhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQiTtpBBG5hbWWK6jATYmIuYWNjZXNzR3JhbnRzLmdldJDqMAGC0+STAiYSJC92MS97bmFtZT1wcm9qZWN0cy8qL2FjY2Vzc0dyYW50cy8qfRKyAQoQTGlzdEFjY2Vzc0dyYW50cxIkLmJ5dGViYXNlLnYxLkxpc3RBY2Nlc3NHcmFudHNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuTGlzdEFjY2Vzc0dyYW50c1Jlc3BvbnNlIlHaQQZwYXJlbnSK6jAUYmIuYWNjZXNzR3JhbnRzLmxpc3SQ6jABgtPkkwImEiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9hY2Nlc3NHcmFudHMSyAEKEUNyZWF0ZUFjY2Vzc0dyYW50EiUuYnl0ZWJhc2UudjEuQ3JlYXRlQWNjZXNzR3JhbnRSZXF1ZXN0GhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQictpBE3BhcmVudCxhY2Nlc3NfZ3JhbnSK6jAWYmIuYWNjZXNzR3JhbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI0OgxhY2Nlc3NfZ3JhbnQiJC92MS97cGFyZW50PXByb2plY3RzLyp9L2FjY2Vzc0dyYW50cxK9AQoTQWN0aXZhdGVBY2Nlc3NHcmFudBInLmJ5dGViYXNlLnYxLkFjdGl2YXRlQWNjZXNzR3JhbnRSZXF1ZXN0GhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQiY9pBBG5hbWWK6jAYYmIuYWNjZXNzR3JhbnRzLmFjdGl2YXRlkOowAZjqMAGC0+STAjI6ASoiLS92MS97bmFtZT1wcm9qZWN0cy8qL2FjY2Vzc0dyYW50cy8qfTphY3RpdmF0ZRK1AQoRUmV2b2tlQWNjZXNzR3JhbnQSJS5ieXRlYmFzZS52MS5SZXZva2VBY2Nlc3NHcmFudFJlcXVlc3QaGC5ieXRlYmFzZS52MS5BY2Nlc3NHcmFudCJf2kEEbmFtZYrqMBZiYi5hY2Nlc3NHcmFudHMucmV2b2tlkOowAZjqMAGC0+STAjA6ASoiKy92MS97bmFtZT1wcm9qZWN0cy8qL2FjY2Vzc0dyYW50cy8qfTpyZXZva2USwAEKFFNlYXJjaE15QWNjZXNzR3JhbnRzEiguYnl0ZWJhc2UudjEuU2VhcmNoTXlBY2Nlc3NHcmFudHNSZXF1ZXN0GikuYnl0ZWJhc2UudjEuU2VhcmNoTXlBY2Nlc3NHcmFudHNSZXNwb25zZSJTiuowE2JiLmFjY2Vzc0dyYW50cy5nZXSQ6jACgtPkkwIyOgEqIi0vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9hY2Nlc3NHcmFudHM6c2VhcmNoTXlCrQEKD2NvbS5ieXRlYmFzZS52MUIXQWNjZXNzR3JhbnRTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_timestamp, file_v1_annotation]);
+ fileDesc("Ch12MS9hY2Nlc3NfZ3JhbnRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiwwQKC0FjY2Vzc0dyYW50EgwKBG5hbWUYASABKAkSFAoHY3JlYXRvchgCIAEoCUID4EECEjQKBnN0YXR1cxgDIAEoDjIfLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50LlN0YXR1c0ID4EEDEjEKC2V4cGlyZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAEi0KA3R0bBgLIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEESAASEgoFaXNzdWUYBSABKAlCA+BBAxIUCgd0YXJnZXRzGAYgAygJQgPgQQISDQoFcXVlcnkYByABKAkSDgoGdW5tYXNrGAggASgIEjQKC2NyZWF0ZV90aW1lGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAogASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEg4KBnJlYXNvbhgMIAEoCRIOCgZleHBvcnQYDSABKAgiRgoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIKCgZBQ1RJVkUQAhILCgdSRVZPS0VEEAM6TepBSgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50Ei5wcm9qZWN0cy97cHJvamVjdH0vYWNjZXNzR3JhbnRzL3thY2Nlc3NfZ3JhbnR9QgwKCmV4cGlyYXRpb24iRwoVR2V0QWNjZXNzR3JhbnRSZXF1ZXN0Ei4KBG5hbWUYASABKAlCIOBBAvpBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50IpABChdMaXN0QWNjZXNzR3JhbnRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhAKCG9yZGVyX2J5GAUgASgJImQKGExpc3RBY2Nlc3NHcmFudHNSZXNwb25zZRIvCg1hY2Nlc3NfZ3JhbnRzGAEgAygLMhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIn0KGENyZWF0ZUFjY2Vzc0dyYW50UmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSMwoMYWNjZXNzX2dyYW50GAIgASgLMhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnRCA+BBAiJMChpBY3RpdmF0ZUFjY2Vzc0dyYW50UmVxdWVzdBIuCgRuYW1lGAEgASgJQiDgQQL6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudCJKChhSZXZva2VBY2Nlc3NHcmFudFJlcXVlc3QSLgoEbmFtZRgBIAEoCUIg4EEC+kEaChhieXRlYmFzZS5jb20vQWNjZXNzR3JhbnQilAEKG1NlYXJjaE15QWNjZXNzR3JhbnRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhAKCG9yZGVyX2J5GAUgASgJImgKHFNlYXJjaE15QWNjZXNzR3JhbnRzUmVzcG9uc2USLwoNYWNjZXNzX2dyYW50cxgBIAMoCzIYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCTLwCAoSQWNjZXNzR3JhbnRTZXJ2aWNlEp4BCg5HZXRBY2Nlc3NHcmFudBIiLmJ5dGViYXNlLnYxLkdldEFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50Ik7aQQRuYW1liuowE2JiLmFjY2Vzc0dyYW50cy5nZXSQ6jABgtPkkwImEiQvdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn0SsgEKEExpc3RBY2Nlc3NHcmFudHMSJC5ieXRlYmFzZS52MS5MaXN0QWNjZXNzR3JhbnRzUmVxdWVzdBolLmJ5dGViYXNlLnYxLkxpc3RBY2Nlc3NHcmFudHNSZXNwb25zZSJR2kEGcGFyZW50iuowFGJiLmFjY2Vzc0dyYW50cy5saXN0kOowAYLT5JMCJhIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vYWNjZXNzR3JhbnRzEsgBChFDcmVhdGVBY2Nlc3NHcmFudBIlLmJ5dGViYXNlLnYxLkNyZWF0ZUFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50InLaQRNwYXJlbnQsYWNjZXNzX2dyYW50iuowFmJiLmFjY2Vzc0dyYW50cy5jcmVhdGWQ6jABmOowAYLT5JMCNDoMYWNjZXNzX2dyYW50IiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9hY2Nlc3NHcmFudHMSvQEKE0FjdGl2YXRlQWNjZXNzR3JhbnQSJy5ieXRlYmFzZS52MS5BY3RpdmF0ZUFjY2Vzc0dyYW50UmVxdWVzdBoYLmJ5dGViYXNlLnYxLkFjY2Vzc0dyYW50ImPaQQRuYW1liuowGGJiLmFjY2Vzc0dyYW50cy5hY3RpdmF0ZZDqMAGY6jABgtPkkwIyOgEqIi0vdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn06YWN0aXZhdGUStQEKEVJldm9rZUFjY2Vzc0dyYW50EiUuYnl0ZWJhc2UudjEuUmV2b2tlQWNjZXNzR3JhbnRSZXF1ZXN0GhguYnl0ZWJhc2UudjEuQWNjZXNzR3JhbnQiX9pBBG5hbWWK6jAWYmIuYWNjZXNzR3JhbnRzLnJldm9rZZDqMAGY6jABgtPkkwIwOgEqIisvdjEve25hbWU9cHJvamVjdHMvKi9hY2Nlc3NHcmFudHMvKn06cmV2b2tlEsABChRTZWFyY2hNeUFjY2Vzc0dyYW50cxIoLmJ5dGViYXNlLnYxLlNlYXJjaE15QWNjZXNzR3JhbnRzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaE15QWNjZXNzR3JhbnRzUmVzcG9uc2UiU4rqMBNiYi5hY2Nlc3NHcmFudHMuZ2V0kOowAoLT5JMCMjoBKiItL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vYWNjZXNzR3JhbnRzOnNlYXJjaE15Qq0BCg9jb20uYnl0ZWJhc2UudjFCF0FjY2Vzc0dyYW50U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_timestamp, file_v1_annotation]);
/**
* Describes the message bytebase.v1.AccessGrant.
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
index 8fcc02e4a5..9f44a30f5c 100644
--- a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
@@ -820,7 +820,7 @@ export declare type WorkspaceApprovalSetting_Rule = Message<"bytebase.v1.Workspa
* When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
* When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
* When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
- * When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+ * When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
*
* For examples:
* resource.environment_id == "prod" && statement.affected_rows >= 100
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
index 75eb082540..80790a8cf7 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
@@ -162,6 +162,15 @@ export declare type QueryResponse = Message<"bytebase.v1.QueryResponse"> & {
* @generated from field: repeated bytebase.v1.QueryResult results = 1;
*/
results: QueryResult[];
+
+ /**
+ * The just-in-time access grant applied to this query, if any.
+ * Format: projects/{project}/accessGrants/{accessGrant}.
+ * Empty when the user was authorized through normal ACL rather than a grant.
+ *
+ * @generated from field: string applied_access_grant = 2;
+ */
+ appliedAccessGrant: string;
};
/**
@@ -1072,6 +1081,15 @@ export declare type ExportResponse = Message<"bytebase.v1.ExportResponse"> & {
* @generated from field: bytes content = 1;
*/
content: Uint8Array;
+
+ /**
+ * The just-in-time access grant applied to this export, if any.
+ * Format: projects/{project}/accessGrants/{accessGrant}.
+ * Empty when the user was authorized through normal ACL rather than a grant.
+ *
+ * @generated from field: string applied_access_grant = 2;
+ */
+ appliedAccessGrant: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.js
index d0f41b5b63..26a8c721f0 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.js
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_database_service } from "./database_service_pb";
* Describes the file v1/sql_service.proto.
*/
export const file_v1_sql_service = /*@__PURE__*/
- fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQi/AEKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSFgoOZGF0YV9zb3VyY2VfaWQYBCABKAkSDwoHZXhwbGFpbhgFIAEoCBITCgZzY2hlbWEYBiABKAlIAIgBARIuCgxxdWVyeV9vcHRpb24YByABKAsyGC5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbhIWCgljb250YWluZXIYCCABKAlIAYgBAUIJCgdfc2NoZW1hQgwKCl9jb250YWluZXIiOgoNUXVlcnlSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQi+QIKC1F1ZXJ5T3B0aW9uEkoKFXJlZGlzX3J1bl9jb21tYW5kc19vbhgBIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLlJlZGlzUnVuQ29tbWFuZHNPbhJJChRtc3NxbF9leHBsYWluX2Zvcm1hdBgCIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLk1TU1FMRXhwbGFpbkZvcm1hdCJbChJSZWRpc1J1bkNvbW1hbmRzT24SJQohUkVESVNfUlVOX0NPTU1BTkRTX09OX1VOU1BFQ0lGSUVEEAASDwoLU0lOR0xFX05PREUQARINCglBTExfTk9ERVMQAiJ2ChJNU1NRTEV4cGxhaW5Gb3JtYXQSJAogTVNTUUxfRVhQTEFJTl9GT1JNQVRfVU5TUEVDSUZJRUQQABIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9BTEwQARIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9YTUwQAiKYCgoLUXVlcnlSZXN1bHQSFAoMY29sdW1uX25hbWVzGAEgAygJEhkKEWNvbHVtbl90eXBlX25hbWVzGAIgAygJEiMKBHJvd3MYAyADKAsyFS5ieXRlYmFzZS52MS5RdWVyeVJvdxISCgpyb3dzX2NvdW50GAQgASgDEg0KBWVycm9yGAUgASgJEioKB2xhdGVuY3kYBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SEQoJc3RhdGVtZW50GAcgASgJEkAKDnBvc3RncmVzX2Vycm9yGAggASgLMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUG9zdGdyZXNFcnJvckgAEjwKDHN5bnRheF9lcnJvchgJIAEoCzIkLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlN5bnRheEVycm9ySAASQAoRcGVybWlzc2lvbl9kZW5pZWQYCiABKAsyIy5ieXRlYmFzZS52MS5QZXJtaXNzaW9uRGVuaWVkRGV0YWlsSAASPgoNY29tbWFuZF9lcnJvchgNIAEoCzIlLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LkNvbW1hbmRFcnJvckgAEjIKCG1lc3NhZ2VzGAsgAygLMiAuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZRIqCgZtYXNrZWQYDCADKAsyGi5ieXRlYmFzZS52MS5NYXNraW5nUmVhc29uGs4CCg1Qb3N0Z3Jlc0Vycm9yEhAKCHNldmVyaXR5GAEgASgJEgwKBGNvZGUYAiABKAkSDwoHbWVzc2FnZRgDIAEoCRIOCgZkZXRhaWwYBCABKAkSDAoEaGludBgFIAEoCRIQCghwb3NpdGlvbhgGIAEoBRIZChFpbnRlcm5hbF9wb3NpdGlvbhgHIAEoBRIWCg5pbnRlcm5hbF9xdWVyeRgIIAEoCRINCgV3aGVyZRgJIAEoCRITCgtzY2hlbWFfbmFtZRgKIAEoCRISCgp0YWJsZV9uYW1lGAsgASgJEhMKC2NvbHVtbl9uYW1lGAwgASgJEhYKDmRhdGFfdHlwZV9uYW1lGA0gASgJEhcKD2NvbnN0cmFpbnRfbmFtZRgOIAEoCRIMCgRmaWxlGA8gASgJEgwKBGxpbmUYECABKAUSDwoHcm91dGluZRgRIAEoCRo8CgtTeW50YXhFcnJvchItCg5zdGFydF9wb3NpdGlvbhgBIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uGpMBCgxDb21tYW5kRXJyb3ISQAoMY29tbWFuZF90eXBlGAEgASgOMiouYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuQ29tbWFuZEVycm9yLlR5cGUiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASBwoDRERMEAESBwoDRE1MEAISEQoNTk9OX1JFQURfT05MWRADGrcBCgdNZXNzYWdlEjUKBWxldmVsGAEgASgOMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZS5MZXZlbBIPCgdjb250ZW50GAIgASgJImQKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIJCgVERUJVRxADEgcKA0xPRxAEEgoKBk5PVElDRRAFEg0KCUVYQ0VQVElPThAGQhAKDmRldGFpbGVkX2Vycm9yIr0BCg1NYXNraW5nUmVhc29uEhgKEHNlbWFudGljX3R5cGVfaWQYASABKAkSGwoTc2VtYW50aWNfdHlwZV90aXRsZRgCIAEoCRIXCg9tYXNraW5nX3J1bGVfaWQYAyABKAkSEQoJYWxnb3JpdGhtGAQgASgJEg8KB2NvbnRleHQYBSABKAkSHAoUY2xhc3NpZmljYXRpb25fbGV2ZWwYBiABKAUSGgoSc2VtYW50aWNfdHlwZV9pY29uGAcgASgJIjEKCFF1ZXJ5Um93EiUKBnZhbHVlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJvd1ZhbHVlIowFCghSb3dWYWx1ZRIwCgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAEhQKCmJvb2xfdmFsdWUYAiABKAhIABIVCgtieXRlc192YWx1ZRgDIAEoDEgAEhYKDGRvdWJsZV92YWx1ZRgEIAEoAUgAEhUKC2Zsb2F0X3ZhbHVlGAUgASgCSAASFQoLaW50MzJfdmFsdWUYBiABKAVIABIVCgtpbnQ2NF92YWx1ZRgHIAEoA0gAEhYKDHN0cmluZ192YWx1ZRgIIAEoCUgAEhYKDHVpbnQzMl92YWx1ZRgJIAEoDUgAEhYKDHVpbnQ2NF92YWx1ZRgKIAEoBEgAEi0KC3ZhbHVlX3ZhbHVlGAsgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlSAASOgoPdGltZXN0YW1wX3ZhbHVlGAwgASgLMh8uYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wSAASPwoSdGltZXN0YW1wX3R6X3ZhbHVlGA0gASgLMiEuYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wVFpIABpTCglUaW1lc3RhbXASNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIYWNjdXJhY3kYAiABKAUacwoLVGltZXN0YW1wVFoSNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDAoEem9uZRgCIAEoCRIOCgZvZmZzZXQYAyABKAUSEAoIYWNjdXJhY3kYBCABKAVCBgoEa2luZCKDAwoGQWR2aWNlEikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBIMCgRjb2RlGAIgASgFEg0KBXRpdGxlGAMgASgJEg8KB2NvbnRlbnQYBCABKAkSLQoOc3RhcnRfcG9zaXRpb24YBSABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIrCgxlbmRfcG9zaXRpb24YBiABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIvCglydWxlX3R5cGUYByABKA4yHC5ieXRlYmFzZS52MS5BZHZpY2UuUnVsZVR5cGUiSgoFTGV2ZWwSHAoYQURWSUNFX0xFVkVMX1VOU1BFQ0lGSUVEEAASCwoHU1VDQ0VTUxABEgsKB1dBUk5JTkcQAhIJCgVFUlJPUhADIkcKCFJ1bGVUeXBlEhkKFVJVTEVfVFlQRV9VTlNQRUNJRklFRBAAEhAKDFBBUlNFUl9CQVNFRBABEg4KCkFJX1BPV0VSRUQQAiLiAQoNRXhwb3J0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSKQoGZm9ybWF0GAQgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0Eg0KBWFkbWluGAUgASgIEhAKCHBhc3N3b3JkGAYgASgJEhYKDmRhdGFfc291cmNlX2lkGAcgASgJEhMKBnNjaGVtYRgIIAEoCUgAiAEBQgkKB19zY2hlbWEiIQoORXhwb3J0UmVzcG9uc2USDwoHY29udGVudBgBIAEoDCK0AQoTRGlmZk1ldGFkYXRhUmVxdWVzdBI7Cg9zb3VyY2VfbWV0YWRhdGEYASABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISOwoPdGFyZ2V0X21ldGFkYXRhGAIgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEiMKBmVuZ2luZRgDIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZSIkChREaWZmTWV0YWRhdGFSZXNwb25zZRIMCgRkaWZmGAEgASgJIlQKG1NlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIOCgZmaWx0ZXIYAyABKAkicAocU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1AIKDFF1ZXJ5SGlzdG9yeRIRCgRuYW1lGAEgASgJQgPgQQMSFQoIZGF0YWJhc2UYAiABKAlCA+BBAxIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJc3RhdGVtZW50GAUgASgJQgPgQQMSFwoFZXJyb3IYBiABKAlCA+BBA0gAiAEBEjAKCGR1cmF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uQgPgQQMSLAoEdHlwZRgIIAEoDjIeLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeS5UeXBlIjMKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAJCCAoGX2Vycm9yInsKE0FJQ29tcGxldGlvblJlcXVlc3QSOgoIbWVzc2FnZXMYASADKAsyKC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0Lk1lc3NhZ2UaKAoHTWVzc2FnZRIMCgRyb2xlGAEgASgJEg8KB2NvbnRlbnQYAiABKAkilQIKFEFJQ29tcGxldGlvblJlc3BvbnNlEj8KCmNhbmRpZGF0ZXMYASADKAsyKy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUauwEKCUNhbmRpZGF0ZRJECgdjb250ZW50GAEgASgLMjMuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQaaAoHQ29udGVudBJHCgVwYXJ0cxgBIAMoCzI4LmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50LlBhcnQaFAoEUGFydBIMCgR0ZXh0GAEgASgJMscHCgpTUUxTZXJ2aWNlEo8BCgVRdWVyeRIZLmJ5dGViYXNlLnYxLlF1ZXJ5UmVxdWVzdBoaLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzcG9uc2UiT4rqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAi06ASoiKC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06cXVlcnkSiQEKDEFkbWluRXhlY3V0ZRIgLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXNwb25zZSIwiuowDGJiLnNxbC5hZG1pbpDqMAGY6jABgtPkkwISEhAvdjE6YWRtaW5FeGVjdXRlKAEwARKVAQoUU2VhcmNoUXVlcnlIaXN0b3JpZXMSKC5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlIiiQ6jACgtPkkwIeOgEqIhkvdjEvcXVlcnlIaXN0b3JpZXM6c2VhcmNoEoQCCgZFeHBvcnQSGi5ieXRlYmFzZS52MS5FeHBvcnRSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRXhwb3J0UmVzcG9uc2UiwAGK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwKdAToBKloxOgEqIiwvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXR9OmV4cG9ydFo6OgEqIjUvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9OmV4cG9ydCIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpleHBvcnQSgQEKDERpZmZNZXRhZGF0YRIgLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlcXVlc3QaIS5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXNwb25zZSIsgOowAYLT5JMCIjoBKiIdL3YxL3NjaGVtYURlc2lnbjpkaWZmTWV0YWRhdGESeAoMQUlDb21wbGV0aW9uEiAuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlIiOQ6jACgtPkkwIZOgEqIhQvdjEvc3FsL2FpQ29tcGxldGlvbkKlAQoPY29tLmJ5dGViYXNlLnYxQg9TcWxTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_service]);
+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQi/AEKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSFgoOZGF0YV9zb3VyY2VfaWQYBCABKAkSDwoHZXhwbGFpbhgFIAEoCBITCgZzY2hlbWEYBiABKAlIAIgBARIuCgxxdWVyeV9vcHRpb24YByABKAsyGC5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbhIWCgljb250YWluZXIYCCABKAlIAYgBAUIJCgdfc2NoZW1hQgwKCl9jb250YWluZXIiWAoNUXVlcnlSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQSHAoUYXBwbGllZF9hY2Nlc3NfZ3JhbnQYAiABKAki+QIKC1F1ZXJ5T3B0aW9uEkoKFXJlZGlzX3J1bl9jb21tYW5kc19vbhgBIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLlJlZGlzUnVuQ29tbWFuZHNPbhJJChRtc3NxbF9leHBsYWluX2Zvcm1hdBgCIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLk1TU1FMRXhwbGFpbkZvcm1hdCJbChJSZWRpc1J1bkNvbW1hbmRzT24SJQohUkVESVNfUlVOX0NPTU1BTkRTX09OX1VOU1BFQ0lGSUVEEAASDwoLU0lOR0xFX05PREUQARINCglBTExfTk9ERVMQAiJ2ChJNU1NRTEV4cGxhaW5Gb3JtYXQSJAogTVNTUUxfRVhQTEFJTl9GT1JNQVRfVU5TUEVDSUZJRUQQABIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9BTEwQARIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9YTUwQAiKYCgoLUXVlcnlSZXN1bHQSFAoMY29sdW1uX25hbWVzGAEgAygJEhkKEWNvbHVtbl90eXBlX25hbWVzGAIgAygJEiMKBHJvd3MYAyADKAsyFS5ieXRlYmFzZS52MS5RdWVyeVJvdxISCgpyb3dzX2NvdW50GAQgASgDEg0KBWVycm9yGAUgASgJEioKB2xhdGVuY3kYBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SEQoJc3RhdGVtZW50GAcgASgJEkAKDnBvc3RncmVzX2Vycm9yGAggASgLMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUG9zdGdyZXNFcnJvckgAEjwKDHN5bnRheF9lcnJvchgJIAEoCzIkLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlN5bnRheEVycm9ySAASQAoRcGVybWlzc2lvbl9kZW5pZWQYCiABKAsyIy5ieXRlYmFzZS52MS5QZXJtaXNzaW9uRGVuaWVkRGV0YWlsSAASPgoNY29tbWFuZF9lcnJvchgNIAEoCzIlLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LkNvbW1hbmRFcnJvckgAEjIKCG1lc3NhZ2VzGAsgAygLMiAuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZRIqCgZtYXNrZWQYDCADKAsyGi5ieXRlYmFzZS52MS5NYXNraW5nUmVhc29uGs4CCg1Qb3N0Z3Jlc0Vycm9yEhAKCHNldmVyaXR5GAEgASgJEgwKBGNvZGUYAiABKAkSDwoHbWVzc2FnZRgDIAEoCRIOCgZkZXRhaWwYBCABKAkSDAoEaGludBgFIAEoCRIQCghwb3NpdGlvbhgGIAEoBRIZChFpbnRlcm5hbF9wb3NpdGlvbhgHIAEoBRIWCg5pbnRlcm5hbF9xdWVyeRgIIAEoCRINCgV3aGVyZRgJIAEoCRITCgtzY2hlbWFfbmFtZRgKIAEoCRISCgp0YWJsZV9uYW1lGAsgASgJEhMKC2NvbHVtbl9uYW1lGAwgASgJEhYKDmRhdGFfdHlwZV9uYW1lGA0gASgJEhcKD2NvbnN0cmFpbnRfbmFtZRgOIAEoCRIMCgRmaWxlGA8gASgJEgwKBGxpbmUYECABKAUSDwoHcm91dGluZRgRIAEoCRo8CgtTeW50YXhFcnJvchItCg5zdGFydF9wb3NpdGlvbhgBIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uGpMBCgxDb21tYW5kRXJyb3ISQAoMY29tbWFuZF90eXBlGAEgASgOMiouYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuQ29tbWFuZEVycm9yLlR5cGUiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASBwoDRERMEAESBwoDRE1MEAISEQoNTk9OX1JFQURfT05MWRADGrcBCgdNZXNzYWdlEjUKBWxldmVsGAEgASgOMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZS5MZXZlbBIPCgdjb250ZW50GAIgASgJImQKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIJCgVERUJVRxADEgcKA0xPRxAEEgoKBk5PVElDRRAFEg0KCUVYQ0VQVElPThAGQhAKDmRldGFpbGVkX2Vycm9yIr0BCg1NYXNraW5nUmVhc29uEhgKEHNlbWFudGljX3R5cGVfaWQYASABKAkSGwoTc2VtYW50aWNfdHlwZV90aXRsZRgCIAEoCRIXCg9tYXNraW5nX3J1bGVfaWQYAyABKAkSEQoJYWxnb3JpdGhtGAQgASgJEg8KB2NvbnRleHQYBSABKAkSHAoUY2xhc3NpZmljYXRpb25fbGV2ZWwYBiABKAUSGgoSc2VtYW50aWNfdHlwZV9pY29uGAcgASgJIjEKCFF1ZXJ5Um93EiUKBnZhbHVlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJvd1ZhbHVlIowFCghSb3dWYWx1ZRIwCgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAEhQKCmJvb2xfdmFsdWUYAiABKAhIABIVCgtieXRlc192YWx1ZRgDIAEoDEgAEhYKDGRvdWJsZV92YWx1ZRgEIAEoAUgAEhUKC2Zsb2F0X3ZhbHVlGAUgASgCSAASFQoLaW50MzJfdmFsdWUYBiABKAVIABIVCgtpbnQ2NF92YWx1ZRgHIAEoA0gAEhYKDHN0cmluZ192YWx1ZRgIIAEoCUgAEhYKDHVpbnQzMl92YWx1ZRgJIAEoDUgAEhYKDHVpbnQ2NF92YWx1ZRgKIAEoBEgAEi0KC3ZhbHVlX3ZhbHVlGAsgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlSAASOgoPdGltZXN0YW1wX3ZhbHVlGAwgASgLMh8uYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wSAASPwoSdGltZXN0YW1wX3R6X3ZhbHVlGA0gASgLMiEuYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wVFpIABpTCglUaW1lc3RhbXASNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIYWNjdXJhY3kYAiABKAUacwoLVGltZXN0YW1wVFoSNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDAoEem9uZRgCIAEoCRIOCgZvZmZzZXQYAyABKAUSEAoIYWNjdXJhY3kYBCABKAVCBgoEa2luZCKDAwoGQWR2aWNlEikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBIMCgRjb2RlGAIgASgFEg0KBXRpdGxlGAMgASgJEg8KB2NvbnRlbnQYBCABKAkSLQoOc3RhcnRfcG9zaXRpb24YBSABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIrCgxlbmRfcG9zaXRpb24YBiABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIvCglydWxlX3R5cGUYByABKA4yHC5ieXRlYmFzZS52MS5BZHZpY2UuUnVsZVR5cGUiSgoFTGV2ZWwSHAoYQURWSUNFX0xFVkVMX1VOU1BFQ0lGSUVEEAASCwoHU1VDQ0VTUxABEgsKB1dBUk5JTkcQAhIJCgVFUlJPUhADIkcKCFJ1bGVUeXBlEhkKFVJVTEVfVFlQRV9VTlNQRUNJRklFRBAAEhAKDFBBUlNFUl9CQVNFRBABEg4KCkFJX1BPV0VSRUQQAiLiAQoNRXhwb3J0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSKQoGZm9ybWF0GAQgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0Eg0KBWFkbWluGAUgASgIEhAKCHBhc3N3b3JkGAYgASgJEhYKDmRhdGFfc291cmNlX2lkGAcgASgJEhMKBnNjaGVtYRgIIAEoCUgAiAEBQgkKB19zY2hlbWEiPwoORXhwb3J0UmVzcG9uc2USDwoHY29udGVudBgBIAEoDBIcChRhcHBsaWVkX2FjY2Vzc19ncmFudBgCIAEoCSK0AQoTRGlmZk1ldGFkYXRhUmVxdWVzdBI7Cg9zb3VyY2VfbWV0YWRhdGEYASABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISOwoPdGFyZ2V0X21ldGFkYXRhGAIgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEiMKBmVuZ2luZRgDIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZSIkChREaWZmTWV0YWRhdGFSZXNwb25zZRIMCgRkaWZmGAEgASgJIlQKG1NlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIOCgZmaWx0ZXIYAyABKAkicAocU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1AIKDFF1ZXJ5SGlzdG9yeRIRCgRuYW1lGAEgASgJQgPgQQMSFQoIZGF0YWJhc2UYAiABKAlCA+BBAxIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJc3RhdGVtZW50GAUgASgJQgPgQQMSFwoFZXJyb3IYBiABKAlCA+BBA0gAiAEBEjAKCGR1cmF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uQgPgQQMSLAoEdHlwZRgIIAEoDjIeLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeS5UeXBlIjMKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAJCCAoGX2Vycm9yInsKE0FJQ29tcGxldGlvblJlcXVlc3QSOgoIbWVzc2FnZXMYASADKAsyKC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0Lk1lc3NhZ2UaKAoHTWVzc2FnZRIMCgRyb2xlGAEgASgJEg8KB2NvbnRlbnQYAiABKAkilQIKFEFJQ29tcGxldGlvblJlc3BvbnNlEj8KCmNhbmRpZGF0ZXMYASADKAsyKy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUauwEKCUNhbmRpZGF0ZRJECgdjb250ZW50GAEgASgLMjMuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQaaAoHQ29udGVudBJHCgVwYXJ0cxgBIAMoCzI4LmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50LlBhcnQaFAoEUGFydBIMCgR0ZXh0GAEgASgJMscHCgpTUUxTZXJ2aWNlEo8BCgVRdWVyeRIZLmJ5dGViYXNlLnYxLlF1ZXJ5UmVxdWVzdBoaLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzcG9uc2UiT4rqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAi06ASoiKC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06cXVlcnkSiQEKDEFkbWluRXhlY3V0ZRIgLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXNwb25zZSIwiuowDGJiLnNxbC5hZG1pbpDqMAGY6jABgtPkkwISEhAvdjE6YWRtaW5FeGVjdXRlKAEwARKVAQoUU2VhcmNoUXVlcnlIaXN0b3JpZXMSKC5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlIiiQ6jACgtPkkwIeOgEqIhkvdjEvcXVlcnlIaXN0b3JpZXM6c2VhcmNoEoQCCgZFeHBvcnQSGi5ieXRlYmFzZS52MS5FeHBvcnRSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRXhwb3J0UmVzcG9uc2UiwAGK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwKdAToBKloxOgEqIiwvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXR9OmV4cG9ydFo6OgEqIjUvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9OmV4cG9ydCIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpleHBvcnQSgQEKDERpZmZNZXRhZGF0YRIgLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlcXVlc3QaIS5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXNwb25zZSIsgOowAYLT5JMCIjoBKiIdL3YxL3NjaGVtYURlc2lnbjpkaWZmTWV0YWRhdGESeAoMQUlDb21wbGV0aW9uEiAuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlIiOQ6jACgtPkkwIZOgEqIhQvdjEvc3FsL2FpQ29tcGxldGlvbkKlAQoPY29tLmJ5dGViYXNlLnYxQg9TcWxTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_service]);
/**
* Describes the message bytebase.v1.AdminExecuteRequest.
diff --git a/frontend/src/types/v1/sql.ts b/frontend/src/types/v1/sql.ts
index 17e0e81e28..09a8d5057c 100644
--- a/frontend/src/types/v1/sql.ts
+++ b/frontend/src/types/v1/sql.ts
@@ -1,7 +1,13 @@
import type { Code } from "@connectrpc/connect";
import type { QueryResponse } from "../proto-es/v1/sql_service_pb";
-export interface SQLResultSetV1 extends Omit<QueryResponse, "$typeName"> {
+export interface SQLResultSetV1
+ extends Omit<QueryResponse, "$typeName" | "appliedAccessGrant"> {
error: string; // empty if no error occurred
status?: Code;
+ // The wire field is a required proto3 string (default ""), but adapter
+ // sites (webTerminal AdminExecuteResponse spread, abort/error branches)
+ // construct a SQLResultSetV1 before any grant context exists. Keeping it
+ // optional here lets those sites omit it; treat absent or "" as no grant.
+ appliedAccessGrant?: string;
}
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index e08f361456..dadc614581 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -7028,6 +7028,8 @@ paths:
- create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
- query: the access query, support "==" and ".contains(xx)" operator
- target: the target database fullname, support "==" operator.
+ - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
Examples:
- creator == "users/[email protected]"
@@ -7037,6 +7039,8 @@ paths:
- issue == "projects/x/issues/123"
- status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
- target == "instances/sample/databases/employee"
+ - unmask == true
+ - export == true && status == "ACTIVE"
schema:
type: string
title: filter
@@ -7051,6 +7055,8 @@ paths:
- create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
- query: the access query, support "==" and ".contains(xx)" operator
- target: the target database fullname, support "==" operator.
+ - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
Examples:
- creator == "users/[email protected]"
@@ -7060,6 +7066,8 @@ paths:
- issue == "projects/x/issues/123"
- status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
- target == "instances/sample/databases/employee"
+ - unmask == true
+ - export == true && status == "ACTIVE"
- name: orderBy
in: query
description: |-
@@ -16778,6 +16786,10 @@ components:
reason:
type: string
title: reason
+ export:
+ type: boolean
+ title: export
+ description: Whether export the query result.
- oneOf:
- type: object
properties:
@@ -20524,6 +20536,13 @@ components:
title: content
format: byte
description: The export file content.
+ appliedAccessGrant:
+ type: string
+ title: applied_access_grant
+ description: |-
+ The just-in-time access grant applied to this export, if any.
+ Format: projects/{project}/accessGrants/{accessGrant}.
+ Empty when the user was authorized through normal ACL rather than a grant.
title: ExportResponse
additionalProperties: false
bytebase.v1.ExportVCSProviderUsersRequest:
@@ -22161,6 +22180,8 @@ components:
- create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
- query: the access query, support "==" and ".contains(xx)" operator
- target: the target database fullname, support "==" operator.
+ - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
Examples:
- creator == "users/[email protected]"
@@ -22170,6 +22191,8 @@ components:
- issue == "projects/x/issues/123"
- status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
- target == "instances/sample/databases/employee"
+ - unmask == true
+ - export == true && status == "ACTIVE"
orderBy:
type: string
title: order_by
@@ -25122,6 +25145,13 @@ components:
$ref: '#/components/schemas/bytebase.v1.QueryResult'
title: results
description: The query results.
+ appliedAccessGrant:
+ type: string
+ title: applied_access_grant
+ description: |-
+ The just-in-time access grant applied to this query, if any.
+ Format: projects/{project}/accessGrants/{accessGrant}.
+ Empty when the user was authorized through normal ACL rather than a grant.
title: QueryResponse
additionalProperties: false
bytebase.v1.QueryResult:
@@ -29932,7 +29962,7 @@ components:
When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
- When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+ When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
For examples:
resource.environment_id == "prod" && statement.affected_rows >= 100
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 6fa4251ed9..81e5853579 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -389,6 +389,7 @@
| unmask | [bool](#bool) | | Whether the grant allows unmasking sensitive data. |
| reason | [string](#string) | | |
| requested_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The requested duration for the access grant. Stored when the user provides a TTL instead of an absolute expire_time. The server computes expire_time from this value at activation time. |
+| export | [bool](#bool) | | Whether export the query result. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 93f4a05640..05c508306c 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -1675,6 +1675,13 @@ Stored when the user provides a TTL instead of an absolute expire_time.
The server computes expire_time from this value at activation time. </p></td>
</tr>
+ <tr>
+ <td>export</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether export the query result. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 6cbb7b42fd..c10819a442 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -825,6 +825,7 @@ Authorization method for RPC calls.
| create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| reason | [string](#string) | | |
+| export | [bool](#bool) | | Whether export the query result. |
@@ -888,9 +889,9 @@ Authorization method for RPC calls.
| parent | [string](#string) | | The parent project of the access grants. Format: projects/{project} |
| page_size | [int32](#int32) | | The maximum number of access grants to return. |
| page_token | [string](#string) | | A page token from a previous ListAccessGrants call. |
-| filter | [string](#string) | | Filter expression using AIP-160 syntax. Supported fields: - name: the fullname in &#34;projects/{project}/accessGrants/{access_grant}&#34; format, support &#34;==&#34; operator. - creator: the creator name in &#34;users/{email}&#34; format, support &#34;==&#34; operator. - status: the access status, support &#34;==&#34; and &#34;in&#34; operator. - issue: the access issue fullname, support &#34;==&#34; operator. - expire_time: the access expire time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34;, &#34;&gt;&#34;, &#34;&lt;=&#34; and &#34;&lt;&#34; operator. - create_time: the access creation time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34;, &#34;&gt;&#34;, &#34;&lt;=&#34; and &#34;&lt;&#34; operator. - query: the access query, support &#34;==&#34; and &#34;.contains(xx)&#34; operator - target: the target database fullname, support &#34;==&#34; operator.
+| filter | [string](#string) | | Filter expression using AIP-160 syntax. Supported fields: - name: the fullname in &#34;projects/{project}/accessGrants/{access_grant}&#34; format, support &#34;==&#34; operator. - creator: the creator name in &#34;users/{email}&#34; format, support &#34;==&#34; operator. - status: the access status, support &#34;==&#34; and &#34;in&#34; operator. - issue: the access issue fullname, support &#34;==&#34; operator. - expire_time: the access expire time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34;, &#34;&gt;&#34;, &#34;&lt;=&#34; and &#34;&lt;&#34; operator. - create_time: the access creation time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34;, &#34;&gt;&#34;, &#34;&lt;=&#34; and &#34;&lt;&#34; operator. - query: the access query, support &#34;==&#34; and &#34;.contains(xx)&#34; operator - target: the target database fullname, support &#34;==&#34; operator. - unmask: whether the grant allows unmasking sensitive data, support &#34;==&#34; operator with a boolean literal. - export: whether the grant allows exporting the query result, support &#34;==&#34; operator with a boolean literal.
-Examples: - creator == &#34;users/[email protected]&#34; - status == &#34;ACTIVE&#34; - status in [&#34;ACTIVE&#34;, &#34;PENDING&#34;] - creator == &#34;users/[email protected]&#34; &amp;&amp; status == &#34;ACTIVE&#34; - issue == &#34;projects/x/issues/123&#34; - status == &#34;ACTIVE&#34; &amp;&amp; expire_time &gt; &#34;2024-02-01T00:00:00Z&#34; - target == &#34;instances/sample/databases/employee&#34; |
+Examples: - creator == &#34;users/[email protected]&#34; - status == &#34;ACTIVE&#34; - status in [&#34;ACTIVE&#34;, &#34;PENDING&#34;] - creator == &#34;users/[email protected]&#34; &amp;&amp; status == &#34;ACTIVE&#34; - issue == &#34;projects/x/issues/123&#34; - status == &#34;ACTIVE&#34; &amp;&amp; expire_time &gt; &#34;2024-02-01T00:00:00Z&#34; - target == &#34;instances/sample/databases/employee&#34; - unmask == true - export == true &amp;&amp; status == &#34;ACTIVE&#34; |
| order_by | [string](#string) | | The order by of access grants. Support creator, expire_time, create_time. The default sorting order is ascending. For example: - order_by = &#34;creator&#34; - order_by = &#34;expire_time desc&#34; - order_by = &#34;expire_time asc, create_time desc&#34; |
@@ -4487,6 +4488,7 @@ DatabaseService manages databases and their schemas.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| content | [bytes](#bytes) | | The export file content. |
+| applied_access_grant | [string](#string) | | The just-in-time access grant applied to this export, if any. Format: projects/{project}/accessGrants/{accessGrant}. Empty when the user was authorized through normal ACL rather than a grant. |
@@ -4583,6 +4585,7 @@ DatabaseService manages databases and their schemas.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| results | [QueryResult](#bytebase-v1-QueryResult) | repeated | The query results. |
+| applied_access_grant | [string](#string) | | The just-in-time access grant applied to this query, if any. Format: projects/{project}/accessGrants/{accessGrant}. Empty when the user was authorized through normal ACL rather than a grant. |
@@ -6583,7 +6586,7 @@ The `source` field filters which rules apply. The `condition` field then evaluat
All supported variables: statement.affected_rows: affected row count in the DDL/DML, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. statement.table_rows: table row count number, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. resource.environment_id: the environment resource id, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. resource.project_id: the project resource id, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.db_engine: the database engine type, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. Check the Engine enum for values. statement.sql_type: the SQL type, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. resource.database_name: the database name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.schema_name: the schema name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.table_name: the table name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. statement.text: the SQL statement, support &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. request.expiration_days: the role expiration days for the request, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. request.role: the request role full name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations.
-When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*) When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*) When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.affected_rows &gt;= 100 resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engine == &#34;MYSQL&#34; |
| source | [WorkspaceApprovalSetting.Rule.Source](#bytebase-v1-WorkspaceApprovalSetting-Rule-Source) | | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index c3d337aafa..46a19785b1 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -3252,6 +3252,13 @@ Format: instances/{instance}/databases/{database} </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>export</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether export the query result. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -3387,6 +3394,8 @@ Supported fields:
- create_time: the access creation time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34;, &#34;&gt;&#34;, &#34;&lt;=&#34; and &#34;&lt;&#34; operator.
- query: the access query, support &#34;==&#34; and &#34;.contains(xx)&#34; operator
- target: the target database fullname, support &#34;==&#34; operator.
+- unmask: whether the grant allows unmasking sensitive data, support &#34;==&#34; operator with a boolean literal.
+- export: whether the grant allows exporting the query result, support &#34;==&#34; operator with a boolean literal.
Examples:
- creator == &#34;users/[email protected]&#34;
@@ -3395,7 +3404,9 @@ Examples:
- creator == &#34;users/[email protected]&#34; &amp;&amp; status == &#34;ACTIVE&#34;
- issue == &#34;projects/x/issues/123&#34;
- status == &#34;ACTIVE&#34; &amp;&amp; expire_time &gt; &#34;2024-02-01T00:00:00Z&#34;
-- target == &#34;instances/sample/databases/employee&#34; </p></td>
+- target == &#34;instances/sample/databases/employee&#34;
+- unmask == true
+- export == true &amp;&amp; status == &#34;ACTIVE&#34; </p></td>
</tr>
<tr>
@@ -13577,6 +13588,15 @@ Oracle and search path in Postgres. </p></td>
<td><p>The export file content. </p></td>
</tr>
+ <tr>
+ <td>applied_access_grant</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The just-in-time access grant applied to this export, if any.
+Format: projects/{project}/accessGrants/{accessGrant}.
+Empty when the user was authorized through normal ACL rather than a grant. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -13853,6 +13873,15 @@ CosmosDB only. </p></td>
<td><p>The query results. </p></td>
</tr>
+ <tr>
+ <td>applied_access_grant</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The just-in-time access grant applied to this query, if any.
+Format: projects/{project}/accessGrants/{accessGrant}.
+Empty when the user was authorized through normal ACL rather than a grant. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -19073,7 +19102,7 @@ When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding requ
When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
-When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
For examples:
resource.environment_id == &#34;prod&#34; &amp;&amp; statement.affected_rows &gt;= 100
diff --git a/proto/store/store/access_grant.proto b/proto/store/store/access_grant.proto
index 75a1db5c07..019df79a95 100644
--- a/proto/store/store/access_grant.proto
+++ b/proto/store/store/access_grant.proto
@@ -35,4 +35,7 @@ message AccessGrantPayload {
// Stored when the user provides a TTL instead of an absolute expire_time.
// The server computes expire_time from this value at activation time.
google.protobuf.Duration requested_duration = 6;
+
+ // Whether export the query result.
+ bool export = 7;
}
diff --git a/proto/v1/v1/access_grant_service.proto b/proto/v1/v1/access_grant_service.proto
index 64c8799ebe..46fcb70ef7 100644
--- a/proto/v1/v1/access_grant_service.proto
+++ b/proto/v1/v1/access_grant_service.proto
@@ -142,6 +142,9 @@ message AccessGrant {
}
string reason = 12;
+
+ // Whether export the query result.
+ bool export = 13;
}
message GetAccessGrantRequest {
@@ -177,6 +180,8 @@ message ListAccessGrantsRequest {
// - create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.
// - query: the access query, support "==" and ".contains(xx)" operator
// - target: the target database fullname, support "==" operator.
+ // - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.
+ // - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.
//
// Examples:
// - creator == "users/[email protected]"
@@ -186,6 +191,8 @@ message ListAccessGrantsRequest {
// - issue == "projects/x/issues/123"
// - status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"
// - target == "instances/sample/databases/employee"
+ // - unmask == true
+ // - export == true && status == "ACTIVE"
string filter = 4;
// The order by of access grants.
diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.proto
index 89b52c8702..84d564d6ce 100644
--- a/proto/v1/v1/setting_service.proto
+++ b/proto/v1/v1/setting_service.proto
@@ -315,7 +315,7 @@ message WorkspaceApprovalSetting {
// When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
// When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
// When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
- // When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask
+ // When source is REQUEST_ACCESS, support: resource.environment_id, resource.project_id, request.unmask, request.data_export
//
// For examples:
// resource.environment_id == "prod" && statement.affected_rows >= 100
diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.proto
index 33a7eae2b7..429aed53ab 100644
--- a/proto/v1/v1/sql_service.proto
+++ b/proto/v1/v1/sql_service.proto
@@ -157,6 +157,11 @@ message QueryRequest {
message QueryResponse {
// The query results.
repeated QueryResult results = 1;
+
+ // The just-in-time access grant applied to this query, if any.
+ // Format: projects/{project}/accessGrants/{accessGrant}.
+ // Empty when the user was authorized through normal ACL rather than a grant.
+ string applied_access_grant = 2;
}
message QueryOption {
@@ -441,6 +446,11 @@ message ExportRequest {
message ExportResponse {
// The export file content.
bytes content = 1;
+
+ // The just-in-time access grant applied to this export, if any.
+ // Format: projects/{project}/accessGrants/{accessGrant}.
+ // Empty when the user was authorized through normal ACL rather than a grant.
+ string applied_access_grant = 2;
}
message DiffMetadataRequest {