correctness: paginate Cloudron user fetches; atomic held-credit grant (audit M5+M6)

M6: a single-page ?per_page=100 fetch silently truncates past 100 users —
the box is at 99. New shared walkers (async + sync) page through
/api/v1/users like the Matrix paths, capped at 50 pages. All six single-
page call sites now walk: duplicate-email check (provisioning 409s),
reinvite loop, Loomio activation filter, admin overview, member-email
resolution, local MXID resolution. Failure behavior per site is preserved
(page-1 failure fails loudly; later-page failure keeps what was read).

M5: provisioning-time held-credit grant moved into grant_held_credits():
per hold, the status flip, balance move and ledger row commit in ONE
transaction (the old code committed the flip before add_credits, so an
exception between them left hold=granted and the member uncredited).
Mirrors admin_held_grant, keyed on held:<hold_id> so re-runs are no-ops;
mixed-case emails normalized. Tests in tests/test_portal_hardening.py.
This commit is contained in:
inference-bot committed 2026-11-05 16:06:52 +00:00
1 parent 0f32c3a868
commit b9561a49d2
2 files changed
+352 -63

No files matched your search

+209
View File
@@ -0,0 +1,209 @@
#!/usr/bin/env python3
"""Regression tests for M5 (atomic held-credit grant) + M6 (Cloudron user
pagination) — audit 2026-11-05.
Runnable:
* from the repo root: python3 tests/test_portal_hardening.py
* inside the portal app: PORTAL_CODE_DIR=/app/code python3 /tmp/test_portal_hardening.py
Covered:
M5 — grant_held_credits
- matched holds (by email AND by slug) flip + credit in one transaction
- a re-run moves no money (held:<id> reference exists-check)
- a hold whose ledger row already exists is reconciled, never re-credited
M6 — cloudron_fetch_all_users (async) / _sync
- pages past the first: >100 users returned in full (the old code silently
truncated at 100)
- page-1 failure -> None / raise (callers keep failing loudly)
- later-page failure -> keep what was read
- the hard page cap holds even if the API never runs short
"""
import asyncio
import os
import sqlite3
import sys
import tempfile
_TEST_DB = os.path.join(tempfile.mkdtemp(prefix="hardening-test-"), "members.db")
os.environ["DB_PATH"] = _TEST_DB # must exist BEFORE app.main is imported
for _cand in (os.environ.get("PORTAL_CODE_DIR"), "/app/code",
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))):
if _cand and os.path.isfile(os.path.join(_cand, "app", "main.py")):
sys.path.insert(0, _cand)
break
from app.main import ( # noqa: E402
cloudron_fetch_all_users, cloudron_fetch_all_users_sync, get_credit_balance,
get_db, grant_held_credits,
)
failures = 0
def check(name, got, want):
global failures
ok = got == want
if not ok:
failures += 1
print(f"[{'PASS' if ok else 'FAIL'}] {name}")
if not ok:
print(f" got {got!r}\n want {want!r}")
# ---------------------------------------------------------------- M5 ---------
conn = get_db()
conn.execute("INSERT INTO members (email, key_token, slug, active) "
"VALUES ('newmember@example.com', '', 'newmember', 1)")
conn.execute("INSERT INTO held_credits (slug, email, name, amount, oc_reference, status) "
"VALUES ('newmember', 'someone-else@example.com', 'W', 10.0, 'oc:newmember:or_1', 'held')")
conn.execute("INSERT INTO held_credits (slug, email, name, amount, oc_reference, status) "
"VALUES ('newmember', NULL, 'X', 5.0, 'oc:other:or_2', 'held')")
conn.commit()
# Mixed-case email on purpose: the grant must normalize it (the balance
# UPDATE/SELECT join on the member row and silently miss otherwise).
granted = grant_held_credits(conn, "NewMember@Example.com", "newmember")
check("matched holds sum (including the non-member slug hold)", granted, 15.0)
check("balance credited", get_credit_balance("newmember@example.com"), 15.0)
statuses = dict(conn.execute("SELECT id, status FROM held_credits").fetchall())
check("both holds flipped in the same pass", set(statuses.values()), {"granted"})
refs = [r[0] for r in conn.execute("SELECT reference FROM credit_ledger ORDER BY id").fetchall()]
check("one ledger row per hold, held:<id> shape", refs, ["held:1", "held:2"])
granted2 = grant_held_credits(conn, "newmember@example.com", "newmember")
check("re-run grants nothing (reference exists-check)", granted2, 0.0)
refs = [r[0] for r in conn.execute("SELECT reference FROM credit_ledger ORDER BY id").fetchall()]
check("re-run wrote no extra ledger rows", refs, ["held:1", "held:2"])
check("re-run left the balance alone", get_credit_balance("newmember@example.com"), 15.0)
# Crash-recovery shape: a hold flipped but its ledger row lost… inverse — a
# ledger row that exists while the hold reads 'held' (a crash between the two
# commits of the OLD code) must reconcile the status and move no money.
conn.execute("UPDATE held_credits SET status='held', resolved_at=NULL WHERE id = 2")
conn.commit()
granted3 = grant_held_credits(conn, "newmember@example.com", "newmember")
check("already-credited hold reconciles without re-crediting", granted3, 0.0)
check("its status is reconciled to granted",
dict(conn.execute("SELECT id, status FROM held_credits").fetchall()), {1: "granted", 2: "granted"})
check("balance still 15 after the reconciliation pass",
get_credit_balance("newmember@example.com"), 15.0)
_conn2 = get_db() # separate handle to prove committed state, not in-transaction state
n = _conn2.execute("SELECT COUNT(*) FROM credit_ledger").fetchone()[0]
check("committed state equals in-call state", n, 2)
_conn2.close()
conn.close()
# ---------------------------------------------------------------- M6 ---------
class FakeResponse:
def __init__(self, status_code, payload):
self.status_code = status_code
self._payload = payload
def json(self):
return self._payload
class FakeAsyncClient:
def __init__(self, pages):
self.pages = list(pages) # one entry per expected page
self.calls = []
async def get(self, url, params=None, headers=None):
self.calls.append(dict(params or {}))
if not self.pages:
return FakeResponse(200, {"users": []})
item = self.pages.pop(0)
if isinstance(item, int):
return FakeResponse(item, {})
return FakeResponse(200, {"users": item})
users_120 = [{"id": f"u{i}", "email": f"m{i}@example.com"} for i in range(120)]
page1, page2 = users_120[:100], users_120[100:]
fc = FakeAsyncClient([page1, page2])
got = asyncio.run(cloudron_fetch_all_users(fc))
check("110+ users: walked past the first page", len(got), 120)
check("per_page=100 on every page", {c.get("per_page") for c in fc.calls}, {100})
check("pages requested in order", [c.get("page") for c in fc.calls], [1, 2])
fc = FakeAsyncClient([500])
check("page-1 failure -> None (caller fails loudly)",
asyncio.run(cloudron_fetch_all_users(fc)), None)
fc = FakeAsyncClient([page1, 500, page2])
got = asyncio.run(cloudron_fetch_all_users(fc))
check("later-page failure keeps what was read", len(got), 100)
class EndlessFullPagesClient:
"""A fake API that never runs short — the hard cap must stop the walk."""
def __init__(self):
self.calls = 0
async def get(self, url, params=None, headers=None):
self.calls += 1
return FakeResponse(200, {"users": users_120[:100]})
fc = EndlessFullPagesClient()
got = asyncio.run(cloudron_fetch_all_users(fc))
check("hard cap: stops at 50 pages (5000 users)", (len(got), fc.calls), (5000, 50))
# --- sync walker (monkeypatch urllib at the call site's own module) ---------
import urllib.request
_real_urlopen = urllib.request.urlopen
_seen = {"n": 0}
def fake_urlopen(req, timeout=None):
_seen["n"] += 1
if _seen["n"] == 1:
raise RuntimeError("page 1 simulated failure")
class R:
def __enter__(self):
return self
def __exit__(self, *a):
return False
def read(self):
return b'{"users": []}'
return R()
urllib.request.urlopen = fake_urlopen
try:
try:
cloudron_fetch_all_users_sync()
check("sync walker: page-1 failure raises", False, True)
except RuntimeError:
check("sync walker: page-1 failure raises", True, True)
finally:
urllib.request.urlopen = _real_urlopen
_real_urlopen = urllib.request.urlopen
_state = {"pages": [users_120[:100], users_120[100:]], "urls": []}
def fake_urlopen2(req, timeout=None):
_state["urls"].append(req.full_url)
page = _state["pages"].pop(0) if _state["pages"] else []
import io
body = ('{"users": %s}' % __import__("json").dumps(page)).encode()
return io.BytesIO(body)
urllib.request.urlopen = fake_urlopen2
try:
got = cloudron_fetch_all_users_sync()
check("sync walker pages past the first page too", len(got), 120)
check("sync walker issued a page=2 request",
any("page=2" in u for u in _state["urls"]), True)
finally:
urllib.request.urlopen = _real_urlopen
print(f"\n{'FAILED' if failures else 'OK'} — {failures} failure(s)")
sys.exit(1 if failures else 0)