Skip to content

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

fix: should check the policy permission instead of the setting permission (#18814)

ecmadao9d864ee88cdc
diff --git a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
index 794dabda73..89aa22f477 100644
--- a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
+++ b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts
@@ -102,6 +102,7 @@ export const useCommonSearchScopeOptions = (
filter: {
query: keyword,
},
+ silent: true,
})
.then((resp) => ({
nextPageToken: resp.nextPageToken,
diff --git a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
index af7c139b22..a845f82bc8 100644
--- a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
+++ b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
@@ -137,6 +137,7 @@ const loadMoreUnmatched = async (token: string) => {
pageToken,
pageSize: pageSize.value,
parent: props.project,
+ silent: true,
});
pageToken = nextPageToken;
unmatched = databases.filter(
diff --git a/frontend/src/components/EnvironmentForm/Form.vue b/frontend/src/components/EnvironmentForm/Form.vue
index 08e3ff9fd2..e9073b7024 100644
--- a/frontend/src/components/EnvironmentForm/Form.vue
+++ b/frontend/src/components/EnvironmentForm/Form.vue
@@ -241,6 +241,7 @@ const fetchInstances = async () => {
filter: {
environment: environment.value.name,
},
+ silent: true,
});
return resp.instances;
} catch {
@@ -256,6 +257,7 @@ const fetchDatabases = async () => {
filter: {
environment: environment.value.name,
},
+ silent: true,
});
return resp.databases;
} catch {
diff --git a/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue b/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
index 0ed673362d..838543b43f 100644
--- a/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
+++ b/frontend/src/components/GeneralSetting/QueryDataPolicySetting.vue
@@ -5,7 +5,7 @@
<Switch
:value="!disableExport"
:text="true"
- :disabled="!allowEdit"
+ :disabled="disabled"
@update:value="(val: boolean) => disableExport = !val"
/>
<span class="font-medium">
@@ -26,7 +26,7 @@
</div>
<MaximumSQLResultSizeSetting
ref="maximumSQLResultSizeSettingRef"
- :allow-edit="allowEdit"
+ :allow-edit="!disabled"
:resource="resource"
:policy="policyPayload"
:tooltip="scope ? $t('settings.general.workspace.query-data-policy.tooltip', { scope }) : ''"
@@ -57,7 +57,7 @@
<div class="mt-3 w-full flex flex-row justify-start items-center gap-4">
<NInputNumber
:value="maxQueryTimeInseconds"
- :disabled="!allowEdit"
+ :disabled="disabled"
class="w-60"
:min="0"
:precision="0"
@@ -92,12 +92,12 @@ import {
QueryDataPolicySchema,
} from "@/types/proto-es/v1/org_policy_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
import { FeatureBadge } from "../FeatureGuard";
import MaximumSQLResultSizeSetting from "./MaximumSQLResultSizeSetting.vue";
const props = defineProps<{
resource: string;
+ allowEdit: boolean;
}>();
const policyV1Store = usePolicyV1Store();
@@ -150,10 +150,8 @@ watch(
}
);
-const allowEdit = computed(
- () =>
- hasWorkspacePermissionV2("bb.policies.update") &&
- hasQueryPolicyFeature.value
+const disabled = computed(
+ () => !props.allowEdit || !hasQueryPolicyFeature.value
);
const isDirty = computed(() => {
diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vue
index c14ddf4c0e..24dd3df860 100644
--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue
+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue
@@ -31,6 +31,7 @@
<QueryDataPolicySetting
ref="queryDataPolicySettingRef"
resource=""
+ :allow-edit="hasPermission"
/>
<MaximumRoleExpirationSetting
ref="maximumRoleExpirationSettingRef"
@@ -51,6 +52,7 @@ import { computed, ref } from "vue";
import { Switch } from "@/components/v2";
import { featureToRef, useSettingV1Store } from "@/store";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
+import { hasWorkspacePermissionV2 } from "@/utils";
import { FeatureBadge } from "../FeatureGuard";
import DomainRestrictionSetting from "./DomainRestrictionSetting.vue";
import MaximumRoleExpirationSetting from "./MaximumRoleExpirationSetting.vue";
@@ -63,6 +65,9 @@ const props = defineProps<{
const settingV1Store = useSettingV1Store();
const hasWatermarkFeature = featureToRef(PlanFeature.FEATURE_WATERMARK);
+const hasPermission = computed(() =>
+ hasWorkspacePermissionV2("bb.policies.update")
+);
const domainRestrictionSettingRef =
ref<InstanceType<typeof DomainRestrictionSetting>>();
diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue
index b73f94e009..99730c1df5 100644
--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue
+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue
@@ -248,6 +248,7 @@ const fetchDatabaseList = useDebounceFn(async () => {
pageToken,
parent: props.projectName,
filter: databaseFilter.value,
+ silent: true,
});
if (pageToken) {
diff --git a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
index 70834ec66c..7c74324180 100644
--- a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
@@ -1,5 +1,5 @@
<template>
- <div class="w-full flex flex-col justify-start items-start gap-y-6">
+ <div v-if="allowGet" class="w-full flex flex-col justify-start items-start gap-y-6">
<SQLReviewForResource
ref="sqlReviewForResourceRef"
:resource="project.name"
@@ -13,6 +13,7 @@
<QueryDataPolicySetting
ref="queryDataPolicySettingRef"
:resource="project.name"
+ :allow-edit="allowEdit"
/>
</div>
</template>
@@ -23,10 +24,10 @@ import AccessControlConfigure from "@/components/EnvironmentForm/AccessControlCo
import QueryDataPolicySetting from "@/components/GeneralSetting/QueryDataPolicySetting.vue";
import { SQLReviewForResource } from "@/components/SQLReview";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
+import { hasProjectPermissionV2 } from "@/utils";
-defineProps<{
+const props = defineProps<{
project: Project;
- allowEdit: boolean;
}>();
const accessControlConfigureRef =
@@ -43,6 +44,13 @@ const isDirty = computed(
queryDataPolicySettingRef.value?.isDirty
);
+const allowGet = computed(() =>
+ hasProjectPermissionV2(props.project, "bb.policies.get")
+);
+const allowEdit = computed(() =>
+ hasProjectPermissionV2(props.project, "bb.policies.update")
+);
+
const onUpdate = async () => {
if (sqlReviewForResourceRef.value?.isDirty) {
await sqlReviewForResourceRef.value.update();
diff --git a/frontend/src/components/ProjectSettingPanel.vue b/frontend/src/components/ProjectSettingPanel.vue
index 986649627f..634014ffcd 100644
--- a/frontend/src/components/ProjectSettingPanel.vue
+++ b/frontend/src/components/ProjectSettingPanel.vue
@@ -28,7 +28,6 @@
<ProjectSecuritySettingPanel
ref="projectSecuritySettingPanelRef"
:project="project"
- :allow-edit="allowEdit"
/>
</div>
</div>
diff --git a/frontend/src/components/v2/Select/DatabaseSelect.vue b/frontend/src/components/v2/Select/DatabaseSelect.vue
index a98b3f9c9f..140ab6eb90 100644
--- a/frontend/src/components/v2/Select/DatabaseSelect.vue
+++ b/frontend/src/components/v2/Select/DatabaseSelect.vue
@@ -96,6 +96,7 @@ const handleSearch = async (params: {
},
pageToken: params.pageToken,
pageSize: params.pageSize,
+ silent: true,
});
return {
nextPageToken,
diff --git a/frontend/src/components/v2/Select/InstanceSelect.vue b/frontend/src/components/v2/Select/InstanceSelect.vue
index a8024b356c..5de57db0d3 100644
--- a/frontend/src/components/v2/Select/InstanceSelect.vue
+++ b/frontend/src/components/v2/Select/InstanceSelect.vue
@@ -99,6 +99,7 @@ const handleSearch = async (params: {
environment: props.environmentName,
project: props.projectName,
},
+ silent: true,
});
return {
diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.ts
index 6c986b1626..8b13140f44 100644
--- a/frontend/src/router/dashboard/projectV1.ts
+++ b/frontend/src/router/dashboard/projectV1.ts
@@ -357,7 +357,6 @@ const projectV1Routes: RouteRecordRaw[] = [
name: PROJECT_V1_ROUTE_SETTINGS,
meta: {
title: () => t("common.settings"),
- requiredPermissionList: () => ["bb.policies.list"],
},
component: () => import("@/views/project/ProjectSettingPanel.vue"),
props: true,
diff --git a/frontend/src/router/dashboard/workspaceSetting.ts b/frontend/src/router/dashboard/workspaceSetting.ts
index 633f5a8730..62edf099e0 100644
--- a/frontend/src/router/dashboard/workspaceSetting.ts
+++ b/frontend/src/router/dashboard/workspaceSetting.ts
@@ -42,7 +42,7 @@ const workspaceSettingRoutes: RouteRecordRaw[] = [
name: SETTING_ROUTE_WORKSPACE_GENERAL,
meta: {
title: () => t("settings.sidebar.general"),
- requiredPermissionList: () => ["bb.settings.get"],
+ requiredPermissionList: () => ["bb.settings.get", "bb.policies.get"],
},
component: () => import("@/views/SettingWorkspaceGeneral.vue"),
props: true,
diff --git a/frontend/src/store/modules/v1/database.ts b/frontend/src/store/modules/v1/database.ts
index 0661783db6..69d5acaada 100644
--- a/frontend/src/store/modules/v1/database.ts
+++ b/frontend/src/store/modules/v1/database.ts
@@ -187,6 +187,7 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {
filter?: DatabaseFilter;
skipCacheRemoval?: boolean;
orderBy?: string;
+ silent?: boolean;
}): Promise<{
databases: ComposedDatabase[];
nextPageToken: string;
@@ -206,7 +207,9 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {
showDeleted: params.filter?.showDeleted,
filter: getListDatabaseFilter(params.filter ?? {}),
});
- const response = await databaseServiceClientConnect.listDatabases(request);
+ const response = await databaseServiceClientConnect.listDatabases(request, {
+ contextValues: createContextValues().set(silentContextKey, params.silent),
+ });
const databases = response.databases; // Work directly with proto-es types
const { nextPageToken } = response;
if (
diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.ts
index b1f39cfbd8..5918af2e65 100644
--- a/frontend/src/store/modules/v1/instance.ts
+++ b/frontend/src/store/modules/v1/instance.ts
@@ -304,13 +304,8 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
pageToken?: string;
orderBy?: string;
filter?: InstanceFilter;
+ silent?: boolean;
}) => {
- if (!hasWorkspacePermissionV2("bb.instances.list")) {
- return {
- instances: [],
- nextPageToken: "",
- };
- }
const request = create(ListInstancesRequestSchema, {
pageSize: params.pageSize,
pageToken: params.pageToken,
@@ -318,7 +313,9 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
filter: getListInstanceFilter(params.filter ?? {}),
showDeleted: params.filter?.state === State.DELETED ? true : false,
});
- const response = await instanceServiceClientConnect.listInstances(request);
+ const response = await instanceServiceClientConnect.listInstances(request, {
+ contextValues: createContextValues().set(silentContextKey, params.silent),
+ });
const nextPageToken = response.nextPageToken;
const instances = upsertInstances(response.instances);
diff --git a/frontend/src/types/v1/project.ts b/frontend/src/types/v1/project.ts
index 70dc781dec..57ecf2842c 100644
--- a/frontend/src/types/v1/project.ts
+++ b/frontend/src/types/v1/project.ts
@@ -15,6 +15,9 @@ export const emptyProject = (): Project => {
title: "",
state: State.ACTIVE,
enforceIssueTitle: true,
+ enforceSqlReview: true,
+ requireIssueApproval: true,
+ requirePlanCheckNoError: true,
});
};
diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.ts
index 1152df5189..f42afd3b80 100644
--- a/frontend/src/utils/expr.ts
+++ b/frontend/src/utils/expr.ts
@@ -196,6 +196,7 @@ export const getInstanceIdOptionConfig = (): OptionConfig => {
filter: {
query: params.search,
},
+ silent: true,
})
.then((resp) => ({
nextPageToken: resp.nextPageToken,
@@ -231,6 +232,7 @@ export const getDatabaseIdOptionConfig = (parent: string): OptionConfig => {
filter: {
query: params.search,
},
+ silent: true,
})
.then((resp) => ({
nextPageToken: resp.nextPageToken,
@@ -261,6 +263,7 @@ export const getDatabaseNameOptionConfig = (parent: string): OptionConfig => {
filter: {
query: params.search,
},
+ silent: true,
})
.then((resp) => ({
nextPageToken: resp.nextPageToken,
diff --git a/frontend/src/views/project/ProjectSettingPanel.vue b/frontend/src/views/project/ProjectSettingPanel.vue
index 417fbac8bc..dc049d5954 100644
--- a/frontend/src/views/project/ProjectSettingPanel.vue
+++ b/frontend/src/views/project/ProjectSettingPanel.vue
@@ -3,32 +3,21 @@
</template>
<script setup lang="ts">
-import { computed, watchEffect } from "vue";
+import { computed } from "vue";
import ProjectSettingPanel from "@/components/ProjectSettingPanel.vue";
import { useBodyLayoutContext } from "@/layouts/common";
-import { usePolicyV1Store, useProjectByName } from "@/store";
+import { useProjectByName } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
-import { PolicyResourceType } from "@/types/proto-es/v1/org_policy_service_pb";
const props = defineProps<{
projectId: string;
allowEdit: boolean;
}>();
-const policyV1Store = usePolicyV1Store();
const { project } = useProjectByName(
computed(() => `${projectNamePrefix}${props.projectId}`)
);
-const preparePolicies = () => {
- policyV1Store.fetchPolicies({
- parent: project.value.name,
- resourceType: PolicyResourceType.PROJECT,
- });
-};
-
-watchEffect(preparePolicies);
-
const { overrideMainContainerClass } = useBodyLayoutContext();
overrideMainContainerClass("py-0!");