Grants that outlive what they name, and a rule you can read
sharing.forget_principal has existed since shares did, documented as the thing that stops a recycled id inheriting somebody's grant, and was called by nobody. Deleting a group left every grant naming it; deleting an account left both the grants to it and the grants of its own work -- that second half is the one nothing else could catch, since their rows cascade and the shares of those rows have nothing to cascade from. Both now run before the delete, while the rows are still findable, and a deleted resource forgets its own. library.share defaulted to False, which meant sharing shipped documented as done and unreachable: the panel only renders for somebody holding it, so out of the box nobody could share anything and nothing said why. It is on. The panel itself was checkboxes inside the resource's *save form*, listing every group and every account on the instance, unpaginated, on every detail page -- and a tick only took effect if you also saved the resource. It is its own routes now: search, one grant per POST, the panel re-rendered from what is stored. Anything already shared stays listed whatever the search says, or removing a grant would mean searching for the name it was given to. Reports join the shareable set and memories still do not: a finished piece of work is the thing somebody most wants to hand over, and a record about a person is not content to pass round. reports.visible became sharing.visible_to, which is the one line its own docstring predicted. Two things fell out: `owned` beside `get`, because sharing grants reading and deleting is the owner's alone; and reading somebody else's report no longer clears their unread dot. Permissions gained the answer to "what can this person actually do?" -- explain() is resolve()'s working shown rather than thrown away, naming admin, the baseline, or the groups that granted each one. That is the simulation the union rule exists to make unnecessary, and until now the only way to get it was to open every group and read the grids by eye. Users and groups are list-plus-detail, and membership is edited from one side: it was on both, and a full-form POST from either overwrote what the other had shown. Read and write are split for notes, memory and skills -- checked on the tool's declared risk, after the gate so it can only narrow, and defaulting on. Quotas are the union rule applied to numbers, with the corner that makes it interesting: zero means "no limit" and wins outright, or a group saying unlimited would count for less than one saying a million. Absent means "no opinion". _narrower folds a group's ceiling with the instance's and is deliberately not min, for the same reason. Five axes, enforced where each is knowable -- before a reply is built, before a second one starts, on an agent reply's clock, before a minute of GPU, and beside the helper cap -- and usage is recorded even for a reply that was stopped or errored, because an endpoint charges either way. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
20bb569b00
commit
1b8c9f948c
@@ -1,6 +1,6 @@
|
||||
"""Who may see a document, a note or a skill.
|
||||
"""Who may see a knowledge base, a note, a skill or a report.
|
||||
|
||||
One rule, in one place, for all three: you can see a resource if you own it, if
|
||||
One rule, in one place, for all four: you can see a resource if you own it, if
|
||||
it was shared with you by name, or if it was shared with a group you are in.
|
||||
|
||||
Documents are deliberately absent from that list. They are shared through the
|
||||
@@ -25,7 +25,7 @@ from __future__ import annotations
|
||||
import logging
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import ColumnElement, delete, or_, select
|
||||
from sqlalchemy import ColumnElement, and_, delete, or_, select
|
||||
from sqlalchemy.orm import Session as DBSession
|
||||
|
||||
from lembas.db.models import (
|
||||
@@ -33,9 +33,11 @@ from lembas.db.models import (
|
||||
PRINCIPAL_USER,
|
||||
RESOURCE_BASE,
|
||||
RESOURCE_NOTE,
|
||||
RESOURCE_REPORT,
|
||||
RESOURCE_SKILL,
|
||||
KnowledgeBase,
|
||||
Note,
|
||||
Report,
|
||||
Share,
|
||||
Skill,
|
||||
User,
|
||||
@@ -49,6 +51,12 @@ RESOURCE_TYPES: dict[Any, str] = {
|
||||
KnowledgeBase: RESOURCE_BASE,
|
||||
Note: RESOURCE_NOTE,
|
||||
Skill: RESOURCE_SKILL,
|
||||
# A report joins the list and a memory still does not. A finished piece of
|
||||
# work is the thing somebody most wants to hand over -- "here is what the
|
||||
# Monday run found" -- and a report is read once and never answered, so
|
||||
# sharing it has none of the two-editors problem that keeps writing off the
|
||||
# table everywhere else here.
|
||||
Report: RESOURCE_REPORT,
|
||||
}
|
||||
|
||||
|
||||
@@ -88,6 +96,19 @@ def visible_to(model: Any, user: User | None) -> ColumnElement[bool]:
|
||||
return or_(model.owner_id == user.id, model.id.in_(shared))
|
||||
|
||||
|
||||
def only_shared(model: Any, user: User | None) -> ColumnElement[bool]:
|
||||
"""Rows this user may see and does **not** own.
|
||||
|
||||
The "Shared with me" filter. Worth having as its own listing rather than a
|
||||
badge in the mixed one: a badge answers "is this mine?" for a row already on
|
||||
screen, and the question somebody actually has is "what have people given
|
||||
me?", which a mixed list of two hundred cannot answer at all.
|
||||
"""
|
||||
if user is None:
|
||||
return model.id.is_(None)
|
||||
return and_(visible_to(model, user), model.owner_id != user.id)
|
||||
|
||||
|
||||
def owned_by(model: Any, user: User | None) -> ColumnElement[bool]:
|
||||
"""Rows this user may *change*.
|
||||
|
||||
@@ -197,12 +218,39 @@ def forget_principal(db: DBSession, principal_type: str, principal_id: str) -> i
|
||||
return result.rowcount or 0
|
||||
|
||||
|
||||
def forget_owner(db: DBSession, owner_id: str) -> int:
|
||||
"""Drop every share of everything a departing account owned.
|
||||
|
||||
Their rows cascade when the account goes; the shares of those rows do not,
|
||||
because `Share.resource_id` has no foreign key to point at. Left behind,
|
||||
they are grants naming resources that no longer exist -- harmless today,
|
||||
and a grant to whoever next receives one of those ids if a future store
|
||||
ever reuses them.
|
||||
|
||||
Called *before* the delete, while the rows are still there to be found.
|
||||
`forget_principal` is the other half and covers shares pointing *at* them.
|
||||
"""
|
||||
removed = 0
|
||||
for model in RESOURCE_TYPES:
|
||||
owned = select(model.id).where(model.owner_id == owner_id)
|
||||
result = db.execute(
|
||||
delete(Share).where(
|
||||
Share.resource_type == RESOURCE_TYPES[model],
|
||||
Share.resource_id.in_(owned),
|
||||
)
|
||||
)
|
||||
removed += result.rowcount or 0
|
||||
return removed
|
||||
|
||||
|
||||
__all__ = [
|
||||
"can_read",
|
||||
"can_write",
|
||||
"forget_owner",
|
||||
"forget_principal",
|
||||
"forget_resource",
|
||||
"grants_for",
|
||||
"only_shared",
|
||||
"owned_by",
|
||||
"resource_type",
|
||||
"set_grants",
|
||||
|
||||
Reference in New Issue
Block a user