diff --git a/beta/server.py b/beta/server.py index 0536b1b..ff46fb3 100644 --- a/beta/server.py +++ b/beta/server.py @@ -73,7 +73,23 @@ def age(naissance, ref=None): return ref.year - y - ((ref.month, ref.day) < (m, d)) +class ConnVerrouillee: + """Verrou autour des seuls appels à la base (jamais autour des lectures/écritures réseau).""" + + def __init__(self, conn): + self._c, self._v = conn, threading.RLock() + + def execute(self, *a): + with self._v: + return self._c.execute(*a) + + def commit(self): + with self._v: + self._c.commit() + + class Handler(BaseHTTPRequestHandler): + timeout = 10 # client lent : la connexion est coupée, le serveur n'est jamais bloqué server_version = "JobRunnerBeta" sys_version = "" @@ -119,11 +135,11 @@ class Handler(BaseHTTPRequestHandler): self.envoyer(code, json.dumps(obj, ensure_ascii=False), "application/json; charset=utf-8", extra) def corps_json(self, limite=32_000): - n = int(self.headers.get("Content-Length") or 0) - if n <= 0 or n > limite: + brut = getattr(self, "_corps", b"") + if not brut or len(brut) > limite: return None try: - return json.loads(self.rfile.read(n)) + return json.loads(brut) except Exception: return None @@ -153,19 +169,29 @@ class Handler(BaseHTTPRequestHandler): now = time.time() n_ip = self.c.execute("SELECT COUNT(*) FROM attempts WHERE ip_hash=? AND ok=0 AND ts>?", (iph, now - FENETRE_S)).fetchone()[0] n_all = self.c.execute("SELECT COUNT(*) FROM attempts WHERE ok=0 AND ts>?", (now - 3600,)).fetchone()[0] - return n_ip >= MAX_ECHECS_IP or n_all >= MAX_ECHECS_GLOBAL + if n_all >= MAX_ECHECS_GLOBAL: + self._delai = 1.0 # le compteur global n'ajoute qu'un délai : un code valide passe toujours + return n_ip >= MAX_ECHECS_IP # --- routage ----------------------------------------------------- def do_HEAD(self): self.do_GET() def do_GET(self): - with self.server.verrou: - self._get() + self._get() def do_POST(self): - with self.server.verrou: - self._post() + # le corps est lu AVANT toute opération sur la base (un client lent ne bloque personne) + try: + n = int(self.headers.get("Content-Length") or 0) + self._corps = self.rfile.read(n) if 0 < n <= 2_600_000 else b"" + except (OSError, ValueError): + self.close_connection = True + return + self._delai = 0 + self._post() + if self._delai: + time.sleep(self._delai) # hors de tout verrou (la réponse est déjà écrite) def _get(self): p = urlsplit(self.path).path @@ -240,7 +266,8 @@ class Handler(BaseHTTPRequestHandler): if suf == ".html": txt = data.decode("utf-8", "replace") if app: - txt = txt.replace("", INJECTION + "", 1) if "" in txt else txt + INJECTION + i = txt.lower().rfind("") # le DERNIER : un peut apparaître dans une chaîne JS + txt = txt[:i] + INJECTION + txt[i:] if i >= 0 else txt + INJECTION return self.envoyer(200, txt, "text/html; charset=utf-8", csp=CSP_APP if app else CSP_PAGE) if suf == ".js": ctype = "text/javascript; charset=utf-8" @@ -262,7 +289,7 @@ class Handler(BaseHTTPRequestHandler): self.c.execute("INSERT INTO attempts(ts,ip_hash,ok,reason) VALUES(?,?,0,?)", (now, iph, "code invalide")) self.c.commit() db.journal(self.c, "entree_refusee", None, iph, "code invalide, révoqué ou expiré") - time.sleep(0.4) + self._delai = max(self._delai, 0.4) return self.json(401, {"erreur": "Code invalide, révoqué ou expiré."}) tok = secrets.token_urlsafe(32) h = hashlib.sha256(tok.encode()).hexdigest() @@ -402,8 +429,7 @@ class Serveur(ThreadingHTTPServer): def __init__(self, addr, conn): super().__init__(addr, Handler) - self.conn = conn - self.verrou = threading.RLock() + self.conn = ConnVerrouillee(conn) def main(): diff --git a/beta/tests/test_http.py b/beta/tests/test_http.py index bb75a71..638fc4a 100644 --- a/beta/tests/test_http.py +++ b/beta/tests/test_http.py @@ -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 +CRLF = bytes([13, 10]) PNG = "data:image/png;base64," + base64.b64encode(b"\x89PNG\r\n\x1a\n" + b"0" * 50).decode() @@ -21,6 +22,7 @@ class T(unittest.TestCase): @classmethod def setUpClass(cls): cls.conn = db.connect(check_same_thread=False) + server.Handler.timeout = 3 cls.srv = server.Serveur(("127.0.0.1", 0), cls.conn) cls.port = cls.srv.server_address[1] threading.Thread(target=cls.srv.serve_forever, daemon=True).start() @@ -128,6 +130,25 @@ class T(unittest.TestCase): self.assertEqual(self.req("POST", "/__beta/api/tester", dict(base, nom="A\x1b[2J"))[0], 400) # contrôle self.assertEqual(self.req("POST", "/__beta/api/tester", dict(base, email="pas-un-mail"))[0], 400) + def test_8b_client_lent_ne_bloque_pas(self): + import socket + lent = socket.create_connection(("127.0.0.1", self.port)) + lent.sendall(b"POST /__beta/api/enter HTTP/1.1"+CRLF+b"Host: x"+CRLF+b"X-Beta: 1"+CRLF+b"Content-Length: 100"+CRLF+CRLF+b"{") + t0 = time.time() + s, _, _ = self.req("GET", "/__beta/healthz") + s2, ck, _ = self.entrer() + self.assertEqual((s, s2), (200, 200)) + self.assertLess(time.time() - t0, 2) + lent.close() + + def test_8c_saturation_globale_laisse_passer_code_valide(self): + self.conn.execute("DELETE FROM attempts") + for i in range(server.MAX_ECHECS_GLOBAL + 5): + self.conn.execute("INSERT INTO attempts(ts,ip_hash,ok,reason) VALUES(?,?,0,'x')", (time.time(), f"autre{i}")) + self.conn.commit() + s, ck, _ = self.entrer() + self.assertEqual(s, 200) + def test_9_limite_tentatives_en_dernier(self): self.conn.execute("DELETE FROM attempts"); self.conn.commit() for _ in range(server.MAX_ECHECS_IP):