Skip to content

fix: single-tenant audit follow-ups — member/invitation org optional + headOf org-scope (ADR-0057)#2182

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 22, 2026
Merged

fix: single-tenant audit follow-ups — member/invitation org optional + headOf org-scope (ADR-0057) #2182

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
16 changes: 16 additions & 0 deletions .changeset/fix-single-tenant-followup.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
"@objectstack/platform-objects": patch
"@objectstack/plugin-sharing": patch
---

Single-tenant audit follow-ups (ADR-0057):

- **`sys_member` / `sys_invitation`**: make `organization_id` optional (same class as the
sys_business_unit/sys_team fix #2178). Single-tenant has no org row and no auto-stamp;
multi-tenant still auto-stamps via OrgScopingPlugin with null-org rows hidden by
tenant-isolation RLS (fail-closed). Completes the org-scoped identity graph's
single-tenant consistency.
- **`BusinessUnitGraphService.headOf()`**: add the missing `orgScope()` org filter (it
queries under SYSTEM_CTX, bypassing RLS, so the scope is the only isolation). Previously
`headOf(buId)` read a business unit's `manager_user_id` by id alone — a cross-organization
leak in multi-tenant. Now consistent with `descendants()`. +regression test.
5 changes: 4 additions & 1 deletion packages/platform-objects/src/identity/sys-invitation.object.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,7 +172,10 @@ export const SysInvitation = ObjectSchema.create({

organization_id: Field.lookup('sys_organization', {
label: 'Organization',
required: true,
// Optional: single-tenant has no sys_organization row and no auto-stamp
// (org-scoping is multi-tenant-only). Multi-tenant: OrgScopingPlugin stamps it
// and tenant-isolation RLS hides null-org rows (fail-closed). ADR-0057 addendum.
required: false,
}),

email: Field.email({
Expand Down
5 changes: 4 additions & 1 deletion packages/platform-objects/src/identity/sys-member.object.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,10 @@ export const SysMember = ObjectSchema.create({

organization_id: Field.lookup('sys_organization', {
label: 'Organization',
required: true,
// Optional: single-tenant has no sys_organization row and no auto-stamp
// (org-scoping is multi-tenant-only). Multi-tenant: OrgScopingPlugin stamps it
// and tenant-isolation RLS hides null-org rows (fail-closed). ADR-0057 addendum.
required: false,
}),

user_id: Field.lookup('sys_user', {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/plugin-sharing/src/business-unit-graph.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ export class BusinessUnitGraphService implements IBusinessUnitGraphService {
let row: any = null;
try {
const rows = await this.engine.find('sys_business_unit', {
where: { id: businessUnitId },
where: this.orgScope({ id: businessUnitId }),
fields: ['id', 'manager_user_id'],
limit: 1,
context: SYSTEM_CTX,
Expand Down
8 changes: 8 additions & 0 deletions packages/plugins/plugin-sharing/src/sharing-rule.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,14 @@ describe('BusinessUnitGraphService (recursive sys_business_unit)', () => {
expect(await d.headOf('emea_sales')).toEqual('alice');
expect(await d.headOf('emea_marketing')).toBeNull();
});

it('headOf is org-scoped — does not leak a manager across organizations', async () => {
// 'foreign' is in org2; an org1-scoped service must not read its head.
const foreign = engine._tables.sys_business_unit.find((r: any) => r.id === 'foreign');
foreign.manager_user_id = 'mallory';
const d = new BusinessUnitGraphService({ engine: engine as any, organizationId: 'org1' });
expect(await d.headOf('foreign')).toBeNull();
});
});

describe('SharingRuleService', () => {
Expand Down