fanilo/Sage100-vps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(security): improve security management script with better logging and structure

Browse source
This commit is contained in:
Fanilo-Nantenaina 2026-01-20 12:11:20 +03:00
parent 9bd0f62459
commit cc0062b3bc
4 changed files with 177 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api.py
View file

@ -181,7 +181,6 @@ def custom_openapi():
openapi_schema = app.openapi() openapi_schema = app.openapi()
# Définir deux schémas de sécurité
openapi_schema["components"]["securitySchemes"] = { openapi_schema["components"]["securitySchemes"] = {
"HTTPBearer": {"type": "http", "scheme": "bearer", "bearerFormat": "JWT"}, "HTTPBearer": {"type": "http", "scheme": "bearer", "bearerFormat": "JWT"},
"ApiKeyAuth": {"type": "apiKey", "in": "header", "name": "X-API-Key"}, "ApiKeyAuth": {"type": "apiKey", "in": "header", "name": "X-API-Key"},
@ -193,7 +192,6 @@ def custom_openapi():
return app.openapi_schema return app.openapi_schema
# Après app = FastAPI(...), ajouter:
app.openapi = custom_openapi app.openapi = custom_openapi

1
routes/universign.py
View file

@ -35,7 +35,6 @@ logger = logging.getLogger(__name__)
router = APIRouter( router = APIRouter(
prefix="/universign", prefix="/universign",
tags=["Universign"], tags=["Universign"],
# dependencies=[Depends(get_current_user)]
) )
sync_service = UniversignSyncService( sync_service = UniversignSyncService(

298
scripts/manage_security.py
View file

@ -1,86 +1,94 @@
import asyncio import asyncio
import sys import sys
from pathlib import Path
import argparse
sys.path.insert(0, str(Path(__file__).parent.parent))
from database import get_session from database import get_session
from database.models.api_key import SwaggerUser from database.models.api_key import SwaggerUser, ApiKey
from services.api_key import ApiKeyService from services.api_key import ApiKeyService
from security.auth import hash_password from security.auth import hash_password
from sqlalchemy import select from sqlalchemy import select
from pathlib import Path
sys.path.insert(0, str(Path(__file__).parent.parent))
import argparse
from datetime import datetime
import logging import logging
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO, format="%(levelname)s - %(message)s")
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
async def add_swagger_user(username: str, password: str, full_name: str = None): async def add_swagger_user(username: str, password: str, full_name: str = None):
"""Ajouter un utilisateur Swagger""" """Ajouter un utilisateur Swagger"""
async with get_session() as session:
async for session in get_session():
result = await session.execute( result = await session.execute(
select(SwaggerUser).where(SwaggerUser.username == username) select(SwaggerUser).where(SwaggerUser.username == username)
) )
existing = result.scalar_one_or_none() existing = result.scalar_one_or_none()
if existing: if existing:
logger.error(f" L'utilisateur {username} existe déjà") logger.error(f" L'utilisateur '{username}' existe déjà")
return return
user = SwaggerUser( swagger_user = SwaggerUser(
username=username, username=username,
hashed_password=hash_password(password), hashed_password=hash_password(password),
full_name=full_name or username, full_name=full_name or username,
is_active=True, is_active=True,
) )
session.add(user) session.add(swagger_user)
await session.commit() await session.commit()
logger.info(f" Utilisateur Swagger créé: {username}") logger.info(f" Utilisateur Swagger créé: {username}")
print("\n Utilisateur créé avec succès") logger.info(f" Nom complet: {swagger_user.full_name}")
print(f" Username: {username}") logger.info(f" Actif: {swagger_user.is_active}")
print(" Accès: https://votre-serveur/docs")
break
async def list_swagger_users(): async def list_swagger_users():
"""Lister les utilisateurs Swagger""" """Lister tous les utilisateurs Swagger"""
async with get_session() as session:
async for session in get_session():
result = await session.execute(select(SwaggerUser)) result = await session.execute(select(SwaggerUser))
users = result.scalars().all() users = result.scalars().all()
if not users: if not users:
print("Aucun utilisateur Swagger trouvé") logger.info(" Aucun utilisateur Swagger")
return break
logger.info(f" {len(users)} utilisateur(s) Swagger:\n")
print(f"\n {len(users)} utilisateur(s) Swagger:\n")
for user in users: for user in users:
status = " Actif" if user.is_active else " Inactif" status = "" if user.is_active else ""
print(f" • {user.username:<20} {status}") logger.info(f" {status} {user.username}")
if user.full_name: logger.info(f" Nom: {user.full_name}")
print(f" Nom: {user.full_name}") logger.info(f" Créé: {user.created_at}")
if user.last_login: logger.info(f" Dernière connexion: {user.last_login or 'Jamais'}")
print(f" Dernière connexion: {user.last_login}") logger.info("")
print()
break
async def delete_swagger_user(username: str): async def delete_swagger_user(username: str):
"""Supprimer un utilisateur Swagger""" """Supprimer un utilisateur Swagger"""
async with get_session() as session:
async for session in get_session():
result = await session.execute( result = await session.execute(
select(SwaggerUser).where(SwaggerUser.username == username) select(SwaggerUser).where(SwaggerUser.username == username)
) )
user = result.scalar_one_or_none() user = result.scalar_one_or_none()
if not user: if not user:
logger.error(f" Utilisateur {username} introuvable") logger.error(f" Utilisateur '{username}' introuvable")
return break
await session.delete(user) await session.delete(user)
await session.commit() await session.commit()
logger.info(f"🗑️ Utilisateur supprimé: {username}") logger.info(f" Utilisateur Swagger supprimé: {username}")
break
async def create_api_key( async def create_api_key(
@ -91,137 +99,180 @@ async def create_api_key(
endpoints: list = None, endpoints: list = None,
): ):
"""Créer une clé API""" """Créer une clé API"""
async with get_session() as session:
async for session in get_session():
service = ApiKeyService(session) service = ApiKeyService(session)
api_key_obj, api_key_plain = await service.create_api_key( api_key_obj, api_key_plain = await service.create_api_key(
name=name, name=name,
description=description, description=description,
created_by="CLI", created_by="cli",
expires_in_days=expires_in_days, expires_in_days=expires_in_days,
rate_limit_per_minute=rate_limit, rate_limit_per_minute=rate_limit,
allowed_endpoints=endpoints, allowed_endpoints=endpoints,
) )
print("\n Clé API créée avec succès\n") logger.info("=" * 60)
print(f" ID: {api_key_obj.id}") logger.info(" Clé API créée avec succès")
print(f" Nom: {name}") logger.info("=" * 60)
print(f" Clé: {api_key_plain}") logger.info(f" ID: {api_key_obj.id}")
print(f" Préfixe: {api_key_obj.key_prefix}") logger.info(f" Nom: {api_key_obj.name}")
print(f" Rate limit: {rate_limit} req/min") logger.info(f" Clé: {api_key_plain}")
print(f" Expire le: {api_key_obj.expires_at or 'Jamais'}") logger.info(f" Préfixe: {api_key_obj.key_prefix}")
print("\n IMPORTANT: Sauvegardez cette clé, elle ne sera plus affichée !\n") logger.info(f" Rate limit: {api_key_obj.rate_limit_per_minute} req/min")
logger.info(f" Créée le: {api_key_obj.created_at}")
logger.info(f" Expire le: {api_key_obj.expires_at}")
if api_key_obj.allowed_endpoints:
logger.info(
f" Endpoints autorisés: {', '.join(api_key_obj.allowed_endpoints)}"
)
else:
logger.info(" Endpoints autorisés: Tous")
logger.info("=" * 60)
logger.info(" IMPORTANT: Sauvegardez cette clé, elle ne sera plus affichée !")
logger.info("=" * 60)
break
async def list_api_keys(): async def list_api_keys():
"""Lister les clés API""" """Lister toutes les clés API"""
async with get_session() as session:
async for session in get_session():
service = ApiKeyService(session) service = ApiKeyService(session)
keys = await service.list_api_keys() keys = await service.list_api_keys()
if not keys: if not keys:
print("Aucune clé API trouvée") logger.info(" Aucune clé API")
return break
logger.info(f" {len(keys)} clé(s) API:\n")
print(f"\n {len(keys)} clé(s) API:\n")
for key in keys: for key in keys:
status = "" if key.is_active else "" status = (
expired = ( ""
"⏰ Expirée" if key.is_active
if key.expires_at and key.expires_at < datetime.now() and (not key.expires_at or key.expires_at > datetime.now())
else "" else ""
) )
print(f" {status} {key.name:<30} ({key.key_prefix}...)") logger.info(f" {status} {key.name:<30} ({key.key_prefix}...)")
print(f" ID: {key.id}") logger.info(f" ID: {key.id}")
print(f" Requêtes: {key.total_requests}") logger.info(f" Rate limit: {key.rate_limit_per_minute} req/min")
print(f" Dernière utilisation: {key.last_used_at or 'Jamais'}") logger.info(f" Requêtes: {key.total_requests}")
if expired: logger.info(f" Créée le: {key.created_at}")
print(f" {expired}") logger.info(f" Expire le: {key.expires_at or 'Jamais'}")
print() logger.info(f" Dernière utilisation: {key.last_used_at or 'Jamais'}")
if key.allowed_endpoints:
logger.info(
f" Endpoints: {', '.join(key.allowed_endpoints[:3])}..."
)
logger.info("")
break
async def revoke_api_key(key_id: str): async def revoke_api_key(key_id: str):
"""Révoquer une clé API""" """Révoquer une clé API"""
async with get_session() as session:
async for session in get_session():
service = ApiKeyService(session) service = ApiKeyService(session)
api_key = await service.get_by_id(key_id) result = await session.execute(select(ApiKey).where(ApiKey.id == key_id))
if not api_key: key = result.scalar_one_or_none()
logger.error(f" Clé {key_id} introuvable")
return
success = await service.revoke_api_key(key_id) if not key:
logger.error(f" Clé API '{key_id}' introuvable")
break
if success: key.is_active = False
logger.info(f" Clé révoquée: {api_key.name}") await session.commit()
print(f"\n Clé '{api_key.name}' révoquée avec succès")
else: logger.info(f" Clé API révoquée: {key.name}")
logger.error(" Erreur lors de la révocation") logger.info(f" ID: {key.id}")
logger.info(f" Préfixe: {key.key_prefix}")
break
async def verify_api_key_cmd(api_key: str): async def verify_api_key(api_key: str):
"""Vérifier une clé API""" """Vérifier une clé API"""
async with get_session() as session:
service = ApiKeyService(session)
api_key_obj = await service.verify_api_key(api_key)
if api_key_obj: async for session in get_session():
print("\n Clé API valide\n") service = ApiKeyService(session)
print(f" Nom: {api_key_obj.name}")
print(f" ID: {api_key_obj.id}") key = await service.verify_api_key(api_key)
print(f" Rate limit: {api_key_obj.rate_limit_per_minute} req/min")
print(f" Requêtes: {api_key_obj.total_requests}") if not key:
print(f" Expire le: {api_key_obj.expires_at or 'Jamais'}\n") logger.error(" Clé API invalide ou expirée")
else: break
print("\n Clé API invalide, expirée ou révoquée\n")
logger.info("=" * 60)
logger.info(" Clé API valide")
logger.info("=" * 60)
logger.info(f" Nom: {key.name}")
logger.info(f" ID: {key.id}")
logger.info(f" Rate limit: {key.rate_limit_per_minute} req/min")
logger.info(f" Requêtes totales: {key.total_requests}")
logger.info(f" Expire le: {key.expires_at or 'Jamais'}")
logger.info(f" Dernière utilisation: {key.last_used_at or 'Jamais'}")
logger.info("=" * 60)
break
async def main(): async def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Gestion de la sécurité Sage Dataven API" description="Gestion des utilisateurs Swagger et clés API"
) )
subparsers = parser.add_subparsers(dest="command", help="Commandes disponibles") subparsers = parser.add_subparsers(dest="command", help="Commandes disponibles")
swagger_parser = subparsers.add_parser( swagger_parser = subparsers.add_parser(
"swagger", help="Gestion utilisateurs Swagger" "swagger", help="Gestion des utilisateurs Swagger"
) )
swagger_subparsers = swagger_parser.add_subparsers(dest="action") swagger_subparsers = swagger_parser.add_subparsers(dest="swagger_command")
swagger_add = swagger_subparsers.add_parser("add", help="Ajouter un utilisateur") add_parser = swagger_subparsers.add_parser("add", help="Ajouter un utilisateur")
swagger_add.add_argument("username", help="Nom d'utilisateur") add_parser.add_argument("username", help="Nom d'utilisateur")
swagger_add.add_argument("password", help="Mot de passe") add_parser.add_argument("password", help="Mot de passe")
swagger_add.add_argument("--full-name", help="Nom complet") add_parser.add_argument("--full-name", help="Nom complet (optionnel)")
swagger_subparsers.add_parser("list", help="Lister les utilisateurs") swagger_subparsers.add_parser("list", help="Lister les utilisateurs")
swagger_delete = swagger_subparsers.add_parser( delete_parser = swagger_subparsers.add_parser(
"delete", help="Supprimer un utilisateur" "delete", help="Supprimer un utilisateur"
) )
swagger_delete.add_argument("username", help="Nom d'utilisateur") delete_parser.add_argument("username", help="Nom d'utilisateur")
apikey_parser = subparsers.add_parser("apikey", help="Gestion clés API") apikey_parser = subparsers.add_parser("apikey", help="Gestion des clés API")
apikey_subparsers = apikey_parser.add_subparsers(dest="action") apikey_subparsers = apikey_parser.add_subparsers(dest="apikey_command")
apikey_create = apikey_subparsers.add_parser("create", help="Créer une clé API") create_parser = apikey_subparsers.add_parser("create", help="Créer une clé API")
apikey_create.add_argument("name", help="Nom de la clé") create_parser.add_argument("name", help="Nom de la clé")
apikey_create.add_argument("--description", help="Description") create_parser.add_argument("--description", help="Description (optionnel)")
apikey_create.add_argument( create_parser.add_argument(
"--days", type=int, default=365, help="Expiration en jours" "--days", type=int, default=365, help="Jours avant expiration (défaut: 365)"
) )
apikey_create.add_argument( create_parser.add_argument(
"--rate-limit", type=int, default=60, help="Limite req/min" "--rate-limit", type=int, default=60, help="Requêtes par minute (défaut: 60)"
)
create_parser.add_argument(
"--endpoints",
nargs="+",
help="Endpoints autorisés (ex: /clients /articles)",
) )
apikey_create.add_argument("--endpoints", nargs="+", help="Endpoints autorisés")
apikey_subparsers.add_parser("list", help="Lister les clés") apikey_subparsers.add_parser("list", help="Lister les clés API")
apikey_revoke = apikey_subparsers.add_parser("revoke", help="Révoquer une clé") revoke_parser = apikey_subparsers.add_parser("revoke", help="Révoquer une clé")
apikey_revoke.add_argument("key_id", help="ID de la clé") revoke_parser.add_argument("key_id", help="ID de la clé")
apikey_verify = apikey_subparsers.add_parser("verify", help="Vérifier une clé") verify_parser = apikey_subparsers.add_parser("verify", help="Vérifier une clé")
apikey_verify.add_argument("api_key", help="Clé API à vérifier") verify_parser.add_argument("api_key", help="Clé API complète")
args = parser.parse_args() args = parser.parse_args()
@ -230,35 +281,40 @@ async def main():
return return
if args.command == "swagger": if args.command == "swagger":
if args.action == "add": if args.swagger_command == "add":
await add_swagger_user(args.username, args.password, args.full_name) await add_swagger_user(args.username, args.password, args.full_name)
elif args.action == "list": elif args.swagger_command == "list":
await list_swagger_users() await list_swagger_users()
elif args.action == "delete": elif args.swagger_command == "delete":
await delete_swagger_user(args.username) await delete_swagger_user(args.username)
else: else:
swagger_parser.print_help() swagger_parser.print_help()
elif args.command == "apikey": elif args.command == "apikey":
if args.action == "create": if args.apikey_command == "create":
await create_api_key( await create_api_key(
args.name, name=args.name,
args.description, description=args.description,
args.days, expires_in_days=args.days,
args.rate_limit, rate_limit=args.rate_limit,
args.endpoints, endpoints=args.endpoints,
) )
elif args.action == "list": elif args.apikey_command == "list":
await list_api_keys() await list_api_keys()
elif args.action == "revoke": elif args.apikey_command == "revoke":
await revoke_api_key(args.key_id) await revoke_api_key(args.key_id)
elif args.action == "verify": elif args.apikey_command == "verify":
await verify_api_key_cmd(args.api_key) await verify_api_key(args.api_key)
else: else:
apikey_parser.print_help() apikey_parser.print_help()
if __name__ == "__main__": if __name__ == "__main__":
from datetime import datetime try:
asyncio.run(main())
asyncio.run(main()) except KeyboardInterrupt:
logger.info("\n👋 Interrupted")
sys.exit(0)
except Exception as e:
logger.error(f" Erreur: {e}")
sys.exit(1)

2
tools/extract_pydantic_models.py
View file

@ -24,7 +24,6 @@ for node in tree.body:
continue continue
other_nodes.append(node) other_nodes.append(node)
# --- Extraction des classes ---
imports = """ imports = """
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing import Optional, List from typing import Optional, List
@ -44,7 +43,6 @@ for cls in pydantic_classes:
print(f"✅ Modèle extrait : {class_name} → {file_path}") print(f"✅ Modèle extrait : {class_name} → {file_path}")
# --- Réécriture du fichier source sans les modèles ---
new_tree = ast.Module(body=other_nodes, type_ignores=[]) new_tree = ast.Module(body=other_nodes, type_ignores=[])
new_source = ast.unparse(new_tree) new_source = ast.unparse(new_tree)