fix bug with host count in cve fix task
(cherry picked from commit 278f7d922eccd546014773c30f84fa76ef655d6d)
This commit is contained in:
parent
837ac8ee5c
commit
fd9198a358
25
0006-fix-bug-with-host-count-in-cve-fix-task.patch
Normal file
25
0006-fix-bug-with-host-count-in-cve-fix-task.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From dffeb775d77e1c608eed8dc9553fcc46ebbfc450 Mon Sep 17 00:00:00 2001
|
||||||
|
From: root <root@localhost.localdomain>
|
||||||
|
Date: Wed, 24 Jul 2024 16:46:56 +0800
|
||||||
|
Subject: [PATCH 1/1] fix bug with host count in cve fix task
|
||||||
|
|
||||||
|
---
|
||||||
|
apollo/database/proxy/task/cve_fix.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/apollo/database/proxy/task/cve_fix.py b/apollo/database/proxy/task/cve_fix.py
|
||||||
|
index efdc91e..468c03a 100644
|
||||||
|
--- a/apollo/database/proxy/task/cve_fix.py
|
||||||
|
+++ b/apollo/database/proxy/task/cve_fix.py
|
||||||
|
@@ -133,7 +133,8 @@ class CveFixTaskProxy(TaskProxy):
|
||||||
|
return PARAM_ERROR, dict()
|
||||||
|
|
||||||
|
for task_info in fix_host_rpm_info:
|
||||||
|
- wait_fix_rpms[task_info["cve_id"]] = dict(rpms=task_info.get("rpms", []), hosts=list(host_dict.keys()))
|
||||||
|
+ host_list = [host_info["host_id"] for host_info in task_info["host_info"]]
|
||||||
|
+ wait_fix_rpms[task_info["cve_id"]] = dict(rpms=task_info.get("rpms", []), hosts=host_list)
|
||||||
|
|
||||||
|
hotpatch_fix_rpms, coldpatch_fix_rpms = self._get_cold_and_hotpatch_fix_rpm(wait_fix_rpms, data["takeover"])
|
||||||
|
fix_tasks = []
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: aops-apollo
|
Name: aops-apollo
|
||||||
Version: v1.4.1
|
Version: v1.4.1
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Cve management service, monitor machine vulnerabilities and provide fix functions.
|
Summary: Cve management service, monitor machine vulnerabilities and provide fix functions.
|
||||||
License: MulanPSL2
|
License: MulanPSL2
|
||||||
URL: https://gitee.com/openeuler/%{name}
|
URL: https://gitee.com/openeuler/%{name}
|
||||||
@ -10,6 +10,7 @@ Patch0002: 0002-fix-the-query-error-of-cve-associated-host.patch
|
|||||||
Patch0003: 0003-update-verification-method-for-host-ip-fieldl.patch
|
Patch0003: 0003-update-verification-method-for-host-ip-fieldl.patch
|
||||||
Patch0004: 0004-fix-TimedCorrectTask.patch
|
Patch0004: 0004-fix-TimedCorrectTask.patch
|
||||||
Patch0005: 0005-add-reboot-field-to-query-host-info-api.patch
|
Patch0005: 0005-add-reboot-field-to-query-host-info-api.patch
|
||||||
|
Patch0006: 0006-fix-bug-with-host-count-in-cve-fix-task.patch
|
||||||
|
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
Requires: aops-vulcanus >= v1.3.0
|
Requires: aops-vulcanus >= v1.3.0
|
||||||
@ -72,6 +73,9 @@ popd
|
|||||||
%{python3_sitelib}/aops_apollo_tool/*
|
%{python3_sitelib}/aops_apollo_tool/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 24 2024 wenxin<wenxin32@foxmail.com> - v1.4.1-4
|
||||||
|
- fix bug with host count in cve fix task
|
||||||
|
|
||||||
* Fri Dec 22 2023 wenxin<wenxin32@foxmail.com> - v1.4.1-3
|
* Fri Dec 22 2023 wenxin<wenxin32@foxmail.com> - v1.4.1-3
|
||||||
- fix the query error of cve associated host
|
- fix the query error of cve associated host
|
||||||
- update verification method for host ip fieldl;fix repo field filter error
|
- update verification method for host ip fieldl;fix repo field filter error
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user