From b77ff9d96992be1e0a2d3ac2216fec667e81bc3e Mon Sep 17 00:00:00 2001 From: rearcher <123781007@qq.com> Date: Mon, 10 Mar 2025 19:36:48 +0800 Subject: [PATCH] Fix cve summary cve_num error --- 0002-fix-cve-summary-cveNum-error.patch | 25 +++++++++++++++++++++++++ aops-apollo.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0002-fix-cve-summary-cveNum-error.patch diff --git a/0002-fix-cve-summary-cveNum-error.patch b/0002-fix-cve-summary-cveNum-error.patch new file mode 100644 index 0000000..ef5f04a --- /dev/null +++ b/0002-fix-cve-summary-cveNum-error.patch @@ -0,0 +1,25 @@ +From 3a4c57a306d71d1dabf5b6ff4474d0f93d0d1da9 Mon Sep 17 00:00:00 2001 +From: rearcher <123781007@qq.com> +Date: Fri, 7 Mar 2025 11:12:02 +0800 +Subject: [PATCH] fix cve summary cve_num error + +--- + apollo/database/proxy/cve.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apollo/database/proxy/cve.py b/apollo/database/proxy/cve.py +index affb73a..b729dea 100644 +--- a/apollo/database/proxy/cve.py ++++ b/apollo/database/proxy/cve.py +@@ -1640,7 +1640,7 @@ class CveProxy(CveMysqlProxy, CveEsProxy): + cve_host_association_query = self.session.query(CveHostAssociation.cluster_id, CveHostAssociation.host_id, + CveHostAssociation.cve_id, CveHostAssociation.fixed, + CveHostAssociation.cve_id).filter( +- CveHostAssociation.host_id.in_(host_id_list)).all() ++ CveHostAssociation.host_id.in_(host_id_list), CveHostAssociation.fixed == False).all() + clusters = cache.get_user_clusters() + host_group = cache.get_user_group_hosts() + cluster_cve_status = self._query_cluster_cve_status(clusters, cve_host_association_query) +-- +Gitee + diff --git a/aops-apollo.spec b/aops-apollo.spec index b084503..872ef7f 100644 --- a/aops-apollo.spec +++ b/aops-apollo.spec @@ -1,11 +1,12 @@ Name: aops-apollo Version: v2.1.0 -Release: 2 +Release: 3 Summary: Cve management service, monitor machine vulnerabilities and provide fix functions. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz Patch0001: 0001-adapt-sqlschema-changes-and-fix-cve-summary.patch +Patch0002: 0002-fix-cve-summary-cveNum-error.patch BuildRequires: python3-setuptools Requires: aops-vulcanus >= v2.1.0 @@ -63,6 +64,9 @@ popd %{python3_sitelib}/aops_apollo_tool/* %changelog +* Mon Mar 10 2025 luxuexian - v2.1.0-3 +- Fix cve summary cve_num error + * Fri Feb 28 2025 luxuexian - v2.1.0-2 - Fixed exceptions in calling stored procedures and cases caused by SQLschema upgrade - Fixed errors reported in calling cve summary interface -- Gitee