From 96b8c0526ab5386222c691783f0b592b86010576 Mon Sep 17 00:00:00 2001 From: aedan Date: Wed, 26 Feb 2025 10:42:43 -0600 Subject: [PATCH 01/11] Update enterprise-patching.yaml --- .github/workflows/enterprise-patching.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/enterprise-patching.yaml b/.github/workflows/enterprise-patching.yaml index ff5ad6ed3..36122b435 100644 --- a/.github/workflows/enterprise-patching.yaml +++ b/.github/workflows/enterprise-patching.yaml @@ -7,7 +7,7 @@ on: types: - completed branches: - - main + - cve-testing jobs: generate-matrix: @@ -98,6 +98,7 @@ jobs: # Filter cve/requirements.txt to only update installed packages docker run --rm -v "$(pwd):/output" "$intermediate_image" sh -c "/var/lib/openstack/bin/pip3 list --format=json > /output/installed.json 2>/dev/null || echo '[]' > /output/installed.json" python3 cve/filter.py + cat filtered-requirements.txt if [ -s "filtered-requirements.txt" ]; then echo "Applying Python package updates from cve/requirements.txt" From 9f8ab4a6f6a6ec98a842412d83538b082255d983 Mon Sep 17 00:00:00 2001 From: aedan Date: Fri, 28 Feb 2025 09:21:04 -0600 Subject: [PATCH 02/11] Update filter.py --- cve/filter.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cve/filter.py b/cve/filter.py index cf6f1a96f..5ce264061 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -2,9 +2,10 @@ try: with open("installed.json") as f: - installed = {pkg["name"].lower(): pkg["version"] for pkg in json.load(f)} + # Only store package names for comparison, ignore versions + installed = {pkg["name"].lower() for pkg in json.load(f)} except (json.JSONDecodeError, FileNotFoundError): - installed = {} + installed = set() with open("requirements.txt") as f: requirements = [ @@ -13,8 +14,10 @@ filtered = [] for req in requirements: + # Only get package name for comparison pkg_name = req.split("==")[0].strip().lower() if pkg_name in installed: + # Add the full original requirement (including version) filtered.append(req) with open("filtered-requirements.txt", "w") as f: From b183e17ff3cd259e75fd088524f8ceca636d7fed Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 09:28:26 -0600 Subject: [PATCH 03/11] Update filter.py --- cve/filter.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cve/filter.py b/cve/filter.py index 5ce264061..67ffa38c5 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -7,11 +7,19 @@ except (json.JSONDecodeError, FileNotFoundError): installed = set() +print("Installed packages:") +print("\n".join(sorted(installed)) if installed else "No installed packages found") +print("\n" + "="*50 + "\n") + with open("requirements.txt") as f: requirements = [ line.strip() for line in f if line.strip() and not line.startswith("#") ] +print("Requirements from requirements.txt:") +print("\n".join(requirements) if requirements else "No requirements found") +print("\n" + "="*50 + "\n") + filtered = [] for req in requirements: # Only get package name for comparison @@ -20,5 +28,9 @@ # Add the full original requirement (including version) filtered.append(req) +print("Filtered requirements (matching installed packages):") +print("\n".join(filtered) if filtered else "No matching packages found") +print("\n" + "="*50 + "\n") + with open("filtered-requirements.txt", "w") as f: f.write("\n".join(filtered)) From fe8645d96c158c3023a931601344dd3e8bc58624 Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 09:42:09 -0600 Subject: [PATCH 04/11] cve-fix --- .github/workflows/enterprise-patching.yaml | 1 - cve/filter.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/enterprise-patching.yaml b/.github/workflows/enterprise-patching.yaml index 36122b435..add3435b6 100644 --- a/.github/workflows/enterprise-patching.yaml +++ b/.github/workflows/enterprise-patching.yaml @@ -98,7 +98,6 @@ jobs: # Filter cve/requirements.txt to only update installed packages docker run --rm -v "$(pwd):/output" "$intermediate_image" sh -c "/var/lib/openstack/bin/pip3 list --format=json > /output/installed.json 2>/dev/null || echo '[]' > /output/installed.json" python3 cve/filter.py - cat filtered-requirements.txt if [ -s "filtered-requirements.txt" ]; then echo "Applying Python package updates from cve/requirements.txt" diff --git a/cve/filter.py b/cve/filter.py index 67ffa38c5..19eda8cda 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -11,7 +11,7 @@ print("\n".join(sorted(installed)) if installed else "No installed packages found") print("\n" + "="*50 + "\n") -with open("requirements.txt") as f: +with open("cve/requirements.txt") as f: requirements = [ line.strip() for line in f if line.strip() and not line.startswith("#") ] From cffec32736108fa1650668ca75a8178ca996d87c Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 10:10:35 -0600 Subject: [PATCH 05/11] Update requirements.txt --- cve/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cve/requirements.txt b/cve/requirements.txt index df136f1b1..b2805b356 100644 --- a/cve/requirements.txt +++ b/cve/requirements.txt @@ -1 +1,2 @@ pymysql==1.1.1 +jinja2==3.1.5 From e91a5d82d97ad941b66869c087bec3551aa285ca Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 10:26:38 -0600 Subject: [PATCH 06/11] Update requirements.txt --- cve/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cve/requirements.txt b/cve/requirements.txt index b2805b356..54f7f5291 100644 --- a/cve/requirements.txt +++ b/cve/requirements.txt @@ -1,2 +1,4 @@ pymysql==1.1.1 jinja2==3.1.5 +idna==3.7 +webob==1.8.8 From f303154713b0b4b531dde6a6d47e68ef0f58781c Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 11:00:45 -0600 Subject: [PATCH 07/11] Update requirements.txt --- cve/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cve/requirements.txt b/cve/requirements.txt index 54f7f5291..31b6008aa 100644 --- a/cve/requirements.txt +++ b/cve/requirements.txt @@ -2,3 +2,4 @@ pymysql==1.1.1 jinja2==3.1.5 idna==3.7 webob==1.8.8 +virtualenv==20.26.6 From 0cda55c54eae6077901f350da95dfe54eb2e3504 Mon Sep 17 00:00:00 2001 From: Jake Briggs Date: Mon, 3 Mar 2025 11:17:30 -0600 Subject: [PATCH 08/11] Update filter.py --- cve/filter.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cve/filter.py b/cve/filter.py index 19eda8cda..3313e748d 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -9,7 +9,7 @@ print("Installed packages:") print("\n".join(sorted(installed)) if installed else "No installed packages found") -print("\n" + "="*50 + "\n") +print("\n" + "=" * 50 + "\n") with open("cve/requirements.txt") as f: requirements = [ @@ -18,7 +18,7 @@ print("Requirements from requirements.txt:") print("\n".join(requirements) if requirements else "No requirements found") -print("\n" + "="*50 + "\n") +print("\n" + "=" * 50 + "\n") filtered = [] for req in requirements: @@ -30,7 +30,8 @@ print("Filtered requirements (matching installed packages):") print("\n".join(filtered) if filtered else "No matching packages found") -print("\n" + "="*50 + "\n") +print("\n" + "=" * 50 + "\n") with open("filtered-requirements.txt", "w") as f: f.write("\n".join(filtered)) + From 5f6c414b785478d72c521c00e6e520ef1de0cd69 Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 11:21:20 -0600 Subject: [PATCH 09/11] Update filter.py Removed whitespace --- cve/filter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cve/filter.py b/cve/filter.py index 3313e748d..a36fd14fa 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -34,4 +34,4 @@ with open("filtered-requirements.txt", "w") as f: f.write("\n".join(filtered)) - + From 9523d6f752d19508b074b16ac0befb33f11df7bf Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 11:27:10 -0600 Subject: [PATCH 10/11] Update filter.py Removed trailing line --- cve/filter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cve/filter.py b/cve/filter.py index a36fd14fa..a9f4f3ffe 100644 --- a/cve/filter.py +++ b/cve/filter.py @@ -34,4 +34,3 @@ with open("filtered-requirements.txt", "w") as f: f.write("\n".join(filtered)) - From ff60626050b577cd71a63407724745e3de958f4a Mon Sep 17 00:00:00 2001 From: aedan Date: Mon, 3 Mar 2025 11:30:11 -0600 Subject: [PATCH 11/11] Update enterprise-patching.yaml Updated workflow to run on main branch --- .github/workflows/enterprise-patching.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/enterprise-patching.yaml b/.github/workflows/enterprise-patching.yaml index add3435b6..ff5ad6ed3 100644 --- a/.github/workflows/enterprise-patching.yaml +++ b/.github/workflows/enterprise-patching.yaml @@ -7,7 +7,7 @@ on: types: - completed branches: - - cve-testing + - main jobs: generate-matrix: