diff --git a/app/routers/qualys.py b/app/routers/qualys.py index bc62290..16cf5fc 100644 --- a/app/routers/qualys.py +++ b/app/routers/qualys.py @@ -933,9 +933,17 @@ async def qualys_deploy_page(request: Request, db=Depends(get_db)): # Filtre les keys actives uniquement active_keys = [k for k in api_keys if (k.get("status") or "").upper() == "ACTIVE"] - # Activation par defaut : 1er active de l'API si dispo, sinon secret stocke - default_activation = active_keys[0]["key"] if active_keys else \ - (get_secret(db, "qualys_activation_id") or "") + # Separe par OS (Qualys retourne le champ type: WINDOWS / LINUX / etc.) + keys_windows = [k for k in active_keys if "WIN" in (k.get("type") or "").upper()] + keys_linux = [k for k in active_keys if "LINUX" in (k.get("type") or "").upper() or "LIN" in (k.get("type") or "").upper()] + + # Defaults par OS : settings ou 1ere key de chaque type + default_act_win = get_secret(db, "qualys_activation_id_windows") or \ + (keys_windows[0]["key"] if keys_windows else "") + default_act_lin = get_secret(db, "qualys_activation_id_linux") or \ + (keys_linux[0]["key"] if keys_linux else "") + # Backward compat : si le settings legacy existe, l'utiliser pour Linux + default_activation = default_act_lin or get_secret(db, "qualys_activation_id") or "" # Server URI deduit de l'URL Qualys (qualysapi.qualys.eu -> qagpublic.qg2) qualys_url = get_secret(db, "qualys_url") or "" @@ -955,7 +963,11 @@ async def qualys_deploy_page(request: Request, db=Depends(get_db)): "packages": packages, "servers": servers, "activation_id": default_activation, - "available_keys": active_keys, # pour le dropdown UI + "activation_id_windows": default_act_win, + "activation_id_linux": default_act_lin, + "available_keys": active_keys, + "keys_windows": keys_windows, + "keys_linux": keys_linux, "customer_id": get_secret(db, "qualys_customer_id") or "", "server_uri": server_uri, "msg": request.query_params.get("msg", ""), diff --git a/app/templates/qualys_deploy.html b/app/templates/qualys_deploy.html index 6c85326..5a4bae0 100644 --- a/app/templates/qualys_deploy.html +++ b/app/templates/qualys_deploy.html @@ -22,17 +22,23 @@