adminmpmcz/patchcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Qualys sync multi-pass: filtres SRV/server/SED/SEI/EMV pour couvrir tags heterogenes

Browse Source
This commit is contained in:
Pierre & Lumière 2026-04-15 12:17:02 +02:00
parent 2746188f1c
commit 1a1af9e28a
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/services/qualys_service.py
View File

@ -574,7 +574,7 @@ def _refresh_all_agents_impl(db):
stats = {"created": 0, "updated": 0, "errors": 0, "pages": 0} stats = {"created": 0, "updated": 0, "errors": 0, "pages": 0}
last_id = None last_id = None
max_pages = 20 # garde-fou max_pages = 30 # garde-fou par filtre (multi-pass = max_pages * nb_filtres)
# Autocommit sur la session courante # Autocommit sur la session courante
try: try:
@ -582,15 +582,22 @@ def _refresh_all_agents_impl(db):
except Exception: except Exception:
pass pass
while stats["pages"] < max_pages: # Multi-pass : plusieurs filtres tagName CONTAINS pour couvrir la
# nomenclature heterogene (SRV, server, SED, SEI, EMV...).
# Doublons gere par ON CONFLICT/UPDATE sur qualys_asset_id.
tag_filters = ["SRV", "server", "SED", "SEI", "EMV"]
current_filter_idx = 0
last_id = None
while current_filter_idx < len(tag_filters):
tag_filter = tag_filters[current_filter_idx]
if _refresh_cancel.is_set(): if _refresh_cancel.is_set():
stats["ok"] = True stats["ok"] = True
stats["cancelled"] = True stats["cancelled"] = True
stats["msg"] = f"Annulé après {stats['pages']} pages: {stats['created']} créés, {stats['updated']} mis à jour" stats["msg"] = f"Annulé apres {stats['pages']} pages (filtre={tag_filter}): {stats['created']} créés, {stats['updated']} mis à jour"
return stats return stats
stats["pages"] += 1 stats["pages"] += 1
# CONTAINS SRV matche OS-WIN-SRV DYN / OS-LIN-SRV DYN (nomenclature SANEF v3) criteria = [{"field": "tagName", "operator": "CONTAINS", "value": tag_filter}]
criteria = [{"field": "tagName", "operator": "CONTAINS", "value": "SRV"}]
if last_id: if last_id:
criteria.append({"field": "id", "operator": "GREATER", "value": str(last_id)}) criteria.append({"field": "id", "operator": "GREATER", "value": str(last_id)})
payload = {"ServiceRequest": { payload = {"ServiceRequest": {
@ -710,14 +717,15 @@ def _refresh_all_agents_impl(db):
db.commit() db.commit()
if "<hasMoreRecords>true</hasMoreRecords>" not in r.text: # Filtre actuel: page suivante OU passe au prochain filtre
break if "<hasMoreRecords>true</hasMoreRecords>" not in r.text or new_last_id == last_id:
if new_last_id == last_id: current_filter_idx += 1
break last_id = None
last_id = new_last_id else:
last_id = new_last_id
stats["ok"] = True stats["ok"] = True
stats["msg"] = f"{stats['created']} créés, {stats['updated']} mis à jour ({stats['pages']} pages, {stats['errors']} erreurs)" stats["msg"] = f"{stats['created']} créés, {stats['updated']} mis à jour ({stats['pages']} pages, {stats['errors']} erreurs, {len(tag_filters)} filtres)"
return stats return stats