Skip to content

feat(security): ADR-0058 D1 follow-through — RLS predicates migrate to canonical CEL #2099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuyushun441-sys merged 1 commit into from
Jun 21, 2026
Merged

feat(security): ADR-0058 D1 follow-through — RLS predicates migrate to canonical CEL #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions .changeset/rls-using-to-cel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
"@objectstack/spec": minor
"@objectstack/plugin-security": minor
---

ADR-0058 D1 follow-through — RLS predicates are now canonical CEL. Migrated every
seeded RLS `using`/`check` (default permission sets, showcase, and the
`RLS.ownerPolicy`/`tenantPolicy`/`allowAllPolicy` helper factories) from the
legacy SQL-ish form (`=`, `IN (...)`) to pure CEL (`==`, `in`), so authors and AI
learn ONE expression language. The `sqlPredicateToCel` bridge is retained as a
DEPRECATED transitional shim: a stored SQL-style predicate still compiles (no
silent deny on legacy data) but emits a deprecation warn; canonical CEL passes
through as a no-op. No runtime behavior change — CEL and the old SQL form compile
to the identical FilterCondition.
4 changes: 2 additions & 2 deletions examples/app-showcase/src/security/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const ContributorPermissionSet = {
description: 'Contributors can only select tasks assigned to them.',
object: 'showcase_task',
operation: 'select' as const,
using: "assignee = current_user.email",
using: "assignee == current_user.email",
roles: ['contributor'],
enabled: true,
priority: 10,
Expand All @@ -75,7 +75,7 @@ export const ContributorPermissionSet = {
description: "Contributors only see invoices they own; their lines follow via controlled_by_parent.",
object: 'showcase_invoice',
operation: 'select' as const,
using: "owner = current_user.email",
using: "owner == current_user.email",
roles: ['contributor'],
enabled: true,
priority: 10,
Expand Down
98 changes: 49 additions & 49 deletions packages/plugins/plugin-security/src/objects/default-permission-sets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'tenant_isolation',
object: '*',
operation: 'all',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
// ── better-auth system tables that lack `organization_id` and would
// otherwise be denied by the wildcard policy. Same self-only
Expand All @@ -167,79 +167,79 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_organization_self',
object: 'sys_organization',
operation: 'all',
using: 'id = current_user.organization_id',
using: 'id == current_user.organization_id',
},
{
name: 'sys_user_self',
object: 'sys_user',
operation: 'select',
using: 'id = current_user.id',
using: 'id == current_user.id',
},
{
name: 'sys_user_org_members',
object: 'sys_user',
operation: 'select',
using: 'id IN (current_user.org_user_ids)',
using: 'id in current_user.org_user_ids',
},
{
name: 'sys_session_self',
object: 'sys_session',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_account_self',
object: 'sys_account',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_team_member_self',
object: 'sys_team_member',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_two_factor_self',
object: 'sys_two_factor',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_user_preference_self',
object: 'sys_user_preference',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_api_key_self',
object: 'sys_api_key',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_device_code_self',
object: 'sys_device_code',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_access_token_self',
object: 'sys_oauth_access_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_refresh_token_self',
object: 'sys_oauth_refresh_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_consent_self',
object: 'sys_oauth_consent',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
// OAuth applications a user has registered themselves (self-service
// developer flow exposed in the Account app's Developer section).
Expand All @@ -249,7 +249,7 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_oauth_application_self',
object: 'sys_oauth_application',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
// Org-scoped visibility for organization-owned identity-adjacent
// tables. Org admins may inspect their own org's invitations and
Expand All @@ -258,19 +258,19 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_member_org',
object: 'sys_member',
operation: 'select',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
{
name: 'sys_invitation_org',
object: 'sys_invitation',
operation: 'select',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
{
name: 'sys_team_org',
object: 'sys_team',
operation: 'select',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
],
}),
Expand All @@ -293,7 +293,7 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'tenant_isolation',
object: '*',
operation: 'all',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
// Owner-scoped writes/deletes for rank-and-file members: you may modify
// and delete the records you created, not other users'. Keyed on
Expand All @@ -311,13 +311,13 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'owner_only_writes',
object: '*',
operation: 'update',
using: 'created_by = current_user.id',
using: 'created_by == current_user.id',
},
{
name: 'owner_only_deletes',
object: '*',
operation: 'delete',
using: 'created_by = current_user.id',
using: 'created_by == current_user.id',
},
// ── better-auth system tables that lack `organization_id` and would
// otherwise be left unprotected by the wildcard rule above. ────
Expand All @@ -334,13 +334,13 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_organization_self',
object: 'sys_organization',
operation: 'all',
using: 'id = current_user.organization_id',
using: 'id == current_user.organization_id',
},
{
name: 'sys_user_self',
object: 'sys_user',
operation: 'select',
using: 'id = current_user.id',
using: 'id == current_user.id',
},
// Org collaborators: members can see other users in the same
// organization. Without this, owner/assignee lookups, @-mention
Expand All @@ -354,67 +354,67 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_user_org_members',
object: 'sys_user',
operation: 'select',
using: 'id IN (current_user.org_user_ids)',
using: 'id in current_user.org_user_ids',
},
{
name: 'sys_session_self',
object: 'sys_session',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_account_self',
object: 'sys_account',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_team_member_self',
object: 'sys_team_member',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_two_factor_self',
object: 'sys_two_factor',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_user_preference_self',
object: 'sys_user_preference',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_api_key_self',
object: 'sys_api_key',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_device_code_self',
object: 'sys_device_code',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_access_token_self',
object: 'sys_oauth_access_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_refresh_token_self',
object: 'sys_oauth_refresh_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_consent_self',
object: 'sys_oauth_consent',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
// OAuth applications a user has registered themselves (Account →
// Developer → OAuth Applications). `sys_oauth_application` has no
Expand All @@ -424,7 +424,7 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'sys_oauth_application_self',
object: 'sys_oauth_application',
operation: 'all',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
],
}),
Expand All @@ -449,87 +449,87 @@ export const defaultPermissionSets: PermissionSet[] = [
name: 'tenant_isolation',
object: '*',
operation: 'select',
using: 'organization_id = current_user.organization_id',
using: 'organization_id == current_user.organization_id',
},
{
name: 'sys_organization_self',
object: 'sys_organization',
operation: 'select',
using: 'id = current_user.organization_id',
using: 'id == current_user.organization_id',
},
{
name: 'sys_user_self',
object: 'sys_user',
operation: 'select',
using: 'id = current_user.id',
using: 'id == current_user.id',
},
// Org collaborators (read-only): see `sys_user_org_members` in
// `member_default` for rationale.
{
name: 'sys_user_org_members',
object: 'sys_user',
operation: 'select',
using: 'id IN (current_user.org_user_ids)',
using: 'id in current_user.org_user_ids',
},
{
name: 'sys_session_self',
object: 'sys_session',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_account_self',
object: 'sys_account',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_team_member_self',
object: 'sys_team_member',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_two_factor_self',
object: 'sys_two_factor',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_user_preference_self',
object: 'sys_user_preference',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_api_key_self',
object: 'sys_api_key',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_device_code_self',
object: 'sys_device_code',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_access_token_self',
object: 'sys_oauth_access_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_refresh_token_self',
object: 'sys_oauth_refresh_token',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
{
name: 'sys_oauth_consent_self',
object: 'sys_oauth_consent',
operation: 'select',
using: 'user_id = current_user.id',
using: 'user_id == current_user.id',
},
],
}),
Expand Down
Loading
Loading