mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 20:37:03 +01:00
Some checks are pending
CI / check (push) Waiting to run
Send a photo captioned "!add_photo alfa wakacje" in one of the album's own groups and it lands in the pack tagged with both, retrievable through !alfa and the new !losowe immediately -- no restart, and no tagger session on the PC. A label matching nobody becomes a custom tag, and !losowe is the only door to one, which is what keeps a live swap a *data* swap: it can never register a trigger or widen a command's groups. No typed label travels. Labels become pseudonym keys in a new registry arg_resolver, at the dispatcher, before the line that logs the command name -- so no handler, journal entry, command_uses row or reply body ever holds a word somebody typed. The reply is counts and pseudonyms: "dodano · p1: 4 · t1: 1". Stripping is exiftool with a *positive* check on the output, never an exit code. ffmpeg was tried first and fails silently on photos: given a JPEG with a real APP1 Exif segment it returned a byte-identical file, GPS intact, exit 0. The surviving-tag allowlist is per tag *name* rather than per group, because measurement showed a group-level "must be empty" rule rejects every format except JPEG -- a valid PNG always reports its IHDR, an MP4 some fifty QuickTime tags that are the container itself. Codec configuration (CompressorName, VendorID, the HEVC parameter set) is on the list by decision: CompressorName lives in the avc1 sample description and exiftool cannot write it at all, so the alternative was refusing every video and every iPhone HEIC. Location and identity tags are still refused, and the e2e run re-reads the stored files to prove a QuickTime geotag did not survive. .webm and .svg stay on the format allowlist and are stored *unstripped*: exiftool 13.55 can write neither, and its SVG reader does not even surface <metadata>. That is a deliberate, documented hole, not an oversight. Two things this had to defuse along the way: - personal_data_sources now reads custom.json, so "!add_photo kot <photo>" would have outlawed the word "kot" and refused every future commit, fixable only by hand-editing an album the committer cannot see. Minting now refuses a word that is already a command, and the gate subtracts the repo's own alias vocabulary from custom labels only -- curated people.json names are never excused. - signal_bot/external.py is now the single subprocess site in the repository, so ruff's S603 needs exactly one scoped per-file-ignore instead of one per module that shells out. A test asserts nothing else imports subprocess. A failed add changes nothing: media and the three manifests are written, the album is reloaded, and only a load that succeeds is published; a load that fails rolls all four back and keeps serving the pack that was already working, without raising -- Restart=always would turn a ConfigError into a loop. 977 tests, 100% branch coverage, no omits and no suppressions. scripts/e2e.sh gains 8 scenarios driven against the real exiftool on media generated at run time, and asserts the invariants a reply cannot: that a refused upload is not stored, that a message with no attachment leaves custom.json byte-identical, and that signal-cli's own copy of every ingested attachment is gone. Closes TODO-add-photo.md. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JqqE22jp94B1ypwxppdr1o
122 lines
3.7 KiB
Python
122 lines
3.7 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Shared scaffolding for the two !add_photo test modules.
|
|
|
|
A module rather than a conftest fixture, for the reason tests/pack_fixture.py
|
|
gives: several tests want packs and wirings of different shapes, and saying
|
|
which one a test needs reads better in the test itself.
|
|
|
|
The stripper is injected everywhere here, so no unit test shells out;
|
|
scripts/e2e.sh runs the real exiftool against media it generates.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass, replace
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
|
|
from signal_bot.models import parse_envelope
|
|
from signal_bot.pack_add import AddResolver, register_add_command
|
|
from signal_bot.pack_holder import PackHolder
|
|
from signal_bot.pack_load import load
|
|
from signal_bot.registry import CommandContext, CommandRegistry
|
|
from signal_bot.transport_fake import FakeTransport
|
|
from tests import pack_fixture
|
|
from tests.conftest import WATCHED_GROUP, envelope
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
from signal_bot.config import Config
|
|
from signal_bot.media_sniff import MediaKind
|
|
from signal_bot.store import Store
|
|
|
|
TRIGGERS = ("!dodaj", "!add_photo")
|
|
|
|
# Real magic bytes, because the sniffer reads them. Distinct payloads so the
|
|
# content hashes differ.
|
|
JPEG_ONE = b"\xff\xd8\xff\xe0one"
|
|
JPEG_TWO = b"\xff\xd8\xff\xe0two"
|
|
NOT_MEDIA = b"just a text file"
|
|
|
|
|
|
class FakeStripper:
|
|
"""Returns the payload unchanged, or refuses everything."""
|
|
|
|
def __init__(self, *, accepts: bool = True) -> None:
|
|
self.accepts = accepts
|
|
self.seen: list[str] = []
|
|
|
|
def strip(self, payload: bytes, kind: MediaKind) -> bytes | None:
|
|
self.seen.append(kind.suffix)
|
|
return payload if self.accepts else None
|
|
|
|
|
|
class UndeletableTransport(FakeTransport):
|
|
"""A container that hands the bytes over but refuses to forget them."""
|
|
|
|
async def delete_attachment(self, attachment_id: str) -> None:
|
|
msg = f"the container will not delete {attachment_id}"
|
|
raise RuntimeError(msg)
|
|
|
|
|
|
@pytest.fixture
|
|
def holder(tmp_path: Path) -> PackHolder:
|
|
return PackHolder(load(pack_fixture.build(tmp_path / "pack")))
|
|
|
|
|
|
def _registry(holder: PackHolder, stripper: FakeStripper) -> tuple[CommandRegistry, AddResolver]:
|
|
registry = CommandRegistry()
|
|
resolver = register_add_command(registry, holder, stripper, TRIGGERS)
|
|
return registry, resolver
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class Wiring:
|
|
"""The objects a command needs around it, bundled to keep _run readable."""
|
|
|
|
holder: PackHolder
|
|
transport: FakeTransport
|
|
store: Store
|
|
config: Config
|
|
|
|
|
|
async def _run(
|
|
wiring: Wiring,
|
|
text: str,
|
|
*,
|
|
stripper: FakeStripper | None = None,
|
|
attachments: tuple[str, ...] = (),
|
|
group: str = WATCHED_GROUP,
|
|
) -> None:
|
|
holder, transport, store, config = (
|
|
wiring.holder,
|
|
wiring.transport,
|
|
wiring.store,
|
|
wiring.config,
|
|
)
|
|
registry, _ = _registry(holder, stripper or FakeStripper())
|
|
resolved = registry.resolve_with_args(text, group)
|
|
if resolved is None:
|
|
return
|
|
raw = envelope(text=text, attachments=("image/jpeg",) * len(attachments))
|
|
message = parse_envelope(raw)
|
|
assert message is not None
|
|
# The envelope builder numbers its ids from 0; point them at the
|
|
# payloads this test put in the fake's store.
|
|
message = replace(message, attachment_ids=attachments)
|
|
await resolved.command.handler(
|
|
CommandContext(
|
|
message=message,
|
|
group_id=group,
|
|
transport=transport,
|
|
store=store,
|
|
config=config,
|
|
command_name=resolved.command.name,
|
|
now=1756600000.0,
|
|
day="2026-08-31",
|
|
args=resolved.args,
|
|
)
|
|
)
|