diff --git a/.trivyignore b/.trivyignore index 661c9fb2..e41d5e0c 100644 --- a/.trivyignore +++ b/.trivyignore @@ -53,3 +53,7 @@ CVE-2024-52804 # Fix ongoing: # https://github.com/element-hq/synapse/pull/17985 CVE-2024-53981 +# The 3 following CVEs will be fixed by Synapse 1.120.2 +CVE-2024-52805 +CVE-2024-52815 +CVE-2024-53863 diff --git a/requirements.txt b/requirements.txt index 9d4d3379..02994b02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ deepdiff ==8.0.1 jinja2 ==3.1.4 jsonschema ==4.23.0 ops ==2.17.1 -pydantic ==2.10.2 +pydantic ==2.10.3 psycopg2-binary ==2.9.10 requests ==2.32.3 diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 2dfe7dd9..5a3e99e6 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -378,6 +378,7 @@ async def test_nginx_route_integration( assert "Welcome to the Matrix" in response.text +@pytest.mark.usefixtures("postgresql_app") @pytest.mark.mjolnir async def test_synapse_enable_mjolnir( ops_test: OpsTest,