infra-2026-10-045: WatchedRotatingFileHandler resistant au remplacement d inode

This commit is contained in:
Gemini committed 2026-10-12 09:24:20 +02:00
1 parent 51c8ebe7a2
commit 4d96f22d04
3 files changed
+116 -3

No files matched your search

+58 -1
View File
@@ -12,6 +12,7 @@ import json
import logging
import logging.handlers
import os
import stat
import re
import sys
import threading
@@ -34,13 +35,69 @@ ACCESS_LOG_PATH = os.path.join(LOGS_DIR, "access.log")
RATE_LIMIT_PER_MIN = int(os.environ.get("RATE_LIMIT_PER_MIN", "30"))
TIMEOUT_SECONDS = float(os.environ.get("TIMEOUT_SECONDS", "15.0"))
class WatchedRotatingFileHandler(logging.handlers.RotatingFileHandler):
"""Sous-classe de RotatingFileHandler qui surveille le couple (périphérique, inode)
et rouvre le fichier s'il a changé ou disparu avant chaque écriture (comportement
de WatchedFileHandler avec conservation de la rotation maxBytes et backupCount).
"""
def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
encoding=None, delay=False, errors=None):
super().__init__(filename, mode=mode, maxBytes=maxBytes,
backupCount=backupCount, encoding=encoding,
delay=delay, errors=errors)
self.dev, self.ino = -1, -1
self._statstream()
def _statstream(self):
if self.stream:
try:
sres = os.fstat(self.stream.fileno())
self.dev, self.ino = sres[stat.ST_DEV], sres[stat.ST_INO]
except Exception:
self.dev, self.ino = -1, -1
def reopen_if_needed(self):
try:
sres = os.stat(self.baseFilename)
except OSError:
sres = None
if not sres or sres[stat.ST_DEV] != self.dev or sres[stat.ST_INO] != self.ino:
if self.stream is not None:
try:
self.stream.flush()
except Exception:
pass
try:
self.stream.close()
except Exception:
pass
self.stream = None
try:
os.makedirs(os.path.dirname(os.path.abspath(self.baseFilename)), exist_ok=True)
except Exception:
pass
self.stream = self._open()
self._statstream()
def emit(self, record):
try:
self.reopen_if_needed()
if self.shouldRollover(record):
self.doRollover()
self._statstream()
logging.FileHandler.emit(self, record)
except Exception:
self.handleError(record)
# Journalisation des accès
os.makedirs(LOGS_DIR, exist_ok=True)
access_logger = logging.getLogger("searxng_mcp.access")
access_logger.setLevel(logging.INFO)
access_logger.propagate = False
if not access_logger.handlers:
rfh = logging.handlers.RotatingFileHandler(
rfh = WatchedRotatingFileHandler(
ACCESS_LOG_PATH,
maxBytes=5 * 1024 * 1024,
backupCount=3,
+51 -1
View File
@@ -36,7 +36,7 @@ class TestSearxngMcp(unittest.IsolatedAsyncioTestCase):
# Reconfigurer le handler access_logger vers le fichier temporaire
server.access_logger.handlers.clear()
rfh = server.logging.handlers.RotatingFileHandler(
rfh = server.WatchedRotatingFileHandler(
self.logs_path, maxBytes=5 * 1024 * 1024, backupCount=3, encoding="utf-8"
)
rfh.setFormatter(server.logging.Formatter("%(message)s"))
@@ -45,6 +45,8 @@ class TestSearxngMcp(unittest.IsolatedAsyncioTestCase):
server.CURRENT_IDENTITY.set("test-pilote")
def tearDown(self):
for h in list(server.access_logger.handlers):
h.close()
server.access_logger.handlers.clear()
self.temp_dir.cleanup()
@@ -230,5 +232,53 @@ class TestSearxngMcp(unittest.IsolatedAsyncioTestCase):
self.assertEqual(kwargs["params"]["time_range"], "week")
def test_journal_resiste_renommage_suppression_remplacement(self):
"""Vérifie que le journal résiste au renommage, suppression et remplacement (nouvel inode)."""
# Écriture initiale
server.log_access("test-pilote", 3, 10, "query 1")
self.assertTrue(os.path.exists(self.logs_path))
with open(self.logs_path, "r", encoding="utf-8") as f:
content1 = f.read()
self.assertIn("identity=test-pilote", content1)
self.assertIn("results=3", content1)
# 1. Renommage : le fichier d'origine est déplacé
moved = self.logs_path + ".verif_renomme"
os.rename(self.logs_path, moved)
self.assertFalse(os.path.exists(self.logs_path))
# Écriture suivante -> nouveau fichier créé avec la nouvelle ligne
server.log_access("test-pilote", 5, 15, "query 2")
self.assertTrue(os.path.exists(self.logs_path))
with open(self.logs_path, "r", encoding="utf-8") as f:
content2 = f.read()
self.assertIn("results=5", content2)
self.assertNotIn("results=3", content2)
# 2. Suppression : le fichier est supprimé
os.remove(self.logs_path)
self.assertFalse(os.path.exists(self.logs_path))
# Écriture suivante -> nouveau fichier créé avec la nouvelle ligne
server.log_access("test-pilote", 8, 20, "query 3")
self.assertTrue(os.path.exists(self.logs_path))
with open(self.logs_path, "r", encoding="utf-8") as f:
content3 = f.read()
self.assertIn("results=8", content3)
# 3. Remplacement : remplacement par un fichier avec un autre inode (os.replace)
replaced = self.logs_path + ".verif_replace"
with open(replaced, "w", encoding="utf-8") as f:
f.write("2026-10-12T00:00:00Z | identity=autre | ligne_externe\n")
os.replace(replaced, self.logs_path)
# Écriture suivante -> détection du changement d'inode et réouverture
server.log_access("test-pilote", 12, 25, "query 4")
with open(self.logs_path, "r", encoding="utf-8") as f:
content4 = f.read()
self.assertIn("ligne_externe", content4)
self.assertIn("results=12", content4)
if __name__ == "__main__":
unittest.main()
Executable → Regular
+7 -1
View File
@@ -1 +1,7 @@
{"9ea85a73bf3ed88114001c177d030d8de977736e4eb0af03f609f7d43473fa82": "test-pilote"}
{
"9ea85a73bf3ed88114001c177d030d8de977736e4eb0af03f609f7d43473fa82": "test-pilote",
"6870dabfcee522719fc38bbebc684fb2d81648e9b6fb50b4c792a74f3969775f": "opencode-cli",
"8c88aa3dd2b320f04dffbb3eaa01a38aa35cc4470c4b8edc05fd7877575301e7": "agno-tt",
"3fa585945fea21f814bdb2a5d4a4405c6ecb5ba2da6e933af9fa6019883a5f2b": "hermes-nabil",
"b7fa3ffb3a85cf5aba729146b1f250b6662ff64aad5e8df42233f4d975246349": "dsh"
}