diff --git a/changelog/66377.security.md b/changelog/66377.security.md new file mode 100644 index 00000000000..58f36f19402 --- /dev/null +++ b/changelog/66377.security.md @@ -0,0 +1 @@ +Bump to `idna==3.7` due to https://github.com/advisories/GHSA-jjg7-2v4v-x38h diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index b3fe2968347..645d693b97a 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -200,7 +200,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 47f53c1c105..701d47566a6 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -142,7 +142,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/darwin.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 0907c47fff0..5c03532e9dd 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.10/linux.txt # requests diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 2a452b0beed..a8789fbbb6e 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -135,7 +135,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 3a9e5ef0aeb..9b7103359fc 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -206,7 +206,7 @@ hglib==2.6.1 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 2994f474b8e..a823a17ce44 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -144,7 +144,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.10/tools-virustotal.txt b/requirements/static/ci/py3.10/tools-virustotal.txt index e190ae38537..20a8ecda788 100644 --- a/requirements/static/ci/py3.10/tools-virustotal.txt +++ b/requirements/static/ci/py3.10/tools-virustotal.txt @@ -12,7 +12,7 @@ charset-normalizer==3.2.0 # via # -c requirements/static/ci/../ci/py3.10/tools.txt # requests -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../ci/py3.10/tools.txt # requests diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index d1fa49b0c1e..d3ba95cc4dc 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -20,7 +20,7 @@ certifi==2023.7.22 # via requests charset-normalizer==3.2.0 # via requests -idna==3.2 +idna==3.7 # via requests jinja2==3.1.3 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 3fb15774d5a..dd5d083a205 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -133,7 +133,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 439c6a2658a..b2b6f791cb4 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -192,7 +192,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 17f8605d289..78799c59388 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -135,7 +135,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/darwin.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/darwin.txt diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index ecb28a67c76..a377096a87b 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.11/linux.txt # requests diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index ebda3f766f7..8ad7d0dc3aa 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -131,7 +131,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 68d0bf5b091..cf899756373 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -202,7 +202,7 @@ hglib==2.6.1 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 6350e886c5b..4773fc90f5a 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -140,7 +140,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.11/tools-virustotal.txt b/requirements/static/ci/py3.11/tools-virustotal.txt index 53b23befa51..3903aa1fe26 100644 --- a/requirements/static/ci/py3.11/tools-virustotal.txt +++ b/requirements/static/ci/py3.11/tools-virustotal.txt @@ -12,7 +12,7 @@ charset-normalizer==3.2.0 # via # -c requirements/static/ci/../ci/py3.11/tools.txt # requests -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../ci/py3.11/tools.txt # requests diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt index 397f8301eb0..d3689d50008 100644 --- a/requirements/static/ci/py3.11/tools.txt +++ b/requirements/static/ci/py3.11/tools.txt @@ -22,7 +22,7 @@ charset-normalizer==3.2.0 # via requests commonmark==0.9.1 # via rich -idna==3.2 +idna==3.7 # via requests jinja2==3.1.3 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index d49d0169454..a61bac19fd5 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -129,7 +129,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index ac6b59334f3..c2531dd77ab 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -192,7 +192,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.12/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 16eec56e0c2..05c19382076 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -135,7 +135,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/darwin.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # -r requirements/darwin.txt diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index f0e444c2a12..3be0e7d9cf4 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.12/linux.txt # requests diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index a7fec8f3818..d0768533f40 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -131,7 +131,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index a8e6fcb95cb..cf8bd7b28b1 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -202,7 +202,7 @@ hglib==2.6.1 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index a0713246636..1f88bac2c3d 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -140,7 +140,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.12/tools-virustotal.txt b/requirements/static/ci/py3.12/tools-virustotal.txt index d3ec2bf101a..e6245dfada1 100644 --- a/requirements/static/ci/py3.12/tools-virustotal.txt +++ b/requirements/static/ci/py3.12/tools-virustotal.txt @@ -12,7 +12,7 @@ charset-normalizer==3.2.0 # via # -c requirements/static/ci/../ci/py3.12/tools.txt # requests -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../ci/py3.12/tools.txt # requests diff --git a/requirements/static/ci/py3.12/tools.txt b/requirements/static/ci/py3.12/tools.txt index 86fa24e6762..2ab7576919f 100644 --- a/requirements/static/ci/py3.12/tools.txt +++ b/requirements/static/ci/py3.12/tools.txt @@ -22,7 +22,7 @@ charset-normalizer==3.2.0 # via requests commonmark==0.9.1 # via rich -idna==3.2 +idna==3.7 # via requests jinja2==3.1.3 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 5c76fa91d86..f0e37c3ca14 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -129,7 +129,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 2e8f937d2d1..e23530c06c7 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -216,7 +216,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.7/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.7/linux.txt # -c requirements/static/ci/py3.7/linux.txt diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index e7d3faf34fe..fe2340ca4c1 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.16 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.7/linux.txt # requests diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 44ed4dae91e..72262e524fb 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -148,7 +148,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 3f9b2be743b..a141ce6f364 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -154,7 +154,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.7/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 58b6206425d..f17c5f42902 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -140,7 +140,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.7/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 792175da6bb..55842ca0982 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -211,7 +211,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.8/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # -c requirements/static/ci/py3.8/linux.txt diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 94c72d532f1..de56bd1ea23 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.16 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.8/linux.txt # requests diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index a0c474ff8a9..586e0ad6079 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -143,7 +143,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 967e1a499f6..bd672e11c19 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -212,7 +212,7 @@ hglib==2.6.1 # via # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # -c requirements/static/ci/py3.8/linux.txt diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index b76d2e33ed9..c755baf3ebd 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -149,7 +149,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 92cd57f437f..3119bb83c7f 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -135,7 +135,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # etcd3-py diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index daee62668a3..6f88706d8c5 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -211,7 +211,7 @@ google-auth==2.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index ba5eb8676aa..20c4db16b77 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -150,7 +150,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/darwin.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 3dd84014f31..ddc546dc62a 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -34,7 +34,7 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/py3.9/linux.txt # requests diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 398858ee56e..8f12c43c47c 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -143,7 +143,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/freebsd.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # etcd3-py diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 270a0b4de21..240728b3a73 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -208,7 +208,7 @@ hglib==2.6.1 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 76dbe51c84d..e672ef2cdfc 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -147,7 +147,7 @@ google-auth==2.1.0 # via kubernetes hglib==2.6.1 # via -r requirements/static/ci/linux.in -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # etcd3-py diff --git a/requirements/static/ci/py3.9/tools-virustotal.txt b/requirements/static/ci/py3.9/tools-virustotal.txt index 6154582577b..371670a183b 100644 --- a/requirements/static/ci/py3.9/tools-virustotal.txt +++ b/requirements/static/ci/py3.9/tools-virustotal.txt @@ -12,7 +12,7 @@ charset-normalizer==3.2.0 # via # -c requirements/static/ci/../ci/py3.9/tools.txt # requests -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../ci/py3.9/tools.txt # requests diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index ed7d3c67870..974aad9e17d 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -20,7 +20,7 @@ certifi==2023.7.22 # via requests charset-normalizer==3.2.0 # via requests -idna==3.2 +idna==3.7 # via requests jinja2==3.1.3 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index a0bd7b814e4..dbc6ed9c7de 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -135,7 +135,7 @@ gitpython==3.1.41 # -r requirements/windows.txt google-auth==2.1.0 # via kubernetes -idna==3.2 +idna==3.7 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # etcd3-py diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 9c92b03852e..e8b4610642a 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -28,7 +28,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/darwin.txt -idna==3.2 +idna==3.7 # via # -r requirements/darwin.txt # requests diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index ebd3707e633..98a2ff62677 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index ac1f4b58560..a06c6981ad3 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index cefe076fc3c..4dd729c7311 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index d2594941cd8..0d1ff97f085 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -28,7 +28,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/darwin.txt -idna==3.2 +idna==3.7 # via # -r requirements/darwin.txt # requests diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index f5087a75ea3..b0080ed5df2 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 072bbfde5f4..c6c91baabae 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index c0f7f2f0f36..3990ac7cbda 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 0b9003bdeb7..25a48454f5b 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -28,7 +28,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/darwin.txt -idna==3.2 +idna==3.7 # via # -r requirements/darwin.txt # requests diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index a3533b112db..6413a4b95a6 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index e99201d77ba..f409f30b62e 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 45ce976894d..2e33fb80ab9 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index a5c42668fb9..0bda53f2c9a 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 3e5d365f8cd..fd3bfc55945 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index d8eb2fbac87..b264b0e4d0b 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 772356efc5f..b1078d247f8 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index d1611731952..355c18332ad 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 4728a2a3ff3..9fc54be73a6 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index e4ee5a56c3b..156ae25128c 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -28,7 +28,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/darwin.txt -idna==3.2 +idna==3.7 # via # -r requirements/darwin.txt # requests diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 16e23f4cfc2..c08ba64674a 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -24,7 +24,7 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 362aedaa1d4..5f0f8679f1e 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -22,7 +22,7 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index db13666f901..0c5e2d7fc66 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -33,7 +33,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.41 # via -r requirements/windows.txt -idna==3.2 +idna==3.7 # via requests immutables==0.15 # via contextvars diff --git a/tests/pytests/unit/utils/test_x509.py b/tests/pytests/unit/utils/test_x509.py index ab7384ffde2..d91c1d61ab6 100644 --- a/tests/pytests/unit/utils/test_x509.py +++ b/tests/pytests/unit/utils/test_x509.py @@ -7,19 +7,10 @@ import salt.exceptions import salt.utils.x509 as x509 from tests.support.mock import ANY, Mock, patch -try: - import cryptography - import cryptography.x509 as cx509 - - HAS_LIBS = True -except ImportError: - HAS_LIBS = False - -pytestmark = [ - pytest.mark.skipif(HAS_LIBS is False, reason="Needs cryptography library") -] - -CRYPTOGRAPHY_VERSION = tuple(int(x) for x in cryptography.__version__.split(".")) +cryptography = pytest.importorskip( + "cryptography", reason="Needs cryptography library", minversion="37.0" +) +cx509 = pytest.importorskip("cryptography.x509", reason="Needs cryptography library") @pytest.fixture @@ -701,10 +692,6 @@ class TestCreateExtension: ) ], True, - marks=pytest.mark.skipif( - CRYPTOGRAPHY_VERSION[0] < 37, - reason="At least cryptography v37 is required for parsing RFC4514 strings", - ), ), ], ) @@ -1144,10 +1131,6 @@ class TestCreateExtension: ] ), ], - marks=pytest.mark.skipif( - CRYPTOGRAPHY_VERSION[0] < 37, - reason="At least cryptography v37 is required for parsing RFC4514 strings", - ), ), ( ( @@ -1238,7 +1221,7 @@ class TestCreateExtension: ( ("DNS", "می\u200cخواهم\u200c.iran"), salt.exceptions.CommandExecutionError, - "^Unknown codepoint adjacent to joiner.* at position 9", + r"Joiner U\+200C not allowed at position 9 in '.*'", ), ( ("DNS", ".*.wildcard-dot.test"), @@ -1426,10 +1409,6 @@ def test_parse_general_names_rejects_invalid(inpt): cx509.NameAttribute(x509.NAME_ATTRS_OID["O"], "Example Inc"), cx509.NameAttribute(x509.NAME_ATTRS_OID["CN"], "example.com"), ], - marks=pytest.mark.skipif( - CRYPTOGRAPHY_VERSION[0] < 37, - reason="At least cryptography v37 is required for parsing RFC4514 strings", - ), ), pytest.param( ["C=US", "O=Example Inc", "CN=example.com"], @@ -1438,10 +1417,6 @@ def test_parse_general_names_rejects_invalid(inpt): cx509.NameAttribute(x509.NAME_ATTRS_OID["O"], "Example Inc"), cx509.NameAttribute(x509.NAME_ATTRS_OID["CN"], "example.com"), ], - marks=pytest.mark.skipif( - CRYPTOGRAPHY_VERSION[0] < 37, - reason="At least cryptography v37 is required for parsing RFC4514 strings", - ), ), pytest.param( ["C=US", "O=Example Inc", "OU=foo+CN=example.com"], @@ -1455,10 +1430,6 @@ def test_parse_general_names_rejects_invalid(inpt): } ), ], - marks=pytest.mark.skipif( - CRYPTOGRAPHY_VERSION[0] < 37, - reason="At least cryptography v37 is required for parsing RFC4514 strings", - ), ), ( {"CN": "example.com", "O": "Example Inc", "C": "US", "irrelevant": "bar"},