Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: build expression string (#20687)
ecmadaoa3072c064aff
diff --git a/frontend/src/react/lib/sensitive-data/maskingExemption.test.ts b/frontend/src/react/lib/sensitive-data/maskingExemption.test.tsnew file mode 100644index 0000000000..6e432947dd--- /dev/null+++ b/frontend/src/react/lib/sensitive-data/maskingExemption.test.ts@@ -0,0 +1,79 @@+import { describe, expect, test } from "vitest";+import { emptySimpleExpr, wrapAsGroup } from "@/plugins/cel";+import type { DatabaseResource } from "@/types";+import { buildMaskingExemption } from "./maskingExemption";++const expr = wrapAsGroup(emptySimpleExpr());++describe("buildMaskingExemption", () => {+ test("builds an all-database exemption without condition expression", async () => {+ const exemption = await buildMaskingExemption({+ radioValue: "ALL",+ expr,+ databaseResources: [],+ memberList: ["user:[email protected]"],+ description: "reason",+ });++ expect(exemption.members).toEqual(["user:[email protected]"]);+ expect(exemption.condition?.description).toBe("reason");+ expect(exemption.condition?.expression).toBe("");+ });++ test("rejects expression exemption when CEL parsing fails", async () => {+ await expect(+ buildMaskingExemption({+ radioValue: "EXPRESSION",+ expr,+ databaseResources: [],+ memberList: ["user:[email protected]"],+ description: "reason",+ })+ ).rejects.toThrow("Invalid masking exemption expression");+ });++ test("builds a selected single-resource condition with expiration", async () => {+ const exemption = await buildMaskingExemption({+ radioValue: "SELECT",+ expr,+ databaseResources: [+ {+ databaseFullName: "instances/prod/databases/hr",+ schema: "public",+ table: "employee",+ columns: ["email"],+ },+ ],+ memberList: ["user:[email protected]"],+ description: "",+ expirationTimestamp: "2026-04-15T00:00:00.000Z",+ });++ expect(exemption.condition?.expression).toBe(+ 'request.time < timestamp("2026-04-15T00:00:00.000Z") && (resource.instance_id == "prod" && resource.database_name == "hr" && resource.schema_name == "public" && resource.table_name == "employee" && resource.column_name == "email")'+ );+ });++ test("builds grouped OR conditions for multiple selected resources", async () => {+ const databaseResources: DatabaseResource[] = [+ {+ databaseFullName: "instances/prod/databases/hr",+ },+ {+ databaseFullName: "instances/test/databases/finance",+ },+ ];++ const exemption = await buildMaskingExemption({+ radioValue: "SELECT",+ expr,+ databaseResources,+ memberList: ["user:[email protected]"],+ description: "",+ });++ expect(exemption.condition?.expression).toBe(+ '((resource.instance_id == "prod" && resource.database_name == "hr") || (resource.instance_id == "test" && resource.database_name == "finance"))'+ );+ });+});diff --git a/frontend/src/react/lib/sensitive-data/maskingExemption.ts b/frontend/src/react/lib/sensitive-data/maskingExemption.tsnew file mode 100644index 0000000000..263b554831--- /dev/null+++ b/frontend/src/react/lib/sensitive-data/maskingExemption.ts@@ -0,0 +1,148 @@+import { create } from "@bufbuild/protobuf";+import { useMemo } from "react";+import type { ConditionGroupExpr, Factor, Operator } from "@/plugins/cel";+import { buildCELExpr } from "@/plugins/cel";+import { useAppStore } from "@/react/stores/app";+import type { DatabaseResource } from "@/types";+import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";+import {+ type MaskingExemptionPolicy_Exemption,+ MaskingExemptionPolicy_ExemptionSchema,+} from "@/types/proto-es/v1/org_policy_service_pb";+import {+ batchConvertParsedExprToCELString,+ getDatabaseNameOptionConfig,+} from "@/utils";+import {+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+} from "@/utils/cel-attributes";+import type { OptionConfig } from "@/utils/expr";+import { getClassificationLevelOptions } from "./components-utils";+import { rewriteResourceDatabase } from "./exemptionDataUtils";+import { getExpressionsForDatabaseResource } from "./utils";++export type MaskingExemptionResourceMode = "ALL" | "EXPRESSION" | "SELECT";++interface BuildMaskingExemptionParams {+ radioValue: MaskingExemptionResourceMode;+ expr: ConditionGroupExpr;+ databaseResources: DatabaseResource[];+ memberList: string[];+ description: string;+ expirationTimestamp?: string;+}++export const buildMaskingExemption = async ({+ radioValue,+ expr,+ databaseResources,+ memberList,+ description,+ expirationTimestamp,+}: BuildMaskingExemptionParams): Promise<MaskingExemptionPolicy_Exemption> => {+ const extraExpressions: string[] = [];+ if (expirationTimestamp) {+ extraExpressions.push(+ `request.time < timestamp("${new Date(expirationTimestamp).toISOString()}")`+ );+ }++ if (radioValue === "EXPRESSION") {+ const parsedExpr = await buildCELExpr(expr);+ if (!parsedExpr) {+ throw new Error("Invalid masking exemption expression");+ }++ let [celString] = await batchConvertParsedExprToCELString([parsedExpr]);+ celString = rewriteResourceDatabase(celString);+ if (celString) {+ extraExpressions.push(`(${celString})`);+ }+ } else {+ const resources = radioValue === "SELECT" ? databaseResources : undefined;+ const resourceExpressions = (+ resources?.map(getExpressionsForDatabaseResource) ?? [[""]]+ ).map((parts) => parts.filter(Boolean).join(" && "));++ let resourceCondition = "";+ const nonEmpty = resourceExpressions.filter(Boolean);+ if (nonEmpty.length === 1) {+ resourceCondition = nonEmpty[0];+ } else if (nonEmpty.length > 1) {+ resourceCondition = nonEmpty+ .map((expression) => `(${expression})`)+ .join(" || ");+ }+ if (resourceCondition) {+ extraExpressions.push(`(${resourceCondition})`);+ }+ }++ return create(MaskingExemptionPolicy_ExemptionSchema, {+ members: memberList,+ condition: create(ExprSchema, {+ description,+ expression:+ extraExpressions.length > 0 ? extraExpressions.join(" && ") : "",+ }),+ });+};++export const useMaskingExemptionExprConfig = (+ projectName: string+): {+ factorList: Factor[];+ factorOperatorOverrideMap: Map<Factor, Operator[]>;+ factorOptionConfigMap: Map<Factor, OptionConfig>;+} => {+ const factorList = useMemo((): Factor[] => {+ return [+ CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ ];+ }, []);++ const factorOperatorOverrideMap = useMemo(+ () =>+ new Map<Factor, Operator[]>([+ [CEL_ATTRIBUTE_RESOURCE_DATABASE, ["_==_", "@in"]],+ [CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME, ["_==_"]],+ [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ["_==_", "@in"]],+ [CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME, ["_==_", "@in"]],+ [+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ ["_==_", "_!=_", "_<_", "_<=_", "_>=_", "_>_"],+ ],+ ]),+ []+ );++ const settingsByName = useAppStore((store) => store.settingsByName);+ const factorOptionConfigMap = useMemo((): Map<Factor, OptionConfig> => {+ return factorList.reduce((map, factor) => {+ if (factor === CEL_ATTRIBUTE_RESOURCE_DATABASE) {+ map.set(factor, getDatabaseNameOptionConfig(projectName));+ } else if (factor === CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL) {+ map.set(factor, {+ options: getClassificationLevelOptions(),+ });+ } else {+ map.set(factor, { options: [] });+ }+ return map;+ }, new Map<Factor, OptionConfig>());+ }, [factorList, projectName, settingsByName]);++ return {+ factorList,+ factorOperatorOverrideMap,+ factorOptionConfigMap,+ };+};diff --git a/frontend/src/react/lib/sensitive-data/utils.test.ts b/frontend/src/react/lib/sensitive-data/utils.test.tsindex de92389796..9522e8e288 100644--- a/frontend/src/react/lib/sensitive-data/utils.test.ts+++ b/frontend/src/react/lib/sensitive-data/utils.test.ts@@ -40,4 +40,88 @@ describe("isCurrentColumnException", () => {expect(isCurrentColumnException(exception, sensitiveColumn)).toBe(true);});++ test("matches a parenthesized resource and classification condition group", () => {+ const exception = makeException(+ '(resource.instance_id == "prod" && resource.database_name == "hr" && resource.classification_level <= 2)'+ );++ expect(isCurrentColumnException(exception, sensitiveColumn)).toBe(true);+ });++ test("matches a resource", () => {+ expect(+ isCurrentColumnException(+ makeException(+ '(resource.instance_id == "prod") && request.time < timestamp("2026-04-15T00:00:00Z")'+ ),+ sensitiveColumn+ )+ ).toBe(true);++ expect(+ isCurrentColumnException(+ makeException(+ '((resource.instance_id == "prod") && request.time < timestamp("2026-04-15T00:00:00Z"))'+ ),+ sensitiveColumn+ )+ ).toBe(true);++ expect(+ isCurrentColumnException(+ makeException(+ '(resource.instance_id == "prod" && request.time < timestamp("2026-04-15T00:00:00Z"))'+ ),+ sensitiveColumn+ )+ ).toBe(true);++ expect(+ isCurrentColumnException(+ makeException(+ 'resource.instance_id == "prod" && request.time < timestamp("2026-04-15T00:00:00Z")'+ ),+ sensitiveColumn+ )+ ).toBe(true);++ expect(+ isCurrentColumnException(+ makeException(+ 'resource.instance_id == "prod" && resource.database_name == "hr"'+ ),+ sensitiveColumn+ )+ ).toBe(true);++ expect(+ isCurrentColumnException(+ makeException('(resource.instance_id == "prod")'),+ sensitiveColumn+ )+ ).toBe(true);+ });++ test("matches one resource from a grouped OR resource condition", () => {+ expect(+ isCurrentColumnException(+ makeException(+ '((resource.instance_id == "prod" && resource.database_name == "hr") || (resource.instance_id == "test" && resource.database_name == "finance"))'+ ),+ sensitiveColumn+ )+ ).toBe(true);+ });++ test("matches one resource from a grouped OR resource condition with expiration", () => {+ expect(+ isCurrentColumnException(+ makeException(+ 'request.time < timestamp("2026-04-15T00:00:00Z") && ((resource.instance_id == "prod" && resource.database_name == "hr") || (resource.instance_id == "test" && resource.database_name == "finance"))'+ ),+ sensitiveColumn+ )+ ).toBe(true);+ });});diff --git a/frontend/src/react/lib/sensitive-data/utils.ts b/frontend/src/react/lib/sensitive-data/utils.tsindex 3968b5b679..3b330b4250 100644--- a/frontend/src/react/lib/sensitive-data/utils.ts+++ b/frontend/src/react/lib/sensitive-data/utils.ts@@ -34,25 +34,36 @@ export const isCurrentColumnException = (// no expression means can access all databases.return true;}- let databaseExpression = expression- .trim()- .split(" && ")- .filter(- (expr) =>- !expr.startsWith(CEL_ATTRIBUTE_REQUEST_TIME) &&- !expr.startsWith(CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL)- )- .join(" && ")- .trim();- if (databaseExpression.startsWith("(") && databaseExpression.endsWith(")")) {- databaseExpression = databaseExpression.slice(1, -1).trim();- }+ const databaseExpressions = expression.split(" || ").map((part) =>+ part+ .split(" && ")+ .map(trimParentheses)+ .filter(+ (expr) =>+ !expr.startsWith(CEL_ATTRIBUTE_REQUEST_TIME) &&+ !expr.startsWith(CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL)+ )+ .join(" && ")+ );const matches = getExpressionsForDatabaseResource(convertSensitiveColumnToDatabaseResource(sensitiveColumn));- return matches.join(" && ").includes(databaseExpression);+ const currentColumnExpression = matches.join(" && ");+ return databaseExpressions.some((databaseExpression) =>+ currentColumnExpression.includes(databaseExpression)+ );};+const trimParentheses = (expression: string): string => {+ let result = expression.trim();+ while (result.startsWith("(")) {+ result = result.slice(1).trimStart();+ }+ while (result.endsWith(")")) {+ result = result.slice(0, -1).trimEnd();+ }+ return result;+};export const getExpressionsForDatabaseResource = (databaseResource: DatabaseResource): string[] => {diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsxindex 88805dac64..fae4fc2577 100644--- a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx@@ -3,9 +3,8 @@ import dayjs from "dayjs";import { CircleHelp } from "lucide-react";import { useCallback, useEffect, useMemo, useState } from "react";import { useTranslation } from "react-i18next";-import type { ConditionGroupExpr, Factor, Operator } from "@/plugins/cel";+import type { ConditionGroupExpr } from "@/plugins/cel";import {- buildCELExpr,emptySimpleExpr,validateSimpleExpr,wrapAsGroup,@@ -21,35 +20,22 @@ import { FeatureModal } from "@/react/components/ui/feature-modal";import { Input } from "@/react/components/ui/input";import { Tooltip } from "@/react/components/ui/tooltip";import { useProjectByName } from "@/react/hooks/useProjectByName";-import { getClassificationLevelOptions } from "@/react/lib/sensitive-data/components-utils";-import { rewriteResourceDatabase } from "@/react/lib/sensitive-data/exemptionDataUtils";-import { getExpressionsForDatabaseResource } from "@/react/lib/sensitive-data/utils";+import {+ buildMaskingExemption,+ useMaskingExemptionExprConfig,+} from "@/react/lib/sensitive-data/maskingExemption";import { router } from "@/react/router";import { useAppStore } from "@/react/stores/app";import { pushNotification } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import type { DatabaseResource } from "@/types";-import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import {- MaskingExemptionPolicy_ExemptionSchema,MaskingExemptionPolicySchema,PolicyResourceType,PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import {- batchConvertParsedExprToCELString,- getDatabaseNameOptionConfig,-} from "@/utils";-import {- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,-} from "@/utils/cel-attributes";-import { type OptionConfig } from "@/utils/expr";type RadioValue = "ALL" | "EXPRESSION" | "SELECT";@@ -110,49 +96,8 @@ export function ProjectMaskingExemptionCreatePage({[memberList, isValid]);- // ExprEditor config- const factorList = useMemo((): Factor[] => {- return [- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- ];- }, []);-- const factorOperatorOverrideMap = useMemo(- () =>- new Map<Factor, Operator[]>([- [CEL_ATTRIBUTE_RESOURCE_DATABASE, ["_==_", "@in"]],- [CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME, ["_==_"]],- [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ["_==_", "@in"]],- [CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME, ["_==_", "@in"]],- [- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- ["_==_", "_!=_", "_<_", "_<=_", "_>=_", "_>_"],- ],- ]),- []- );-- // Subscribe so the classification options recompute when DATA_CLASSIFICATION- // loads (getClassificationLevelOptions reads the app store imperatively).- const settingsByName = useAppStore((s) => s.settingsByName);- const factorOptionConfigMap = useMemo((): Map<Factor, OptionConfig> => {- return factorList.reduce((map, factor) => {- if (factor === CEL_ATTRIBUTE_RESOURCE_DATABASE) {- map.set(factor, getDatabaseNameOptionConfig(projectName));- } else if (factor === CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL) {- map.set(factor, {- options: getClassificationLevelOptions(),- });- } else {- map.set(factor, { options: [] });- }- return map;- }, new Map<Factor, OptionConfig>());- }, [factorList, projectName, settingsByName]);+ const { factorList, factorOperatorOverrideMap, factorOptionConfigMap } =+ useMaskingExemptionExprConfig(projectName);const onRadioChange = useCallback((value: RadioValue) => {@@ -174,58 +119,14 @@ export function ProjectMaskingExemptionCreatePage({setProcessing(true);try {- const exemptions = [];-- const extraExpressions: string[] = [];- if (expirationTimestamp) {- extraExpressions.push(- `request.time < timestamp("${new Date(expirationTimestamp).toISOString()}")`- );- }-- if (radioValue === "EXPRESSION") {- // Build CEL expression directly- const parsedExpr = await buildCELExpr(expr);- if (parsedExpr) {- let [celString] = await batchConvertParsedExprToCELString([- parsedExpr,- ]);- celString = rewriteResourceDatabase(celString);- if (celString) {- extraExpressions.push(`(${celString})`);- }- }- } else {- // ALL or SELECT mode- const resources =- radioValue === "SELECT" ? databaseResources : undefined;-- const resourceExpressions = (- resources?.map(getExpressionsForDatabaseResource) ?? [[""]]- ).map((parts) => parts.filter((e) => e).join(" && "));-- let resourceCondition = "";- const nonEmpty = resourceExpressions.filter((e) => e);- if (nonEmpty.length === 1) {- resourceCondition = nonEmpty[0];- } else if (nonEmpty.length > 1) {- resourceCondition = nonEmpty.map((e) => `(${e})`).join(" || ");- }- if (resourceCondition) {- extraExpressions.push(`(${resourceCondition})`);- }- }-- exemptions.push(- create(MaskingExemptionPolicy_ExemptionSchema, {- members: memberList,- condition: create(ExprSchema, {- description,- expression:- extraExpressions.length > 0 ? extraExpressions.join(" && ") : "",- }),- })- );+ const exemption = await buildMaskingExemption({+ radioValue,+ expr,+ databaseResources,+ memberList,+ description,+ expirationTimestamp,+ });const policy = await useAppStore.getState()@@ -248,7 +149,7 @@ export function ProjectMaskingExemptionCreatePage({policy: {case: "maskingExemptionPolicy",value: create(MaskingExemptionPolicySchema, {- exemptions: [...existed, ...exemptions],+ exemptions: [...existed, exemption],}),},},diff --git a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsxindex a33158b501..e57c1616d1 100644--- a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx+++ b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx@@ -3,7 +3,7 @@ import dayjs from "dayjs";import { CircleHelp } from "lucide-react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useTranslation } from "react-i18next";-import type { ConditionGroupExpr, Factor, Operator } from "@/plugins/cel";+import type { ConditionGroupExpr } from "@/plugins/cel";import {buildCELExpr,ExprType,@@ -27,40 +27,25 @@ import { ExpirationPicker } from "@/react/components/ui/expiration-picker";import { FeatureModal } from "@/react/components/ui/feature-modal";import { Input } from "@/react/components/ui/input";import { Tooltip } from "@/react/components/ui/tooltip";-import { getClassificationLevelOptions } from "@/react/lib/sensitive-data/components-utils";-import { rewriteResourceDatabase } from "@/react/lib/sensitive-data/exemptionDataUtils";-import type { SensitiveColumn } from "@/react/lib/sensitive-data/types";import {- convertSensitiveColumnToDatabaseResource,- getExpressionsForDatabaseResource as getResourceExpressions,-} from "@/react/lib/sensitive-data/utils";+ buildMaskingExemption,+ useMaskingExemptionExprConfig,+} from "@/react/lib/sensitive-data/maskingExemption";+import type { SensitiveColumn } from "@/react/lib/sensitive-data/types";+import { convertSensitiveColumnToDatabaseResource } from "@/react/lib/sensitive-data/utils";import { useAppStore } from "@/react/stores/app";import { pushNotification } from "@/store";import type { DatabaseResource } from "@/types";-import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";import type {Instance,InstanceResource,} from "@/types/proto-es/v1/instance_service_pb";import {- MaskingExemptionPolicy_ExemptionSchema,MaskingExemptionPolicySchema,PolicyResourceType,PolicyType,} from "@/types/proto-es/v1/org_policy_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import {- batchConvertParsedExprToCELString,- getDatabaseNameOptionConfig,-} from "@/utils";-import {- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,-} from "@/utils/cel-attributes";-import { type OptionConfig } from "@/utils/expr";import {convertFromExpr,stringifyConditionExpression,@@ -255,48 +240,8 @@ export function GrantAccessDialog({[memberList, isValid]);- const factorList = useMemo((): Factor[] => {- return [- CEL_ATTRIBUTE_RESOURCE_DATABASE,- CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,- CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,- CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- ];- }, []);-- const factorOperatorOverrideMap = useMemo(- () =>- new Map<Factor, Operator[]>([- [CEL_ATTRIBUTE_RESOURCE_DATABASE, ["_==_", "@in"]],- [CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME, ["_==_"]],- [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ["_==_", "@in"]],- [CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME, ["_==_", "@in"]],- [- CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,- ["_==_", "_!=_", "_<_", "_<=_", "_>=_", "_>_"],- ],- ]),- []- );-- // Subscribe so the classification options recompute when DATA_CLASSIFICATION- // loads (getClassificationLevelOptions reads the app store imperatively).- const settingsByName = useAppStore((s) => s.settingsByName);- const factorOptionConfigMap = useMemo((): Map<Factor, OptionConfig> => {- return factorList.reduce((map, factor) => {- if (factor === CEL_ATTRIBUTE_RESOURCE_DATABASE) {- map.set(factor, getDatabaseNameOptionConfig(projectName));- } else if (factor === CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL) {- map.set(factor, {- options: getClassificationLevelOptions(),- });- } else {- map.set(factor, { options: [] });- }- return map;- }, new Map<Factor, OptionConfig>());- }, [factorList, projectName, settingsByName]);+ const { factorList, factorOperatorOverrideMap, factorOptionConfigMap } =+ useMaskingExemptionExprConfig(projectName);const minDatetime = dayjs().startOf("day").format("YYYY-MM-DDTHH:mm");@@ -383,60 +328,14 @@ export function GrantAccessDialog({setProcessing(true);try {- const exemptions = [];-- const extraExpressions: string[] = [];- if (expirationTimestamp) {- extraExpressions.push(- `request.time < timestamp("${new Date(expirationTimestamp).toISOString()}")`- );- }-- if (radioValue === "EXPRESSION") {- const parsedExpr = await buildCELExpr(expr);- if (parsedExpr) {- let [celString] = await batchConvertParsedExprToCELString([- parsedExpr,- ]);- celString = rewriteResourceDatabase(celString);- const parts = [celString, ...extraExpressions].filter((e) => e);- exemptions.push(- create(MaskingExemptionPolicy_ExemptionSchema, {- members: memberList,- condition: create(ExprSchema, {- description,- expression: parts.length > 0 ? parts.join(" && ") : "",- }),- })- );- }- } else {- const resources =- radioValue === "SELECT" ? databaseResources : undefined;-- const resourceExpressions = (- resources?.map(getResourceExpressions) ?? [[""]]- ).map((parts) => parts.filter((e) => e).join(" && "));-- let resourceCondition = "";- const nonEmpty = resourceExpressions.filter((e) => e);- if (nonEmpty.length === 1) {- resourceCondition = nonEmpty[0];- } else if (nonEmpty.length > 1) {- resourceCondition = nonEmpty.map((e) => `(${e})`).join(" || ");- }-- const parts = [resourceCondition, ...extraExpressions].filter((e) => e);- exemptions.push(- create(MaskingExemptionPolicy_ExemptionSchema, {- members: memberList,- condition: create(ExprSchema, {- description,- expression: parts.length > 0 ? parts.join(" && ") : "",- }),- })- );- }+ const exemption = await buildMaskingExemption({+ radioValue,+ expr,+ databaseResources,+ memberList,+ description,+ expirationTimestamp,+ });const policy = await useAppStore.getState()@@ -458,7 +357,7 @@ export function GrantAccessDialog({policy: {case: "maskingExemptionPolicy",value: create(MaskingExemptionPolicySchema, {- exemptions: [...existed, ...exemptions],+ exemptions: [...existed, exemption],}),},},