Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 40 additions & 65 deletions packages/plugins/policy/src/policy-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import {
ValueNode,
ValuesNode,
WhereNode,
type Expression as KyselyExpression,
type OperationNode,
type QueryResult,
type RootOperationNode,
Expand All @@ -57,6 +56,7 @@ import {
falseNode,
getTableName,
isBeforeInvocation,
isFalseNode,
isTrueNode,
logicalNot,
trueNode,
Expand Down Expand Up @@ -968,32 +968,34 @@ export class PolicyHandler<Schema extends SchemaDef> extends OperationNodeTransf
? this.unwrapCreateValueRows(node.values, mutationModel, fields, isManyToManyJoinTable)
: [[]];

if (!isManyToManyJoinTable) {
// A create filter built only from `auth()` doesn't reference the row being inserted,
// so it holds for every row alike and checking it per row re-asks the same question.
const filter = this.buildPolicyFilter(mutationModel, undefined, 'create');
if (isTrueNode(filter)) {
return;
}
}

for (const values of valueRows) {
if (isManyToManyJoinTable) {
if (isManyToManyJoinTable) {
for (const values of valueRows) {
await this.enforcePreCreatePolicyForManyToManyJoinTable(
mutationModel,
fields,
values.map((v) => v.node),
proceed,
);
} else {
await this.enforcePreCreatePolicyForOne(
mutationModel,
fields,
values.map((v) => v.node),
proceed,
);
}
return;
}

const filter = this.buildPolicyFilter(mutationModel, undefined, 'create');
if (isTrueNode(filter)) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @evgenovalov , unrelated to this change, but I think we can add a check for isFalseNode too and reject early (if there're non-zero rows to create), so simple cases can save the cost of checking against the database. What do you think?

@evgenovalov evgenovalov Nov 20, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯 Makes sense, fixed

Now when the create filter folds to false (e.g. auth() != null or @@deny('all', auth() == null) for an anonymous user, or a false auth() flag), the batch is now rejected right away with the same NO_ACCESS error

return;
}
if (isFalseNode(filter) && valueRows.length > 0) {
// no row can satisfy a filter that folds to `false`, so there's nothing to ask the database
throw createRejectedByPolicyError(mutationModel, RejectedByPolicyReason.NO_ACCESS);
}

await this.enforcePreCreatePolicyForRows(
mutationModel,
fields,
valueRows.map((values) => values.map((v) => v.node)),
filter,
proceed,
);
}

private async enforcePreCreatePolicyForManyToManyJoinTable(
Expand Down Expand Up @@ -1059,52 +1061,33 @@ export class PolicyHandler<Schema extends SchemaDef> extends OperationNodeTransf
}
}

private async enforcePreCreatePolicyForOne(
private async enforcePreCreatePolicyForRows(
model: string,
fields: string[],
values: OperationNode[],
rows: OperationNode[][],
filter: OperationNode,
proceed: ProceedKyselyQueryFunction,
) {
const allFields = QueryUtils.getModelFields(this.client.$schema, model, { inherited: true });
const allValues: KyselyExpression<any>[] = [];

for (const def of allFields) {
const index = fields.indexOf(def.name);
if (index >= 0) {
allValues.push(new ExpressionWrapper(values[index]!));
} else {
// set non-provided fields to null
allValues.push(this.eb.lit(null));
}
}
const fieldIndices = allFields.map((def) => fields.indexOf(def.name));

// create a `SELECT column1 as field1, column2 as field2, ... FROM (VALUES (...))` table for policy evaluation
const valuesTable = this.dialect.buildValuesTableSelect(allFields, [allValues]);

const filter = this.buildPolicyFilter(model, undefined, 'create');
// NULL literals rather than parameters: the check has to fit the INSERT's parameter limit
const allRows = rows.map((values) =>
fieldIndices.map((index) => (index >= 0 ? new ExpressionWrapper(values[index]!) : this.eb.lit(null))),
);

// check if the provided values satisfy the create policy
// create a `SELECT column1 as field1, column2 as field2, ... FROM (VALUES (...), ...)` table for policy evaluation
const valuesTable = this.dialect.buildValuesTableSelect(allFields, allRows);

// `SELECT 1 FROM (VALUES (...)) AS t(column1, column2, ...) WHERE <filter>`
const preCreateInner = this.eb
// Every row must satisfy the filter. Counting the rows that do (rather than looking for one
// that doesn't) also rejects rows whose filter evaluates to NULL.
// `SELECT COUNT(1) = <row count> AS $condition FROM (VALUES ...) AS t(column1, column2, ...) WHERE <filter>`
const preCreateQuery = this.eb
.selectFrom(valuesTable.as(model))
.select(this.eb.lit(1).as('_'))
.select(this.eb(this.eb.fn('COUNT', [this.eb.lit(1)]), '=', this.eb.lit(rows.length)).as('$condition'))
.where(() => new ExpressionWrapper(filter));

const result = await proceed(
// `SELECT EXISTS(preCreateInner) AS $condition`
{
kind: 'SelectQueryNode',
selections: [
SelectionNode.create(
AliasNode.create(
this.eb.exists(preCreateInner).toOperationNode(),
IdentifierNode.create('$condition'),
),
),
],
} satisfies SelectQueryNode,
);
const result = await proceed(preCreateQuery.toOperationNode());
if (!result.rows[0]?.$condition) {
throw createRejectedByPolicyError(model, RejectedByPolicyReason.NO_ACCESS);
}
Expand Down Expand Up @@ -1145,7 +1128,8 @@ export class PolicyHandler<Schema extends SchemaDef> extends OperationNodeTransf
if (itemsAreNodes) {
const itemNode = item as OperationNode;
if (DefaultInsertValueNode.is(itemNode)) {
result.push({ node: ValueNode.create(null), raw: null });
// inlined like the DEFAULT keyword it replaces, so it binds no parameter
result.push({ node: ValueNode.createImmediate(null), raw: null });
continue;
}
const fieldDef = QueryUtils.requireField(this.client.$schema, model, fields[i]!);
Expand All @@ -1167,16 +1151,7 @@ export class PolicyHandler<Schema extends SchemaDef> extends OperationNodeTransf
value = this.dialect.transformInput(item, fieldDef.type as BuiltinType, !!fieldDef.array);
}

// handle the case for list column
if (Array.isArray(value)) {
const fieldDef = QueryUtils.requireField(this.client.$schema, model, fields[i]!);
result.push({
node: this.dialect.buildArrayValue(value, fieldDef.type).toOperationNode(),
raw: value,
});
} else {
result.push({ node: ValueNode.create(value), raw: value });
}
result.push({ node: ValueNode.create(value), raw: value });
}
}
return result;
Expand Down
34 changes: 25 additions & 9 deletions tests/regression/test/issue-2841.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ model AuditLog {
}

model Note {
id String @id @default(cuid())
ownerId String
id String @id @default(cuid())
ownerId String?

@@allow('create', ownerId == auth().id)
@@allow('read', true)
Expand Down Expand Up @@ -57,7 +57,7 @@ model Note {
});

it('still rejects the batch when a non-row-dependent create filter denies', async () => {
const { db } = await createClient();
const { db, policyChecks } = await createClient();
const authDb = db.$setAuth({ id: 'u1', isSystem: false });

await expect(
Expand All @@ -66,26 +66,42 @@ model Note {
}),
).rejects.toThrow(/rejected by access policies/i);

// `auth().isSystem` resolves to `false`, so the batch is rejected without asking the database
expect(policyChecks()).toHaveLength(0);
await expect(db.auditLog.findMany()).resolves.toHaveLength(0);
});

it('still checks each row when the create filter references the row', async () => {
it('checks a row-dependent create filter for the whole batch in one query', async () => {
const { db, policyChecks } = await createClient();
const authDb = db.$setAuth({ id: 'u1', isSystem: true });

await expect(
authDb.note.createMany({
data: [{ ownerId: 'u1' }, { ownerId: 'u1' }],
data: Array.from({ length: 5 }, () => ({ ownerId: 'u1' })),
}),
).resolves.toMatchObject({ count: 2 });
expect(policyChecks()).toHaveLength(2);
).resolves.toMatchObject({ count: 5 });
expect(policyChecks()).toHaveLength(1);

// a single offending row still rejects the whole batch
await expect(
authDb.note.createMany({
data: [{ ownerId: 'u1' }, { ownerId: 'someone-else' }],
data: [{ ownerId: 'u1' }, { ownerId: 'someone-else' }, { ownerId: 'u1' }],
}),
).rejects.toThrow(/rejected by access policies/i);
expect(policyChecks()).toHaveLength(2);
await expect(db.note.findMany()).resolves.toHaveLength(5);
});

it('rejects the batch when the create filter evaluates to NULL for a row', async () => {
const { db } = await createClient();
const authDb = db.$setAuth({ id: 'u1', isSystem: true });

// `NULL = 'u1'` is neither true nor false
await expect(
authDb.note.createMany({
data: [{ ownerId: 'u1' }, { ownerId: null }],
}),
).rejects.toThrow(/rejected by access policies/i);
await expect(db.note.findMany()).resolves.toHaveLength(2);
await expect(db.note.findMany()).resolves.toHaveLength(0);
});
});
Loading