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>
163 lines
5.1 KiB
Python
163 lines
5.1 KiB
Python
"""Source service. Sources are reusable, tree-scoped records of an origin.
|
|
Writes require editor rights; reads go through the privacy engine."""
|
|
|
|
import uuid
|
|
from datetime import UTC, datetime
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models.source import 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 Forbidden, NotFound
|
|
|
|
|
|
async def create_source(
|
|
session: AsyncSession,
|
|
*,
|
|
actor: User,
|
|
tree: Tree,
|
|
title: str,
|
|
author: str | None = None,
|
|
source_type: str | None = None,
|
|
repository: str | None = None,
|
|
url: str | None = None,
|
|
citation_text: str | None = None,
|
|
publication_info: str | None = None,
|
|
quality_note: str | None = None,
|
|
) -> Source:
|
|
if not await privacy.can_edit_tree(session, user_id=actor.id, tree=tree):
|
|
raise Forbidden("not an editor of this tree")
|
|
source = Source(
|
|
tree_id=tree.id,
|
|
title=title,
|
|
author=author,
|
|
source_type=source_type,
|
|
repository=repository,
|
|
url=url,
|
|
citation_text=citation_text,
|
|
publication_info=publication_info,
|
|
quality_note=quality_note,
|
|
)
|
|
session.add(source)
|
|
await session.flush()
|
|
record_audit(
|
|
session,
|
|
action="create",
|
|
entity_type="Source",
|
|
entity_id=source.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
after={"title": title},
|
|
)
|
|
await session.commit()
|
|
await session.refresh(source)
|
|
return source
|
|
|
|
|
|
async def list_sources(session: AsyncSession, *, viewer_id: uuid.UUID, tree: Tree) -> list[Source]:
|
|
if not await privacy.can_view_tree(session, user_id=viewer_id, tree=tree):
|
|
raise Forbidden("not permitted to view this tree")
|
|
# Non-members see only sources backing a visible citation (see citation
|
|
# redaction) — a source used solely for a redacted person could name them.
|
|
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_sources(
|
|
session, viewer_id=viewer_id, tree=tree
|
|
)
|
|
stmt = (
|
|
select(Source)
|
|
.where(Source.tree_id == tree.id, Source.deleted_at.is_(None))
|
|
.order_by(Source.title)
|
|
)
|
|
return list((await session.execute(stmt)).scalars().all())
|
|
|
|
|
|
async def get_source(
|
|
session: AsyncSession, *, viewer_id: uuid.UUID, tree: Tree, source_id: uuid.UUID
|
|
) -> Source:
|
|
if not await privacy.can_view_tree(session, user_id=viewer_id, tree=tree):
|
|
raise Forbidden("not permitted to view this tree")
|
|
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.get_public_source(
|
|
session, viewer_id=viewer_id, tree=tree, source_id=source_id
|
|
)
|
|
source = (
|
|
await session.execute(
|
|
select(Source).where(
|
|
Source.id == source_id, Source.tree_id == tree.id, Source.deleted_at.is_(None)
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if source is None:
|
|
raise NotFound("source not found")
|
|
return source
|
|
|
|
|
|
_SOURCE_FIELDS = {
|
|
"title", "author", "source_type", "repository", "url", "citation_text",
|
|
"publication_info", "quality_note",
|
|
}
|
|
|
|
|
|
async def update_source(
|
|
session: AsyncSession, *, actor: User, tree: Tree, source_id: uuid.UUID, changes: dict
|
|
) -> Source:
|
|
if not await privacy.can_edit_tree(session, user_id=actor.id, tree=tree):
|
|
raise Forbidden("not an editor of this tree")
|
|
source = (
|
|
await session.execute(
|
|
select(Source).where(
|
|
Source.id == source_id, Source.tree_id == tree.id, Source.deleted_at.is_(None)
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if source is None:
|
|
raise NotFound("source not found")
|
|
for key in _SOURCE_FIELDS & changes.keys():
|
|
setattr(source, key, changes[key])
|
|
record_audit(
|
|
session,
|
|
action="update",
|
|
entity_type="Source",
|
|
entity_id=source.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
after=changes,
|
|
)
|
|
await session.commit()
|
|
await session.refresh(source)
|
|
return source
|
|
|
|
|
|
async def delete_source(
|
|
session: AsyncSession, *, actor: User, tree: Tree, source_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")
|
|
source = (
|
|
await session.execute(
|
|
select(Source).where(
|
|
Source.id == source_id, Source.tree_id == tree.id, Source.deleted_at.is_(None)
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if source is None:
|
|
raise NotFound("source not found")
|
|
source.deleted_at = datetime.now(UTC)
|
|
record_audit(
|
|
session,
|
|
action="delete",
|
|
entity_type="Source",
|
|
entity_id=source.id,
|
|
tree_id=tree.id,
|
|
actor_user_id=actor.id,
|
|
)
|
|
await session.commit()
|