feat: auth fail-closed, regles par defaut idempotentes et conteneur non root (tt-2026-11-061)
This commit is contained in:
1 parent
b51a8bba69
commit
6aef9e83e7
11 files changed
+424
-95
No files matched your search
+77
-31
@@ -1,5 +1,7 @@
|
||||
import re
|
||||
import json
|
||||
from typing import Optional, Dict, Any, List, Tuple
|
||||
from app.config import get_tunis_now_iso
|
||||
from app.db import (
|
||||
list_regles,
|
||||
get_regle,
|
||||
@@ -21,7 +23,6 @@ def extract_keywords(text: Optional[str]) -> str:
|
||||
"""Extrait les mots significatifs d'un objet de mail."""
|
||||
if not text:
|
||||
return ""
|
||||
# Nettoyage des préfixes et caractères spéciaux
|
||||
clean = re.sub(r"^(?:re|fwd|tr)\s*:\s*", "", text, flags=re.IGNORECASE)
|
||||
words = re.findall(r"\b[\w\u00C0-\u017F-]{3,}\b", clean, flags=re.UNICODE)
|
||||
meaningful = [w for w in words if w.lower() not in STOPWORDS]
|
||||
@@ -35,7 +36,7 @@ def match_mail_to_rules(mail: Dict[str, Any], rules: List[Dict[str, Any]]) -> st
|
||||
mail_exp = (mail.get("expediteur") or mail.get("from") or "").lower()
|
||||
mail_obj = (mail.get("objet") or mail.get("subject") or "").lower()
|
||||
mail_snip = (mail.get("apercu") or mail.get("snippet") or "").lower()
|
||||
mail_tags = [t.lower() for t in (mail.get("etiquettes") or mail.get("tags") or [])]
|
||||
mail_tags = [t.strip().lower() for t in (mail.get("etiquettes") or mail.get("tags") or [])]
|
||||
|
||||
for rule in rules:
|
||||
if rule.get("statut") != "active":
|
||||
@@ -51,12 +52,11 @@ def match_mail_to_rules(mail: Dict[str, Any], rules: List[Dict[str, Any]]) -> st
|
||||
if rule_exp and rule_exp in mail_exp:
|
||||
return rule["categorie"]
|
||||
|
||||
# 3. Correspondance sur les mots-clés
|
||||
# 3. Correspondance sur les mots-clés (avec frontières de mots pour éviter les faux-positifs)
|
||||
rule_mot = (rule.get("mot_cle") or "").strip().lower()
|
||||
if rule_mot:
|
||||
# Vérifier si l'un des mots-clés de la règle est présent
|
||||
mot_parts = rule_mot.split()
|
||||
if any(p in mail_obj or p in mail_snip for p in mot_parts):
|
||||
pattern = rf"\b{re.escape(rule_mot)}\b"
|
||||
if re.search(pattern, mail_obj, re.IGNORECASE) or re.search(pattern, mail_snip, re.IGNORECASE):
|
||||
return rule["categorie"]
|
||||
|
||||
return "À classer"
|
||||
@@ -78,12 +78,16 @@ def classify_mail(mail: Dict[str, Any], db_path: Optional[str] = None) -> Dict[s
|
||||
rules = list_regles(statut="active", db_path=db_path)
|
||||
categorie = match_mail_to_rules(mail, rules)
|
||||
|
||||
tags = mail.get("etiquettes") or mail.get("tags") or []
|
||||
tags_json = json.dumps(tags) if isinstance(tags, list) else str(tags)
|
||||
|
||||
return save_classement_regle(
|
||||
message_id=mid,
|
||||
categorie=categorie,
|
||||
expediteur=mail.get("expediteur") or mail.get("from") or "",
|
||||
objet=mail.get("objet") or mail.get("subject") or "",
|
||||
date_mail=mail.get("date") or "",
|
||||
etiquettes=tags_json,
|
||||
db_path=db_path
|
||||
)
|
||||
|
||||
@@ -104,6 +108,9 @@ def manual_classify_and_propose(
|
||||
obj = (mail_info.get("objet") if mail_info else None) or (existing.get("objet") if existing else "")
|
||||
date_m = (mail_info.get("date") if mail_info else None) or (existing.get("date_mail") if existing else "")
|
||||
|
||||
tags = (mail_info.get("etiquettes") if mail_info else None) or (existing.get("etiquettes") if existing else "[]")
|
||||
tags_json = json.dumps(tags) if isinstance(tags, list) else str(tags)
|
||||
|
||||
classement = save_classement_manuel(
|
||||
message_id=message_id,
|
||||
categorie=new_category,
|
||||
@@ -111,6 +118,7 @@ def manual_classify_and_propose(
|
||||
expediteur=exp,
|
||||
objet=obj,
|
||||
date_mail=date_m,
|
||||
etiquettes=tags_json,
|
||||
db_path=db_path
|
||||
)
|
||||
|
||||
@@ -128,6 +136,68 @@ def manual_classify_and_propose(
|
||||
|
||||
return classement, proposed_rule
|
||||
|
||||
def reclassify_all_non_manual(db_path: Optional[str] = None, date_prefix: Optional[str] = None) -> int:
|
||||
"""
|
||||
Réévalue et reclasse tous les emails non-manuels enregistrés en base.
|
||||
RÈGLE ABSOLUE : Les classements manuels ne sont jamais touchés.
|
||||
"""
|
||||
active_rules = list_regles(statut="active", db_path=db_path)
|
||||
all_classements = list_classements(date_prefix=date_prefix, db_path=db_path)
|
||||
reclassified_count = 0
|
||||
|
||||
for c in all_classements:
|
||||
if c.get("source") == "manuel":
|
||||
continue
|
||||
|
||||
raw_tags = c.get("etiquettes") or "[]"
|
||||
try:
|
||||
tags = json.loads(raw_tags) if isinstance(raw_tags, str) else raw_tags
|
||||
except Exception:
|
||||
tags = []
|
||||
|
||||
mail_repr = {
|
||||
"message_id": c["message_id"],
|
||||
"expediteur": c.get("expediteur", ""),
|
||||
"objet": c.get("objet", ""),
|
||||
"apercu": "",
|
||||
"etiquettes": tags if isinstance(tags, list) else []
|
||||
}
|
||||
new_cat = match_mail_to_rules(mail_repr, active_rules)
|
||||
if new_cat != c.get("categorie"):
|
||||
save_classement_regle(
|
||||
message_id=c["message_id"],
|
||||
categorie=new_cat,
|
||||
expediteur=c.get("expediteur", ""),
|
||||
objet=c.get("objet", ""),
|
||||
date_mail=c.get("date_mail", ""),
|
||||
etiquettes=raw_tags if isinstance(raw_tags, str) else json.dumps(raw_tags),
|
||||
db_path=db_path
|
||||
)
|
||||
reclassified_count += 1
|
||||
|
||||
return reclassified_count
|
||||
|
||||
def reclassify_today_mails(mirror_client: Optional[Any] = None, db_path: Optional[str] = None, target_date: Optional[str] = None) -> int:
|
||||
"""
|
||||
Reclasse les mails du jour : interroge le miroir pour synchroniser les étiquettes et applique
|
||||
les règles actives, sans jamais écraser un classement manuel.
|
||||
"""
|
||||
t_date = target_date or get_tunis_now_iso()[:10]
|
||||
total_processed = 0
|
||||
|
||||
if mirror_client:
|
||||
try:
|
||||
mails = mirror_client.get_mails_for_day(t_date, max_items=50)
|
||||
for m in mails:
|
||||
classify_mail(m, db_path=db_path)
|
||||
total_processed += 1
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Reclassement de sécurité sur les données déjà en base
|
||||
reclassify_all_non_manual(db_path=db_path, date_prefix=t_date)
|
||||
return total_processed
|
||||
|
||||
def confirm_and_apply_rule(regle_id: int, db_path: Optional[str] = None) -> Optional[Dict[str, Any]]:
|
||||
"""
|
||||
Confirme une règle proposée (statut='active') et applique les règles actives
|
||||
@@ -138,29 +208,5 @@ def confirm_and_apply_rule(regle_id: int, db_path: Optional[str] = None) -> Opti
|
||||
if not rule:
|
||||
return None
|
||||
|
||||
# Réévaluation des emails non manuels en base
|
||||
active_rules = list_regles(statut="active", db_path=db_path)
|
||||
all_classements = list_classements(db_path=db_path)
|
||||
|
||||
for c in all_classements:
|
||||
if c.get("source") == "manuel":
|
||||
continue
|
||||
mail_repr = {
|
||||
"message_id": c["message_id"],
|
||||
"expediteur": c.get("expediteur", ""),
|
||||
"objet": c.get("objet", ""),
|
||||
"apercu": "",
|
||||
"etiquettes": []
|
||||
}
|
||||
new_cat = match_mail_to_rules(mail_repr, active_rules)
|
||||
if new_cat != c.get("categorie"):
|
||||
save_classement_regle(
|
||||
message_id=c["message_id"],
|
||||
categorie=new_cat,
|
||||
expediteur=c.get("expediteur", ""),
|
||||
objet=c.get("objet", ""),
|
||||
date_mail=c.get("date_mail", ""),
|
||||
db_path=db_path
|
||||
)
|
||||
|
||||
reclassify_all_non_manual(db_path=db_path)
|
||||
return rule
|
||||
Reference in new issue
Block a user