a6179037c2
Two changes. 1. Privacy fix (NN#2/NN#3) — the citation and source list endpoints gated only on can_view_tree, so a non-member on a public/unlisted/site_members tree could enumerate citations and sources tied to a redacted living person, leaking that the person exists and has sourced facts (and possibly their name via a source title). #46 closed this for events/media/names/relationships but not citations/sources. Now citation_service.list_citations and source_service.{list_sources,get_source} delegate non-member reads to public_view_service, mirroring the #46 pattern: - citations: shown only when the cited fact resolves to FULL-visibility person(s) — covers the person_id, name_id, event_id (person or both-partner), and relationship_id (both-partner) target paths. - sources: shown only when they back at least one visible citation; a withheld source 404s (don't reveal it exists). Tests cover all four citation target types + source withholding + member-sees-all. 2. On-demand tree purge — owners can permanently delete a soft-deleted tree now instead of waiting out the 30-day auto-purge window. POST /trees/{id}/purge (owner-only): the tree must already be in the trash, and the caller retypes its name to confirm. Media objects are deleted from storage, then a single DELETE on trees cascades all tree-owned rows via the tree_id ON DELETE CASCADE; the audit entry survives (tree_id SET NULL). Frontend adds a "Delete forever" button to the Recently-deleted list. No migration. Suite: 102 passing. Signed-off-by: Justin Paul <justin@jpaul.me>
183 lines
5.9 KiB
Python
183 lines
5.9 KiB
Python
"""Citation service. A citation links one Source to exactly one fact (person,
|
|
event, name, or relationship) within a tree — the provenance spine."""
|
|
|
|
import uuid
|
|
from datetime import UTC, datetime
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models.enums import CitationConfidence
|
|
from app.models.event import Event
|
|
from app.models.person import Name, Person
|
|
from app.models.relationship import Relationship
|
|
from app.models.source import Citation, Source
|
|
from app.models.tree import Tree
|
|
from app.models.user import User
|
|
from app.services import privacy
|
|
from app.services.audit import record_audit
|
|
from app.services.exceptions import Conflict, Forbidden, NotFound
|
|
|
|
# Citation target column -> model, for tenant/existence validation.
|
|
_TARGET_MODELS = {
|
|
"person_id": Person,
|
|
"event_id": Event,
|
|
"name_id": Name,
|
|
"relationship_id": Relationship,
|
|
}
|
|
|
|
|
|
async def _in_tree(session: AsyncSession, model: type, id_: uuid.UUID, tree_id: uuid.UUID) -> bool:
|
|
row = (
|
|
await session.execute(
|
|
select(model.id).where(
|
|
model.id == id_, model.tree_id == tree_id, model.deleted_at.is_(None)
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
return row is not None
|
|
|
|
|
|
async def create_citation(
|
|
session: AsyncSession,
|
|
*,
|
|
actor: User,
|
|
tree: Tree,
|
|
source_id: uuid.UUID,
|
|
person_id: uuid.UUID | None = None,
|
|
event_id: uuid.UUID | None = None,
|
|
name_id: uuid.UUID | None = None,
|
|
relationship_id: uuid.UUID | None = None,
|
|
page: str | None = None,
|
|
detail: str | None = None,
|
|
confidence: CitationConfidence | None = None,
|
|
) -> Citation:
|
|
if not await privacy.can_edit_tree(session, user_id=actor.id, tree=tree):
|
|
raise Forbidden("not an editor of this tree")
|
|
|
|
targets = {
|
|
"person_id": person_id,
|
|
"event_id": event_id,
|
|
"name_id": name_id,
|
|
"relationship_id": relationship_id,
|
|
}
|
|
set_targets = {k: v for k, v in targets.items() if v is not None}
|
|
if len(set_targets) != 1:
|
|
raise Conflict("a citation must reference exactly one fact")
|
|
|
|
if not await _in_tree(session, Source, source_id, tree.id):
|
|
raise NotFound("source not found in this tree")
|
|
(target_col, target_id), = set_targets.items()
|
|
if not await _in_tree(session, _TARGET_MODELS[target_col], target_id, tree.id):
|
|
raise NotFound("cited fact not found in this tree")
|
|
|
|
citation = Citation(
|
|
tree_id=tree.id,
|
|
source_id=source_id,
|
|
person_id=person_id,
|
|
event_id=event_id,
|
|
name_id=name_id,
|
|
relationship_id=relationship_id,
|
|
page=page,
|
|
detail=detail,
|
|
confidence=confidence,
|
|
)
|
|
session.add(citation)
|
|
await session.flush()
|
|
record_audit(
|
|
session,
|
|
action="create",
|
|
entity_type="Citation",
|
|
entity_id=citation.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
after={"source_id": str(source_id), target_col: str(target_id)},
|
|
)
|
|
await session.commit()
|
|
await session.refresh(citation)
|
|
return citation
|
|
|
|
|
|
async def list_citations(
|
|
session: AsyncSession, *, viewer_id: uuid.UUID, tree: Tree
|
|
) -> list[Citation]:
|
|
"""All citations in the tree — the UI maps them to facts to show 'sourced'
|
|
indicators in a single round-trip."""
|
|
if not await privacy.can_view_tree(session, user_id=viewer_id, tree=tree):
|
|
raise Forbidden("not permitted to view this tree")
|
|
# Non-members get only citations whose cited fact resolves to a full-
|
|
# visibility person — a citation on a redacted living person's fact would
|
|
# otherwise leak that the person has that sourced fact.
|
|
if await privacy.get_membership_role(session, viewer_id, tree.id) is None:
|
|
from app.services import public_view_service
|
|
|
|
return await public_view_service.list_public_citations(
|
|
session, viewer_id=viewer_id, tree=tree
|
|
)
|
|
stmt = (
|
|
select(Citation)
|
|
.where(Citation.tree_id == tree.id, Citation.deleted_at.is_(None))
|
|
.order_by(Citation.created_at)
|
|
)
|
|
return list((await session.execute(stmt)).scalars().all())
|
|
|
|
|
|
async def update_citation(
|
|
session: AsyncSession, *, actor: User, tree: Tree, citation_id: uuid.UUID, changes: dict
|
|
) -> Citation:
|
|
if not await privacy.can_edit_tree(session, user_id=actor.id, tree=tree):
|
|
raise Forbidden("not an editor of this tree")
|
|
citation = (
|
|
await session.execute(
|
|
select(Citation).where(
|
|
Citation.id == citation_id,
|
|
Citation.tree_id == tree.id,
|
|
Citation.deleted_at.is_(None),
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if citation is None:
|
|
raise NotFound("citation not found")
|
|
for key in {"page", "detail", "confidence"} & changes.keys():
|
|
setattr(citation, key, changes[key])
|
|
record_audit(
|
|
session,
|
|
action="update",
|
|
entity_type="Citation",
|
|
entity_id=citation.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
after=changes,
|
|
)
|
|
await session.commit()
|
|
await session.refresh(citation)
|
|
return citation
|
|
|
|
|
|
async def delete_citation(
|
|
session: AsyncSession, *, actor: User, tree: Tree, citation_id: uuid.UUID
|
|
) -> None:
|
|
if not await privacy.can_edit_tree(session, user_id=actor.id, tree=tree):
|
|
raise Forbidden("not an editor of this tree")
|
|
citation = (
|
|
await session.execute(
|
|
select(Citation).where(
|
|
Citation.id == citation_id,
|
|
Citation.tree_id == tree.id,
|
|
Citation.deleted_at.is_(None),
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if citation is None:
|
|
raise NotFound("citation not found")
|
|
citation.deleted_at = datetime.now(UTC)
|
|
record_audit(
|
|
session,
|
|
action="delete",
|
|
entity_type="Citation",
|
|
entity_id=citation.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
)
|
|
await session.commit()
|