fix(beta): API admin limitee a admin.jobrunner.fr, effacement et purge des testeurs, plafonds des captures, deconnexion en POST
- X-Admin seul ne suffit plus : Host doit etre admin.jobrunner.fr (le vhost public transmet les en-tetes du visiteur) - feedback.tester_id : retours lies au testeur, effaces avec lui (captures comprises) - codes.py effacer-testeur / purger (simulation par defaut) - captures : 30/jour/auteur, 500 Mo au total, 5 Go libres minimum - /__beta/logout en POST avec X-Beta (F5) - 5 tests ajoutes (30 au total) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Cette révision appartient à :
1 Parent
7148f3d04b
révision
1228bf47aa
5 fichiers modifiés
+233
-28
Aucun fichier ne correspond à votre recherche
@@ -14,6 +14,7 @@ sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
os.environ["BETA_DATA"] = str(Path(tempfile.mkdtemp()) / "data")
|
||||
import db, server # noqa: E402
|
||||
|
||||
ADMIN = {"X-Admin": "1", "Host": "admin.jobrunner.fr"}
|
||||
CRLF = bytes([13, 10])
|
||||
PNG = "data:image/png;base64," + base64.b64encode(b"\x89PNG\r\n\x1a\n" + b"0" * 50).decode()
|
||||
|
||||
@@ -234,7 +235,7 @@ class T(unittest.TestCase):
|
||||
self.assertEqual(s, 403)
|
||||
|
||||
# 2. Avec header X-Admin : succès 200
|
||||
s, _, d = self.req("POST", "/_admin/api/codes/creer", {"label": "Testeur Admin", "jours": 14}, headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("POST", "/_admin/api/codes/creer", {"label": "Testeur Admin", "jours": 14}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertTrue(res.get("ok"))
|
||||
@@ -243,7 +244,7 @@ class T(unittest.TestCase):
|
||||
self.assertEqual(res.get("label"), "Testeur Admin")
|
||||
|
||||
# 3. Liste des codes
|
||||
s, _, d = self.req("GET", "/_admin/api/codes/liste", headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("GET", "/_admin/api/codes/liste", headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertTrue(res.get("ok"))
|
||||
@@ -252,21 +253,21 @@ class T(unittest.TestCase):
|
||||
code_id = res["codes"][0]["id"]
|
||||
|
||||
# 4. Supprimer le code
|
||||
s, _, d = self.req("POST", "/_admin/api/codes/supprimer", {"id": code_id}, headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("POST", "/_admin/api/codes/supprimer", {"id": code_id}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertTrue(res.get("ok"))
|
||||
self.assertEqual(res.get("id"), code_id)
|
||||
|
||||
# Vérification qu'il n'est plus dans la liste
|
||||
s, _, d = self.req("GET", "/_admin/api/codes/liste", headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("GET", "/_admin/api/codes/liste", headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
labels_after = [c["label"] for c in res.get("codes", [])]
|
||||
self.assertNotIn("Testeur Admin", labels_after)
|
||||
|
||||
# 5. Liste des testeurs (inscriptions)
|
||||
s, _, d = self.req("GET", "/_admin/api/candidatures/liste", headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("GET", "/_admin/api/candidatures/liste", headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertTrue(res.get("ok"))
|
||||
@@ -279,21 +280,105 @@ class T(unittest.TestCase):
|
||||
|
||||
# 6. Suspendre le testeur
|
||||
tid = testeur["id"]
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/statut", {"id": tid, "actif": 0}, headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/statut", {"id": tid, "actif": 0}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertEqual(res.get("actif"), 0)
|
||||
|
||||
# 7. Réactiver le testeur
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/statut", {"id": tid, "actif": 1}, headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/statut", {"id": tid, "actif": 1}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
res = json.loads(d.decode())
|
||||
self.assertEqual(res.get("actif"), 1)
|
||||
|
||||
# 8. Supprimer le testeur
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/supprimer", {"id": tid}, headers={"X-Admin": "1"})
|
||||
s, _, d = self.req("POST", "/_admin/api/testeurs/supprimer", {"id": tid}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
|
||||
|
||||
def test_admin_refuse_depuis_le_site_public(self):
|
||||
# Le vhost public de Caddy transmet tout en-tête du visiteur : X-Admin seul ne doit rien ouvrir.
|
||||
for host in ("jobrunner.fr", "beta.jobrunner.fr", "www.jobrunner.fr", "127.0.0.1", "admin.jobrunner.fr.evil.com", "[::1]"):
|
||||
h = {"X-Admin": "1", "Host": host}
|
||||
self.assertEqual(self.req("GET", "/_admin/api/candidatures/liste", headers=h)[0], 403, host)
|
||||
self.assertEqual(self.req("GET", "/_admin/api/codes/liste", headers=h)[0], 403, host)
|
||||
self.assertEqual(self.req("POST", "/_admin/api/codes/creer", {"label": "Pirate"}, headers=h)[0], 403, host)
|
||||
self.assertEqual(self.req("POST", "/_admin/api/testeurs/supprimer", {"id": 1}, headers=h)[0], 403, host)
|
||||
self.assertEqual(self.req("GET", "/_admin/api/codes/liste", headers={"X-Admin": "1", "Host": "ADMIN.jobrunner.fr:443"})[0], 200)
|
||||
self.assertEqual(self.req("GET", "/_admin/api/codes/liste", headers={"Host": "admin.jobrunner.fr"})[0], 403)
|
||||
|
||||
def test_8i_logout_post_seulement(self):
|
||||
_, ck, _ = self.entrer()
|
||||
self.assertEqual(self.req("GET", "/__beta/logout", cookie=ck)[0], 405)
|
||||
self.assertEqual(self.req("GET", "/__beta/api/me", cookie=ck)[0], 200) # GET n'a rien coupé
|
||||
self.assertEqual(self.req("POST", "/__beta/logout", cookie=ck, headers={"X-Beta": "0"})[0], 403) # sans X-Beta
|
||||
s, r, _ = self.req("POST", "/__beta/logout", cookie=ck)
|
||||
self.assertEqual(s, 200)
|
||||
self.assertIn("Max-Age=0", r.getheader("Set-Cookie"))
|
||||
self.assertEqual(self.req("GET", "/__beta/api/me", cookie=ck)[0], 401)
|
||||
|
||||
def test_effacement_testeur_avec_retours_et_captures(self):
|
||||
base = {"nom": "Efface", "prenom": "Moi", "email": "efface@example.org", "tel": "06 00 00 00 00", "naissance": "1991-01-01",
|
||||
"accord_participation": True, "rgpd": True, "confidentialite": True}
|
||||
s, r, _ = self.req("POST", "/__beta/api/tester", base)
|
||||
self.assertEqual(s, 200)
|
||||
ck = r.getheader("Set-Cookie").split(";")[0]
|
||||
s, _, d = self.req("POST", "/__beta/api/feedback", {"text": "retour a effacer", "screenshot": PNG}, ck)
|
||||
self.assertEqual(s, 200, d)
|
||||
fid = json.loads(d)["id"]
|
||||
row = self.conn.execute("SELECT code_id, tester_id, shot FROM feedback WHERE id=?", (fid,)).fetchone()
|
||||
self.assertIsNone(row[0]) # plus d'id de testeur rangé dans code_id
|
||||
tid = row[1]
|
||||
capture = db.DATA / "retours" / row[2]
|
||||
self.assertTrue(capture.exists())
|
||||
s, _, _ = self.req("POST", "/_admin/api/testeurs/supprimer", {"id": tid}, headers=ADMIN)
|
||||
self.assertEqual(s, 200)
|
||||
self.assertFalse(capture.exists())
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM feedback WHERE id=?", (fid,)).fetchone()[0], 0)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM testers WHERE id=?", (tid,)).fetchone()[0], 0)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM sessions WHERE tester_id=?", (tid,)).fetchone()[0], 0)
|
||||
|
||||
def test_purge_simulation_puis_application(self):
|
||||
now = time.time()
|
||||
vieux = now - 400 * 86400
|
||||
cur = self.conn.execute("INSERT INTO testers(ts,nom,prenom,email,actif) VALUES(?,?,?,?,1)", (vieux, "Vieux", "T", "v@example.org"))
|
||||
tid = cur.lastrowid
|
||||
self.conn.execute("INSERT INTO feedback(ts,code_id,tester_id,text) VALUES(?,?,?,?)", (vieux, None, tid, "ancien"))
|
||||
self.conn.execute("INSERT INTO attempts(ts,ip_hash,ok) VALUES(?,?,0)", (vieux, "x"))
|
||||
self.conn.execute("INSERT INTO audit(ts,event) VALUES(?,?)", (vieux, "ancien"))
|
||||
self.conn.commit()
|
||||
avant = now - 200 * 86400
|
||||
b = db.purger(self.conn, avant) # simulation par défaut
|
||||
self.assertGreaterEqual(b["testeurs"], 1)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM testers WHERE id=?", (tid,)).fetchone()[0], 1)
|
||||
db.purger(self.conn, avant, simulation=False)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM testers WHERE id=?", (tid,)).fetchone()[0], 0)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM feedback WHERE tester_id=?", (tid,)).fetchone()[0], 0)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM attempts WHERE ts<?", (avant,)).fetchone()[0], 0)
|
||||
self.assertEqual(self.conn.execute("SELECT COUNT(*) FROM audit WHERE event='ancien'").fetchone()[0], 0)
|
||||
self.assertGreater(self.conn.execute("SELECT COUNT(*) FROM testers").fetchone()[0], 0) # les récents restent
|
||||
|
||||
def test_8j_plafond_captures(self):
|
||||
i, code = db.creer_code(self.conn, "Captures", 7)
|
||||
_, ck, _ = self.entrer(code)
|
||||
ancien = server.MAX_CAPTURES_JOUR
|
||||
server.MAX_CAPTURES_JOUR = 2
|
||||
try:
|
||||
for _ in range(2):
|
||||
self.assertEqual(self.req("POST", "/__beta/api/feedback", {"text": "capture ok", "screenshot": PNG}, ck)[0], 200)
|
||||
s, _, d = self.req("POST", "/__beta/api/feedback", {"text": "capture de trop", "screenshot": PNG}, ck)
|
||||
self.assertEqual(s, 429, d)
|
||||
self.assertEqual(self.req("POST", "/__beta/api/feedback", {"text": "texte seul toujours accepte"}, ck)[0], 200)
|
||||
finally:
|
||||
server.MAX_CAPTURES_JOUR = ancien
|
||||
ancien = server.MIN_LIBRE_OCTETS
|
||||
server.MIN_LIBRE_OCTETS = 10 ** 18 # disque « plein »
|
||||
try:
|
||||
_, ck2, _ = self.entrer(db.creer_code(self.conn, "Disque", 7)[1])
|
||||
self.assertEqual(self.req("POST", "/__beta/api/feedback", {"text": "disque plein", "screenshot": PNG}, ck2)[0], 507)
|
||||
finally:
|
||||
server.MIN_LIBRE_OCTETS = ancien
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main(verbosity=2)
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur