Skip to content

chore: patch Jinja2 Jinja sandbox #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

chore: patch Jinja2 Jinja sandbox #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/container-build-octavia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,24 @@ jobs:
runs-on: ubuntu-latest
outputs:
openstack-constraints: ${{ steps.generate-matrix.outputs.openstack_constraints }}
ovnPluginTag: ${{ steps.generate-matrix.outputs.ovnPluginTag }}
steps:
- name: generate-matrix
id: generate-matrix
run: |
if [ "${{ github.event_name == 'workflow_dispatch' }}" = "true" ]; then
openstack_constraints="$(echo '${{ github.event.inputs.openstack-constraints }}' | jq -R '[select(length>0)]' | jq -c '.')"
ovnPluginTag="$(echo '${{ github.event.inputs.ovnPluginTag }}' | jq -R '[select(length>0)]' | jq -c '.')"
fi
echo "openstack_constraints=${openstack_constraints:-${{ env.openstack_constraints }}}" >> $GITHUB_OUTPUT
echo "ovnPluginTag=${ovnPluginTag:-${{ env.ovnPluginTag }}}" >> $GITHUB_OUTPUT
build-and-push-image:
needs:
- init
strategy:
matrix:
openstack-constraints: ${{ fromJSON(needs.init.outputs.openstack-constraints)}}
ovnPluginTag: ${{ fromJSON(needs.init.outputs.ovnPluginTag)}}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -114,7 +118,7 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
OVN_PLUGIN_VERSION=${{ github.event.inputs.ovnPluginTag }}
OVN_PLUGIN_VERSION=${{ matrix.ovnPluginTag }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
with:
Expand Down Expand Up @@ -158,4 +162,4 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
OVN_PLUGIN_VERSION=${{ github.event.inputs.ovnPluginTag }}
OVN_PLUGIN_VERSION=${{ matrix.ovnPluginTag }}
4 changes: 3 additions & 1 deletion scripts/glance-cve-patching.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
echo "No CVE patches in stable/2025.1"
# CVE fixes CVE-2025-27516
/var/lib/openstack/bin/pip install --upgrade \
"Jinja2==3.1.6"
elif [ ${OS_VERSION:-master} = "stable/2024.1" ]; then
# CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,
# CVE-2023-29483,CVE-2024-3651,CVE-2024-35195,CVE-2024-4340,CVE-2024-37891,CVE-2024-5569,CVE-2024-12797
Expand Down
4 changes: 3 additions & 1 deletion scripts/heat-cve-patching.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
echo "No CVE patches in stable/2025.1"
# CVE fixes CVE-2025-27516
/var/lib/openstack/bin/pip install --upgrade \
"Jinja2==3.1.6"
elif [ ${OS_VERSION:-master} = "stable/2024.1" ]; then
# CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,
# CVE-2023-29483,CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797
Expand Down
6 changes: 4 additions & 2 deletions scripts/keystone-cve-patching.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
echo "No CVE patches in stable/2025.1"
# CVE fixes CVE-2025-27516
/var/lib/openstack/bin/pip install --upgrade \
"Jinja2==3.1.6"
elif [ ${OS_VERSION:-master} = "stable/2024.1" ]; then
# CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,CVE-2024-36039,CVE-2024-42353,CVE-2024-34069,
# CVE-2024-49766,CVE-2024-49767,GHSA-h4gh-qq45-vh27,CVE-2023-29483,CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,
Expand All @@ -16,6 +18,6 @@ elif [ ${OS_VERSION:-master} = "stable/2024.1" ]; then
"dnspython>=2.6.1,<2.7" \
"eventlet>=0.35.2,<0.36" \
"idna>=3.7,<3.8" \
"requests>=2.32.0,<2.33" \
"requests==2.32.4" \
"urllib3==1.26.19"
fi
4 changes: 3 additions & 1 deletion scripts/octavia-cve-patching.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
echo "No CVE patches in stable/2025.1"
# CVE fixes CVE-2025-27516
/var/lib/openstack/bin/pip install --upgrade \
"Jinja2==3.1.6"
elif [ ${OS_VERSION:-master} = "stable/2024.1" ]; then
# CVE fixes CVE-2024-36039,CVE-2024-6827,CVE-2024-1135,CVE-2024-49767,CVE-2024-34069,CVE-2024-56326,CVE-2024-56326,CVE-2024-56201
# CVE-2024-35195,CVE-2024-37891,CVE-2024-3651,CVE-2023-29483,CVE-2024-49766,CVE-2024-42353,CVE-2025-27516,CVE-2024-34064
Expand Down