Skip to content

Commit 9bc8b93

Browse files
committed
fix(search): reject exhausted permission import revisions
1 parent ea0fb42 commit 9bc8b93

4 files changed

Lines changed: 17 additions & 3 deletions

File tree

‎apps/docs/openapi-v2-resources.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25011,7 +25011,7 @@
2501125011
"expectedRevision": {
2501225012
"type": "integer",
2501325013
"exclusiveMinimum": 0,
25014-
"maximum": 9007199254740991,
25014+
"maximum": 2147483646,
2501525015
"description": "Permission revision pinned before exporting the CSVs."
2501625016
},
2501725017
"userMapping": {

‎apps/sim/lib/api/contracts/v2/source-permission-imports.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { z } from 'zod'
22
import {
3+
INT4_MAX,
34
noInputSchema,
45
nonEmptyIdSchema,
56
organizationIdSchema,
@@ -53,6 +54,7 @@ export const permissionImportManifestSchema = z
5354
.number()
5455
.int()
5556
.positive()
57+
.max(INT4_MAX - 1, 'Permission revision is out of range.')
5658
.describe('Permission revision pinned before exporting the CSVs.'),
5759
userMapping: file
5860
.extend({

‎apps/sim/scripts/test-gitlab-csv-permissions-e2e.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,24 @@ try {
278278
).status,
279279
400
280280
)
281+
await sql`update knowledge_connector_permission_snapshot set revision = 2147483647
282+
where connector_id = ${source}`
283+
for (const expectedRevision of [2_147_483_647, 2_147_483_648]) {
284+
assert.equal(
285+
(await importRequest('', 'POST', { ...manifest, expectedRevision })).status,
286+
400,
287+
'A revision without room for the completed snapshot must not reserve an import'
288+
)
289+
}
290+
await checkRevision(await request(adminKey), 2_147_483_647)
291+
await sql`update knowledge_connector_permission_snapshot set revision = 3
292+
where connector_id = ${source}`
281293
const [reserved] = await sql`select count(*)::integer as count
282294
from knowledge_connector_permission_import where connector_id = ${source}`
283295
assert.equal(reserved?.count, 0)
284296
await checkRevision(await request(adminKey), 3)
285297
checks.push(
286-
'Impossible row/part manifests and combined part overflow do not reserve import capacity or change permissions'
298+
'Impossible row/part manifests, exhausted revisions and combined part overflow do not reserve import capacity or change permissions'
287299
)
288300
assert.equal((await importRequest('', 'POST', manifest, memberKey)).status, 403)
289301
const started = await importRequest('', 'POST', manifest)

‎packages/sim-cli/src/generated/v2-api.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18013,7 +18013,7 @@ export const V2_OPERATIONS = {
1801318013
expectedRevision: {
1801418014
kind: 'integer',
1801518015
required: true,
18016-
maximum: 9007199254740991,
18016+
maximum: 2147483646,
1801718017
describe: 'Permission revision pinned before exporting the CSVs.',
1801818018
},
1801918019
userMapping: { kind: 'object', required: true, describe: 'Complete user identity mapping.' },

0 commit comments

Comments
 (0)