fix: minor fixes to make security scans work

canonical · Sep 25, 2024 · eabe6ca · eabe6ca
1 parent 58d3cec
commit eabe6ca
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/security-scan.yaml b/.github/workflows/security-scan.yaml
@@ -13,3 +13,4 @@ jobs:
     uses: lengau/starflow/.github/workflows/scan-python.yaml@work/secscan
     with:
       packages: python-apt-dev
+      osv-extra-args: '--config=source/osv-scanner.toml'
diff --git a/osv-scanner.toml b/osv-scanner.toml
@@ -0,0 +1,4 @@
+[[IgnoredVulns]]
+id = "CVE-2024-35195"
+ignoreUntil = "2025-01-01T00:00:00Z"
+reason = "Needed for requests-unixsocket, which we're replacing with requests-unixsocket2"
diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -199,5 +199,5 @@ yamllint==1.35.1
 zipp==3.20.2
 zope.deprecation==5.0
 zope.interface==7.0.3
-python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"
+python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz ; sys.platform == "linux"
 pyinstaller==5.13.2; sys.platform == "win32"
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -147,4 +147,4 @@ websockets==12.0
 wheel==0.44.0
 ws4py==0.5.1
 zipp==3.20.2
-python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"
+python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz ; sys.platform == "linux"
diff --git a/requirements.txt b/requirements.txt
@@ -78,4 +78,4 @@ wadllib==1.3.6
 wheel==0.44.0
 ws4py==0.5.1
 zipp==3.20.2
-python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"
+python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz ; sys.platform == "linux"
diff --git a/tools/freeze-requirements.sh b/tools/freeze-requirements.sh
@@ -5,7 +5,7 @@ requirements_fixups() {
 
   # Python apt library pinned to source.
   sed -i '/python-apt=*/d' "$req_file"
-  echo 'python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"' >> "$req_file"
+  echo 'python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz ; sys.platform == "linux"' >> "$req_file"
 
   # https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
   sed -i '/pkg[-_]resources==0.0.0/d' "$req_file"