feat: auth fail-closed, regles par defaut idempotentes et conteneur non root (tt-2026-11-061)

This commit is contained in:
gemini-ops committed 2026-11-17 13:09:53 +01:00
1 parent b51a8bba69
commit 6aef9e83e7
11 files changed
+424 -95

No files matched your search

+58 -19
View File
@@ -1,7 +1,8 @@
import os
import json
import sqlite3
from typing import Optional, List, Dict, Any
from app.config import DB_PATH, DEFAULT_CATEGORIES, get_tunis_now_iso
from app.config import DB_PATH, DEFAULT_CATEGORIES, DEFAULT_RULES, get_tunis_now_iso
def get_connection(db_path: Optional[str] = None) -> sqlite3.Connection:
path = db_path or DB_PATH
@@ -45,18 +46,50 @@ def init_db(db_path: Optional[str] = None) -> None:
traite INTEGER NOT NULL DEFAULT 0,
expediteur TEXT,
objet TEXT,
date_mail TEXT
date_mail TEXT,
etiquettes TEXT DEFAULT '[]'
);
""")
# Initialisation des catégories par défaut si vide
cursor = conn.execute("SELECT COUNT(*) as cnt FROM categories")
if cursor.fetchone()["cnt"] == 0:
now = get_tunis_now_iso()
for cat in DEFAULT_CATEGORIES:
# Migration douce si la table classements existait sans la colonne etiquettes
cols = [r["name"] for r in conn.execute("PRAGMA table_info(classements)").fetchall()]
if "etiquettes" not in cols:
conn.execute("ALTER TABLE classements ADD COLUMN etiquettes TEXT DEFAULT '[]'")
now = get_tunis_now_iso()
# Initialisation idempotente des catégories par défaut
for cat in DEFAULT_CATEGORIES:
conn.execute(
"INSERT OR IGNORE INTO categories (name, created_at) VALUES (?, ?)",
(cat, now)
)
# Initialisation idempotente des règles de départ
for rule in DEFAULT_RULES:
cat = rule["categorie"]
eti = rule.get("etiquette_miroir")
exp = rule.get("expediteur")
mot = rule.get("mot_cle")
sta = rule.get("statut", "active")
cursor = conn.execute(
"""
SELECT COUNT(*) as cnt FROM regles
WHERE categorie = ?
AND (etiquette_miroir IS ? OR etiquette_miroir = ?)
AND (expediteur IS ? OR expediteur = ?)
AND (mot_cle IS ? OR mot_cle = ?)
""",
(cat, eti, eti, exp, exp, mot, mot)
)
if cursor.fetchone()["cnt"] == 0:
conn.execute(
"INSERT OR IGNORE INTO categories (name, created_at) VALUES (?, ?)",
(cat, now)
"""
INSERT INTO regles (categorie, etiquette_miroir, expediteur, mot_cle, statut, created_at)
VALUES (?, ?, ?, ?, ?, ?)
""",
(cat, eti, exp, mot, sta, now)
)
finally:
conn.close()
@@ -223,7 +256,7 @@ def get_classement(message_id: str, db_path: Optional[str] = None) -> Optional[D
conn = get_connection(db_path)
try:
row = conn.execute(
"SELECT message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail FROM classements WHERE message_id = ?",
"SELECT message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes FROM classements WHERE message_id = ?",
(message_id,)
).fetchone()
if not row:
@@ -242,7 +275,7 @@ def list_classements(
) -> List[Dict[str, Any]]:
conn = get_connection(db_path)
try:
query = "SELECT message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail FROM classements WHERE 1=1"
query = "SELECT message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes FROM classements WHERE 1=1"
params: list = []
if date_prefix:
query += " AND (date_mail LIKE ? OR horodatage LIKE ?)"
@@ -270,6 +303,7 @@ def save_classement_regle(
expediteur: str = "",
objet: str = "",
date_mail: str = "",
etiquettes: Optional[str] = None,
db_path: Optional[str] = None
) -> Dict[str, Any]:
"""
@@ -288,22 +322,24 @@ def save_classement_regle(
exp = expediteur or (existing["expediteur"] if existing else "")
obj = objet or (existing["objet"] if existing else "")
d_mail = date_mail or (existing["date_mail"] if existing else "")
etiq = etiquettes or (existing.get("etiquettes") if existing else "[]")
with conn:
conn.execute(
"""
INSERT INTO classements (message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail)
VALUES (?, ?, 'regle', ?, ?, ?, ?, ?)
INSERT INTO classements (message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes)
VALUES (?, ?, 'regle', ?, ?, ?, ?, ?, ?)
ON CONFLICT(message_id) DO UPDATE SET
categorie = excluded.categorie,
source = 'regle',
horodatage = excluded.horodatage,
expediteur = excluded.expediteur,
objet = excluded.objet,
date_mail = excluded.date_mail
date_mail = excluded.date_mail,
etiquettes = CASE WHEN excluded.etiquettes != '[]' THEN excluded.etiquettes ELSE classements.etiquettes END
WHERE classements.source != 'manuel'
""",
(message_id, categorie, now, 1 if traite else 0, exp, obj, d_mail)
(message_id, categorie, now, 1 if traite else 0, exp, obj, d_mail, etiq)
)
return get_classement(message_id, db_path)
finally:
@@ -316,6 +352,7 @@ def save_classement_manuel(
expediteur: Optional[str] = None,
objet: Optional[str] = None,
date_mail: Optional[str] = None,
etiquettes: Optional[str] = None,
db_path: Optional[str] = None
) -> Dict[str, Any]:
"""
@@ -329,12 +366,13 @@ def save_classement_manuel(
exp = expediteur if expediteur is not None else (existing["expediteur"] if existing else "")
obj = objet if objet is not None else (existing["objet"] if existing else "")
d_mail = date_mail if date_mail is not None else (existing["date_mail"] if existing else "")
etiq = etiquettes if etiquettes is not None else (existing.get("etiquettes") if existing else "[]")
with conn:
conn.execute(
"""
INSERT INTO classements (message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail)
VALUES (?, ?, 'manuel', ?, ?, ?, ?, ?)
INSERT INTO classements (message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes)
VALUES (?, ?, 'manuel', ?, ?, ?, ?, ?, ?)
ON CONFLICT(message_id) DO UPDATE SET
categorie = excluded.categorie,
source = 'manuel',
@@ -342,9 +380,10 @@ def save_classement_manuel(
traite = excluded.traite,
expediteur = CASE WHEN excluded.expediteur != '' THEN excluded.expediteur ELSE classements.expediteur END,
objet = CASE WHEN excluded.objet != '' THEN excluded.objet ELSE classements.objet END,
date_mail = CASE WHEN excluded.date_mail != '' THEN excluded.date_mail ELSE classements.date_mail END
date_mail = CASE WHEN excluded.date_mail != '' THEN excluded.date_mail ELSE classements.date_mail END,
etiquettes = CASE WHEN excluded.etiquettes != '[]' THEN excluded.etiquettes ELSE classements.etiquettes END
""",
(message_id, categorie, now, is_traite, exp, obj, d_mail)
(message_id, categorie, now, is_traite, exp, obj, d_mail, etiq)
)
return get_classement(message_id, db_path)
finally: