[fix] Corrections ruff CI (UP017/UP041/UP012/I001/F401/FURB162) : backend/coffre_store.py
This commit is contained in:
@@ -40,19 +40,18 @@ import re
|
|||||||
import secrets as _secrets
|
import secrets as _secrets
|
||||||
import threading
|
import threading
|
||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime, timedelta, timezone
|
from datetime import UTC, datetime, timedelta
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from backend.coffre_crypto import (
|
from backend.coffre_crypto import (
|
||||||
KEKAbsenteError,
|
decrypt_secret_value,
|
||||||
|
encrypt_secret_value,
|
||||||
generate_dek,
|
generate_dek,
|
||||||
load_kek,
|
load_kek,
|
||||||
parse_kek,
|
parse_kek,
|
||||||
reencrypt_secret_value,
|
reencrypt_secret_value,
|
||||||
unwrap_dek,
|
unwrap_dek,
|
||||||
wrap_dek,
|
wrap_dek,
|
||||||
encrypt_secret_value,
|
|
||||||
decrypt_secret_value,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
logger = logging.getLogger("obsigate.coffre_store")
|
logger = logging.getLogger("obsigate.coffre_store")
|
||||||
@@ -123,7 +122,7 @@ def _valeurs_path(base: Path) -> Path:
|
|||||||
|
|
||||||
|
|
||||||
def _now_iso() -> str:
|
def _now_iso() -> str:
|
||||||
return datetime.now(timezone.utc).isoformat()
|
return datetime.now(UTC).isoformat()
|
||||||
|
|
||||||
|
|
||||||
def _parse_date(value: str | None) -> datetime | None:
|
def _parse_date(value: str | None) -> datetime | None:
|
||||||
@@ -140,7 +139,7 @@ def _parse_date(value: str | None) -> datetime | None:
|
|||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
raise ValidationError(f"Date invalide : {value!r}") from exc
|
raise ValidationError(f"Date invalide : {value!r}") from exc
|
||||||
if parsed.tzinfo is None:
|
if parsed.tzinfo is None:
|
||||||
parsed = parsed.replace(tzinfo=timezone.utc)
|
parsed = parsed.replace(tzinfo=UTC)
|
||||||
return parsed
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
@@ -149,7 +148,7 @@ def est_expire(expiration: str | None, maintenant: datetime | None = None) -> bo
|
|||||||
parsed = _parse_date(expiration)
|
parsed = _parse_date(expiration)
|
||||||
if parsed is None:
|
if parsed is None:
|
||||||
return False
|
return False
|
||||||
ref = maintenant or datetime.now(timezone.utc)
|
ref = maintenant or datetime.now(UTC)
|
||||||
return parsed <= ref
|
return parsed <= ref
|
||||||
|
|
||||||
|
|
||||||
@@ -766,7 +765,7 @@ def create_octroi(
|
|||||||
):
|
):
|
||||||
raise IntrouvableError("Secret introuvable dans ce coffre")
|
raise IntrouvableError("Secret introuvable dans ce coffre")
|
||||||
if expiration is None:
|
if expiration is None:
|
||||||
expiration = (datetime.now(timezone.utc) + timedelta(days=DUREE_OCTROI_DEFAUT_JOURS)).isoformat()
|
expiration = (datetime.now(UTC) + timedelta(days=DUREE_OCTROI_DEFAUT_JOURS)).isoformat()
|
||||||
else:
|
else:
|
||||||
_parse_date(expiration)
|
_parse_date(expiration)
|
||||||
with _lock:
|
with _lock:
|
||||||
|
|||||||
Reference in New Issue
Block a user