Skip to content

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

fix: jit query limit (#19448)

ecmadao9abc06944064
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 5050b9fba7..c7a71e0e7c 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -288,9 +288,13 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
OperatorEmail: user.Email,
Option: request.QueryOption,
Container: request.GetContainer(),
- SkipMasking: accessGrant != nil && accessGrant.Payload.Unmask,
MaximumSQLResultSize: queryRestriction.MaximumResultSize,
}
+ if accessGrant != nil {
+ // unset the query limit
+ queryContext.Limit = 0
+ queryContext.SkipMasking = accessGrant.Payload.Unmask
+ }
if request.Schema != nil {
queryContext.Schema = *request.Schema
}
diff --git a/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue b/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue
index e3d244a4bc..1e70e9ffa6 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/AccessGrantView/AccessGrantDetailsSection.vue
@@ -35,13 +35,21 @@
<span class="text-sm text-control-light">
{{ $t("common.statement") }}
</span>
+ <BBAttention
+ v-if="accessGrant.unmask"
+ :type="'warning'"
+ >
+ {{ $t("sql-editor.unmask-warning") }}
+ </BBAttention>
<div
class="max-h-[10em] overflow-auto border rounded-sm p-2 font-mono text-sm whitespace-pre-wrap"
>
{{ accessGrant.query }}
</div>
<NCheckbox :checked="accessGrant.unmask" :readonly="true">
- {{ $t("sql-editor.access-type-unmask") }}
+ <span class="text-base">
+ {{ $t("sql-editor.access-type-unmask") }}
+ </span>
</NCheckbox>
</div>
@@ -74,7 +82,7 @@
<script lang="ts" setup>
import { NCheckbox } from "naive-ui";
import { computed, ref, watchEffect } from "vue";
-import { BBSpin } from "@/bbkit";
+import { BBAttention, BBSpin } from "@/bbkit";
import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";
import { useAccessGrantStore, useDatabaseV1Store } from "@/store";
import { isValidDatabaseName } from "@/types";
diff --git a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
index 0cef4d9964..4450221a77 100644
--- a/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectSecuritySettingPanel.vue
@@ -56,40 +56,42 @@
</div>
</div>
- <div class="flex items-center gap-x-2">
- <PermissionGuardWrapper
- v-slot="slotProps"
- :project="project"
- :permissions="[
- 'bb.projects.update'
- ]"
- >
- <Switch
- v-model:value="allowJustInTimeAccess"
- :text="true"
- :disabled="
- slotProps.disabled ||
- loading
- "
+ <div>
+ <div class="flex items-center gap-x-2">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="project"
+ :permissions="[
+ 'bb.projects.update'
+ ]"
+ >
+ <Switch
+ v-model:value="allowJustInTimeAccess"
+ :text="true"
+ :disabled="
+ slotProps.disabled ||
+ loading
+ "
+ />
+ </PermissionGuardWrapper>
+ <div class="textlabel flex items-center gap-x-2">
+ {{
+ $t(
+ "project.settings.issue-related.allow-jit.self"
+ )
+ }}
+ </div>
+ <ApprovalFlowIndicator
+ :source="WorkspaceApprovalSetting_Rule_Source.REQUEST_ACCESS"
/>
- </PermissionGuardWrapper>
- <div class="textlabel flex items-center gap-x-2">
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
{{
$t(
- "project.settings.issue-related.allow-jit.self"
+ "project.settings.issue-related.allow-jit.description"
)
}}
</div>
- <ApprovalFlowIndicator
- :source="WorkspaceApprovalSetting_Rule_Source.REQUEST_ACCESS"
- />
- </div>
- <div class="mt-1 text-sm text-gray-400">
- {{
- $t(
- "project.settings.issue-related.allow-jit.description"
- )
- }}
</div>
</div>
</template>
diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.ts
index 459ec27a3e..89c0224446 100644
--- a/frontend/src/composables/useExecuteSQL.ts
+++ b/frontend/src/composables/useExecuteSQL.ts
@@ -298,7 +298,7 @@ const useExecuteSQL = () => {
name: database.name,
dataSourceId: dataSourceId,
statement: context.params.statement,
- limit: sqlEditorStore.resultRowsLimit,
+ limit: context.params.limit ?? sqlEditorStore.resultRowsLimit,
explain: context.params.explain,
schema: context.params.connection.schema,
container: context.params.connection.table,
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index b3c33fb48c..282729cb9c 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2158,6 +2158,7 @@
"grant-type-unmask": "Unmask",
"request-data-access": "Request Data Access",
"access-type-unmask": "See unmasked sensitive data",
+ "unmask-warning": "User will access unmasked data through this query",
"duration-hours": "{hours} hour | {hours} hours",
"duration-day": "{days} day",
"duration-days": "{days} days",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 3492c8355e..0afadf072f 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2158,6 +2158,7 @@
"grant-type-unmask": "Unmask",
"request-data-access": "Request Data Access",
"access-type-unmask": "See unmasked sensitive data",
+ "unmask-warning": "El usuario accederá a datos sin enmascarar a través de esta consulta",
"duration-hours": "{hours} hour | {hours} hours",
"duration-day": "{days} day",
"duration-days": "{days} days",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index fff12f4a66..8b2fe580d2 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2158,6 +2158,7 @@
"grant-type-unmask": "Unmask",
"request-data-access": "Request Data Access",
"access-type-unmask": "See unmasked sensitive data",
+ "unmask-warning": "ユーザーはこのクエリでマスク解除されたデータにアクセスします",
"duration-hours": "{hours} hour | {hours} hours",
"duration-day": "{days} day",
"duration-days": "{days} days",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 720bc00632..8810c0a30a 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2158,6 +2158,7 @@
"grant-type-unmask": "Unmask",
"request-data-access": "Request Data Access",
"access-type-unmask": "See unmasked sensitive data",
+ "unmask-warning": "Người dùng sẽ truy cập dữ liệu chưa được che giấu qua truy vấn này",
"duration-hours": "{hours} hour | {hours} hours",
"duration-day": "{days} day",
"duration-days": "{days} days",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index c2fe903131..4328d9dd83 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2158,6 +2158,7 @@
"grant-type-unmask": "脱敏豁免",
"request-data-access": "申请数据访问",
"access-type-unmask": "查看未脱敏的敏感数据",
+ "unmask-warning": "用户将通过此查询访问未脱敏的数据",
"duration-hours": "{hours} 小时",
"duration-day": "{days} 天",
"duration-days": "{days} 天",
diff --git a/frontend/src/types/sqlEditor/editor.ts b/frontend/src/types/sqlEditor/editor.ts
index 61e768eba2..833cebf20f 100644
--- a/frontend/src/types/sqlEditor/editor.ts
+++ b/frontend/src/types/sqlEditor/editor.ts
@@ -55,4 +55,5 @@ export type SQLEditorQueryParams = {
// Use to calculate the advice position.
selection: monaco.Selection | null;
queryOption?: QueryOption;
+ limit?: number;
};
diff --git a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue
index a05fc53e4a..143ada927c 100644
--- a/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/AccessPane/AccessPane.vue
@@ -40,6 +40,7 @@
</NButton>
</PermissionGuardWrapper>
</div>
+ <NDivider class="mt-2! mb-0!" />
<div class="w-full flex flex-col justify-start items-start overflow-y-auto">
<AccessGrantItem
v-for="grant in accessGrantList"
@@ -89,7 +90,7 @@
<script lang="ts" setup>
import { useElementSize } from "@vueuse/core";
-import { NButton } from "naive-ui";
+import { NButton, NDivider } from "naive-ui";
import { computed, nextTick, ref, watch } from "vue";
import AdvancedSearch from "@/components/AdvancedSearch";
import { FeatureBadge } from "@/components/FeatureGuard";
@@ -320,6 +321,7 @@ const handleRun = async (grant: AccessGrant) => {
engine: currentInstance.value.engine,
explain: false,
selection: null,
+ limit: 0, // no limit
});
});
};