saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '3006.x' into nice

Browse source
This commit is contained in:
Thomas Phipps 2024-04-16 12:48:23 -07:00 • committed by GitHub
commit 698c736477
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 133 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/66377.security.md Normal file
View file

@ -0,0 +1 @@
Bump to `idna==3.7` due to https://github.com/advisories/GHSA-jjg7-2v4v-x38h

6
requirements/static/ci/py3.10/cloud.txt
View file

@ -146,7 +146,7 @@ distro==1.5.0
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -646,7 +646,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.10/darwin.txt
View file

@ -105,7 +105,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -449,7 +449,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/docs.txt
View file

@ -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

6
requirements/static/ci/py3.10/freebsd.txt
View file

@ -103,7 +103,7 @@ distro==1.5.0
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -441,7 +441,7 @@ six==1.16.0
# websocket-client
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.10/lint.txt
View file

@ -156,7 +156,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -624,7 +624,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.10/linux.txt
View file

@ -112,7 +112,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -484,7 +484,7 @@ slack-sdk==3.19.5
# via slack-bolt
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/tools-virustotal.txt
View file

@ -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

2
requirements/static/ci/py3.10/tools.txt
View file

@ -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

6
requirements/static/ci/py3.10/windows.txt
View file

@ -98,7 +98,7 @@ distro==1.5.0
# pytest-skip-markers
dmidecode==0.9.0
# via -r requirements/static/ci/windows.in
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -434,7 +434,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.11/cloud.txt
View file

@ -142,7 +142,7 @@ distro==1.5.0
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -601,7 +601,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.11/darwin.txt
View file

@ -100,7 +100,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -414,7 +414,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.11/docs.txt
View file

@ -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

6
requirements/static/ci/py3.11/freebsd.txt
View file

@ -101,7 +101,7 @@ distro==1.5.0
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -411,7 +411,7 @@ six==1.16.0
# websocket-client
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.11/lint.txt
View file

@ -152,7 +152,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -582,7 +582,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.11/linux.txt
View file

@ -110,7 +110,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -454,7 +454,7 @@ slack-sdk==3.19.5
# via slack-bolt
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.11/tools-virustotal.txt
View file

@ -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

2
requirements/static/ci/py3.11/tools.txt
View file

@ -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

6
requirements/static/ci/py3.11/windows.txt
View file

@ -96,7 +96,7 @@ distro==1.5.0
# pytest-skip-markers
dmidecode==0.9.0
# via -r requirements/static/ci/windows.in
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -430,7 +430,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.12/cloud.txt
View file

@ -142,7 +142,7 @@ distro==1.5.0
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -601,7 +601,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.12/darwin.txt
View file

@ -100,7 +100,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -414,7 +414,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.12/docs.txt
View file

@ -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

6
requirements/static/ci/py3.12/freebsd.txt
View file

@ -101,7 +101,7 @@ distro==1.5.0
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -411,7 +411,7 @@ six==1.16.0
# websocket-client
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.12/lint.txt
View file

@ -152,7 +152,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -582,7 +582,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.12/linux.txt
View file

@ -110,7 +110,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -454,7 +454,7 @@ slack-sdk==3.19.5
# via slack-bolt
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.12/tools-virustotal.txt
View file

@ -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

2
requirements/static/ci/py3.12/tools.txt
View file

@ -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

6
requirements/static/ci/py3.12/windows.txt
View file

@ -96,7 +96,7 @@ distro==1.5.0
# pytest-skip-markers
dmidecode==0.9.0
# via -r requirements/static/ci/windows.in
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -430,7 +430,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.7/cloud.txt
View file

@ -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

2
requirements/static/ci/py3.7/docs.txt
View file

@ -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

2
requirements/static/ci/py3.7/freebsd.txt
View file

@ -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

2
requirements/static/ci/py3.7/linux.txt
View file

@ -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

2
requirements/static/ci/py3.7/windows.txt
View file

@ -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

6
requirements/static/ci/py3.8/cloud.txt
View file

@ -155,7 +155,7 @@ distro==1.5.0
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -684,7 +684,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/common.in

2
requirements/static/ci/py3.8/docs.txt
View file

@ -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

6
requirements/static/ci/py3.8/freebsd.txt
View file

@ -108,7 +108,7 @@ distro==1.5.0
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# ciscoconfparse
@ -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
@ -473,7 +473,7 @@ six==1.16.0
# websocket-client
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.8/lint.txt
View file

@ -160,7 +160,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -650,7 +650,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.8/linux.txt
View file

@ -114,7 +114,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# ciscoconfparse
@ -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
@ -508,7 +508,7 @@ slack-sdk==3.19.5
# via slack-bolt
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.8/windows.txt
View file

@ -100,7 +100,7 @@ distro==1.5.0
# pytest-skip-markers
dmidecode==0.9.0
# via -r requirements/static/ci/windows.in
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -437,7 +437,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.9/cloud.txt
View file

@ -155,7 +155,7 @@ distro==1.5.0
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -686,7 +686,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.9/darwin.txt
View file

@ -110,7 +110,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# ciscoconfparse
@ -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
@ -483,7 +483,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/docs.txt
View file

@ -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

6
requirements/static/ci/py3.9/freebsd.txt
View file

@ -108,7 +108,7 @@ distro==1.5.0
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# ciscoconfparse
@ -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
@ -475,7 +475,7 @@ six==1.16.0
# websocket-client
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

6
requirements/static/ci/py3.9/lint.txt
View file

@ -156,7 +156,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
dnspython==1.16.0
dnspython==2.6.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/common.in
@ -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
@ -648,7 +648,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/common.in

6
requirements/static/ci/py3.9/linux.txt
View file

@ -112,7 +112,7 @@ distro==1.5.0
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# ciscoconfparse
@ -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
@ -508,7 +508,7 @@ slack-sdk==3.19.5
# via slack-bolt
smmap==4.0.0
# via gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/tools-virustotal.txt
View file

@ -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

2
requirements/static/ci/py3.9/tools.txt
View file

@ -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

6
requirements/static/ci/py3.9/windows.txt
View file

@ -100,7 +100,7 @@ distro==1.5.0
# pytest-skip-markers
dmidecode==0.9.0
# via -r requirements/static/ci/windows.in
dnspython==1.16.0
dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
@ -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
@ -438,7 +438,7 @@ smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# gitdb
sqlparse==0.4.4
sqlparse==0.5.0
# via -r requirements/static/ci/common.in
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in

2
requirements/static/pkg/py3.10/darwin.txt
View file

@ -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

2
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.10/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.10/windows.txt
View file

@ -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

2
requirements/static/pkg/py3.11/darwin.txt
View file

@ -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

2
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.11/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.11/windows.txt
View file

@ -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

2
requirements/static/pkg/py3.12/darwin.txt
View file

@ -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

2
requirements/static/pkg/py3.12/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.12/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.12/windows.txt
View file

@ -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

2
requirements/static/pkg/py3.7/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.7/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.7/windows.txt
View file

@ -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

2
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.8/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.8/windows.txt
View file

@ -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

2
requirements/static/pkg/py3.9/darwin.txt
View file

@ -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

2
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -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

2
requirements/static/pkg/py3.9/linux.txt
View file

@ -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

2
requirements/static/pkg/py3.9/windows.txt
View file

@ -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

39
tests/pytests/unit/utils/test_x509.py
View file

@ -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"},