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
102 lines
4.1 KiB
Python
102 lines
4.1 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Writing into the album, and putting it back the way it was."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
|
|
from signal_bot.pack import TAGS_FILE
|
|
from signal_bot.pack_custom import CUSTOM_FILE
|
|
from signal_bot.pack_store import (
|
|
ADDS_FILE,
|
|
content_name,
|
|
record_adds,
|
|
restore,
|
|
snapshot,
|
|
write_media,
|
|
write_tags,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
def test_the_name_comes_from_the_bytes_not_the_upload(tmp_path: Path) -> None:
|
|
"""Which is what makes "already in the album?" a lookup, not a comparison."""
|
|
assert content_name(b"same", ".jpg") == content_name(b"same", ".jpg")
|
|
assert content_name(b"same", ".jpg") != content_name(b"other", ".jpg")
|
|
assert content_name(b"same", ".jpg").endswith(".jpg")
|
|
|
|
|
|
def test_a_written_file_lands_in_media_and_is_not_world_readable(tmp_path: Path) -> None:
|
|
write_media(tmp_path, "abc.jpg", b"payload")
|
|
stored = tmp_path / "media" / "abc.jpg"
|
|
assert stored.read_bytes() == b"payload"
|
|
assert stored.stat().st_mode & 0o077 == 0
|
|
|
|
|
|
def test_no_temporary_file_is_left_behind(tmp_path: Path) -> None:
|
|
"""A .tmp beside media/ would fail the next load as an untagged file."""
|
|
write_media(tmp_path, "abc.jpg", b"payload")
|
|
assert [p.name for p in (tmp_path / "media").iterdir()] == ["abc.jpg"]
|
|
|
|
|
|
def test_tags_are_written_sorted_and_reloadable(tmp_path: Path) -> None:
|
|
write_tags(tmp_path, {"b.jpg": frozenset({"p2", "p1"}), "a.jpg": frozenset({"p1"})})
|
|
document = json.loads((tmp_path / TAGS_FILE).read_text(encoding="utf-8"))
|
|
assert document == {"a.jpg": ["p1"], "b.jpg": ["p1", "p2"]}
|
|
assert list(document) == ["a.jpg", "b.jpg"]
|
|
|
|
|
|
def test_adds_accumulate_rather_than_replace(tmp_path: Path) -> None:
|
|
record_adds(tmp_path, {"a.jpg": {"by": "uuid-1", "at": 10}})
|
|
record_adds(tmp_path, {"b.jpg": {"by": "uuid-2", "at": 20}})
|
|
document = json.loads((tmp_path / ADDS_FILE).read_text(encoding="utf-8"))
|
|
assert set(document) == {"a.jpg", "b.jpg"}
|
|
assert document["a.jpg"]["by"] == "uuid-1"
|
|
|
|
|
|
def test_a_corrupt_adds_file_does_not_block_an_upload(tmp_path: Path) -> None:
|
|
"""It is write-only bookkeeping; refusing a photo over it is backwards."""
|
|
(tmp_path / ADDS_FILE).write_text("{ not json", encoding="utf-8")
|
|
record_adds(tmp_path, {"a.jpg": {"by": "uuid-1", "at": 10}})
|
|
assert json.loads((tmp_path / ADDS_FILE).read_text(encoding="utf-8")) == {
|
|
"a.jpg": {"by": "uuid-1", "at": 10}
|
|
}
|
|
|
|
|
|
def test_an_adds_file_that_is_not_an_object_is_replaced(tmp_path: Path) -> None:
|
|
(tmp_path / ADDS_FILE).write_text("[1, 2]", encoding="utf-8")
|
|
record_adds(tmp_path, {"a.jpg": {"by": "uuid-1", "at": 10}})
|
|
assert set(json.loads((tmp_path / ADDS_FILE).read_text(encoding="utf-8"))) == {"a.jpg"}
|
|
|
|
|
|
def test_restore_puts_the_manifests_back_and_removes_the_new_files(tmp_path: Path) -> None:
|
|
(tmp_path / TAGS_FILE).write_text('{"old.jpg": ["p1"]}', encoding="utf-8")
|
|
(tmp_path / CUSTOM_FILE).write_text('{"t1": ["was-here"]}', encoding="utf-8")
|
|
before = snapshot(tmp_path)
|
|
|
|
write_media(tmp_path, "new.jpg", b"payload")
|
|
write_tags(tmp_path, {"old.jpg": frozenset({"p1"}), "new.jpg": frozenset({"p2"})})
|
|
record_adds(tmp_path, {"new.jpg": {"by": "uuid-1", "at": 1}})
|
|
|
|
restore(tmp_path, before, ("new.jpg",))
|
|
|
|
assert json.loads((tmp_path / TAGS_FILE).read_text(encoding="utf-8")) == {"old.jpg": ["p1"]}
|
|
assert json.loads((tmp_path / CUSTOM_FILE).read_text(encoding="utf-8")) == {"t1": ["was-here"]}
|
|
# adds.json did not exist before, so restoring means removing it.
|
|
assert not (tmp_path / ADDS_FILE).exists()
|
|
assert not (tmp_path / "media" / "new.jpg").exists()
|
|
|
|
|
|
def test_restoring_a_file_that_was_already_gone_is_not_an_error(tmp_path: Path) -> None:
|
|
before = snapshot(tmp_path)
|
|
restore(tmp_path, before, ("never-written.jpg",))
|
|
assert not (tmp_path / TAGS_FILE).exists()
|
|
|
|
|
|
def test_a_snapshot_of_an_empty_album_records_three_absences(tmp_path: Path) -> None:
|
|
before = snapshot(tmp_path)
|
|
assert (before.tags, before.custom, before.adds) == (None, None, None)
|