Browse Source

Fix Bandit detection and update Trivy to v0.69.1

- Fix defusedxml import style in print_queue.py to be recognized by Bandit
  (use `import defusedxml.ElementTree as ET` not `from defusedxml import`)
- Update Trivy scanner version from 0.65.0 to 0.69.1
maziggy 3 months ago
parent
commit
46ba5ff417

+ 2 - 2
.github/workflows/security.yml

@@ -79,7 +79,7 @@ jobs:
           format: 'sarif'
           format: 'sarif'
           output: 'trivy-results.sarif'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH,MEDIUM'
           severity: 'CRITICAL,HIGH,MEDIUM'
-          trivy-version: 'v0.69.1'
+          version: 'v0.69.1'
 
 
       - name: Upload Trivy results to GitHub Security
       - name: Upload Trivy results to GitHub Security
         uses: github/codeql-action/upload-sarif@v4
         uses: github/codeql-action/upload-sarif@v4
@@ -96,7 +96,7 @@ jobs:
           format: 'sarif'
           format: 'sarif'
           output: 'trivy-config-results.sarif'
           output: 'trivy-config-results.sarif'
           severity: 'CRITICAL,HIGH,MEDIUM'
           severity: 'CRITICAL,HIGH,MEDIUM'
-          trivy-version: 'v0.69.1'
+          version: 'v0.69.1'
 
 
       - name: Upload Trivy config results
       - name: Upload Trivy config results
         uses: github/codeql-action/upload-sarif@v4
         uses: github/codeql-action/upload-sarif@v4

+ 1 - 1
backend/app/api/routes/print_queue.py

@@ -6,7 +6,7 @@ import zipfile
 from datetime import datetime
 from datetime import datetime
 from pathlib import Path
 from pathlib import Path
 
 
-from defusedxml import ElementTree as ET
+import defusedxml.ElementTree as ET
 from fastapi import APIRouter, Depends, HTTPException, Query
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy import func, select
 from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.asyncio import AsyncSession

File diff suppressed because it is too large
+ 0 - 0
static/assets/index-CwIN-fI6.js


+ 1 - 1
static/index.html

@@ -23,7 +23,7 @@
 
 
     <!-- Splash screens for iOS -->
     <!-- Splash screens for iOS -->
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
-    <script type="module" crossorigin src="/assets/index-Dc108DF_.js"></script>
+    <script type="module" crossorigin src="/assets/index-CwIN-fI6.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CosC5iN4.css">
     <link rel="stylesheet" crossorigin href="/assets/index-CosC5iN4.css">
   </head>
   </head>
   <body>
   <body>

Some files were not shown because too many files changed in this diff