fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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
os-steve merged 2 commits into from
Aug 31, 2026
+850 −57
Merged

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide #13818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51e4bc
fix(plugin-security): resolve the org-admin permission set per organi…
os-steve Aug 31, 2026
c2f1944
docs(permissions): the isSystem declaration census counts 22, not 21
os-steve Aug 31, 2026
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
52 changes: 52 additions & 0 deletions .changeset/scope-org-admin-permission-set-resolver.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.
20 changes: 19 additions & 1 deletion content/docs/permissions/system-context.mdx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide#13818

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

os-steve
merged 2 commits into

from

Aug 31, 2026

+850

−57

 Merged


fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide
#13818
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f51e4bc

fix(plugin-security): resolve the org-admin permission set per organi…


os-steve Aug 31, 2026
c2f1944

docs(permissions): the isSystem declaration census counts 22, not 21


os-steve Aug 31, 2026

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


52 changes: 52 additions & 0 deletions
.changeset/scope-org-admin-permission-set-resolver.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
---
"@objectstack/plugin-security": patch
---

fix(plugin-security): resolve the org-admin permission set per organization, and keep the revoke reach wide (#11670)

`auto-org-admin-grant.ts` resolved the `sys_permission_set` row that every
auto-provisioned org-admin grant points at by NAME alone: no `organization_id`
predicate, `limit: 1`, and cached per ObjectQL instance on the name alone. Each
property reads as deliberate; together they answer with a row nobody chose.

Post-#10103 the RBAC catalog is materialized per organization and
`sys_permission_set.name` is unique per organization (ADR-0120 D3), so one name
carries a row per organization PLUS the organization-less platform-bucket row
`bootstrapPlatformAdmin` mints on every boot — and that bucket row is the
OLDEST bearing the name (measured on a fresh walled rig at 1.3 s ahead of the
first `sys_organization`, #11532). An unscoped `limit: 1` read has no reason to
prefer any other, and a per-instance cache keyed on the name made the first
organization reconciled in a process pick the row every later organization got.
The grant target is a foreign key, so on a walled deployment
`sys_user_permission_set` rows granting `organization_admin` could point at a
row belonging to no organization.

**Walled postures only.** The read is now threaded with the granting
organization — through `SqlDriver.applyTenantScope`, resolved by
`resolveOwnOrganizationRow`, the catalog's own spelling of "which row is this
organization's" — and the cache is keyed on `(organization, name)`. `single`
keeps the unscoped answer and the unscoped `limit: 1` grant-target read
unchanged; no read on a `single` path carries a `tenantId`.

**When the organization has no own row**, the resolver returns `null` (the
module's existing `skipped` / `permission_set_missing` no-op) and warns loudly,
rather than falling back to the organization-less row: a fallback would keep
minting grants at the platform bucket, and the second one would never be
repaired — once the organization's own row appeared the reconciler would insert
a duplicate beside it.

**The revoke reach widened in the same change, deliberately.** Narrowing the
grant target without it would be a permission loosening: a demoted admin whose
grant predates this fix names the organization-less row, and the ADR-0105 D4 F2
close-out (a deployment that drops its wall must not leave the unbounded
`organization_admin` grant standing) converges across copies written under the
other posture. Revocation therefore matches EVERY copy of the set name, in every
posture — the per-pair superseded and demotion legs and the backfill's orphan
sweep alike. The grant target is posture-scoped; the revoke reach never is.

⛔ No repair of existing rows is claimed or performed. This makes new
resolutions correct; grants already pointing at the organization-less row are
left exactly as they are, including the duplicate that appears beside one when
its holder still qualifies. Accept/reject is unchanged today — `resolve-authz-context`
resolves permission sets by id without tenant scoping, which is why the defect
was invisible — and no published surface changes.

20 changes: 19 additions & 1 deletion
content/docs/permissions/system-context.mdx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,7 @@ still holds equal to the census on every pull request:
| — in tests | 1013 | — |
| — in non-test sources | 798 | — |
| Appearances of the bare identifier `isSystem` in non-test sources | 813 | — |
| — parsed as a declaration | 21 | ✅ |
| — parsed as a declaration | 22 | ✅ |
| — parsed as an object-literal / type key (producers and option objects) | 310 | — |
| — parsed as a property **read** | 115 | ✅ |
| — parsed in some other syntactic position (a local, a cast, a conditional) | 9 | ✅ |
Expand DownExpand Up@@ -336,6 +336,24 @@ test files certifies nothing. ⛔ Do not re-add them to `DECLARED_COUNTS` — a
self-test case in the gate refuses that by name. Re-measure them with
`node scripts/isystem-census.mjs` when you want them current, and move the date.

**What the enforced declarations row counts.** Not the four field declarations
above — those are four *distinct fields* that happen to share a name, and only
the first is elevation. This row counts every position where the parser puts the
identifier in a **declaring** slot: those four, plus the structural type literals
that restate `ExecutionContext.isSystem`'s shape inline rather than importing it
(`{ isSystem: true; tenantId?: string }`, `context?: { isSystem?: boolean }`, and
the `get isSystem()` accessor on the engine's context wrapper). A restatement is
a producer's declaration of the shape it will build, never a read, so a new one
moves this count and moves nothing else on this page — the census's read
population, the anchored rows above, and the packages and files totals all stay
where they are. The most recent arrival is the scoped
seed context threaded into the org-admin permission-set lookup in
`plugins/plugin-security/src/auto-org-admin-grant.ts`, so that read resolves
against the granting organization's own catalog row rather than an
organization-less one (#11670). ⛔ Cited without a line number deliberately: an
anchor here would be refused, and rightly — this page anchors elevation
**reads**, and a declaration is not one.

Counting by hand is what made the previous edition wrong in two independent
ways, so both are worth naming. Its headline said "80 distinct sites across 18
packages" while its own tables anchored **77** — the number never matched the
Expand Down
Loading
Loading