mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 01:30:20 +00:00
Bump to idna==3.7 due to https://github.com/advisories/GHSA-jjg7-2v4v-x38h
This commit is contained in:
Pedro Algarvio
parent
3dcf24c76d
commit
012d1fd205
71 changed files with 75 additions and 103 deletions
1
changelog/66377.security.md
Normal file
1
changelog/66377.security.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Bump to `idna==3.7` due to https://github.com/advisories/GHSA-jjg7-2v4v-x38h
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue