Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-05-03 04:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #565 from cjmayo/wrapssl

Browse source 
Replace deprecated ssl.wrap_socket() in tests
This commit is contained in:
Chris Mayo 2021-11-22 19:30:11 +00:00 committed by GitHub
commit 0ff291d034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/checker/httpserver.py
View file

@ -200,10 +200,11 @@ def start_server(handler, https=False):
handler.protocol_version = "HTTP/1.0"
httpd = StoppableHttpServer(server_address, handler)
if https:
httpd.socket = ssl.wrap_socket(
context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
context.load_cert_chain(
get_file("https_cert.pem"), keyfile=get_file("https_key.pem"))
httpd.socket = context.wrap_socket(
httpd.socket,
keyfile=get_file("https_key.pem"),
certfile=get_file("https_cert.pem"),
server_side=True,
)
port = httpd.server_port

8
tests/checker/test_https.py
View file

@ -16,6 +16,8 @@
"""
Test https.
"""
from unittest.mock import patch
from OpenSSL import crypto
from .httpserver import HttpsServerTest, CookieRedirectHttpRequestHandler
@ -39,6 +41,8 @@ class TestHttps(HttpsServerTest):
key.generate_key(crypto.TYPE_RSA, 2048)
cert = crypto.X509()
cert.get_subject().CN = "localhost"
cert.add_extensions(
[crypto.X509Extension(b"subjectAltName", False, b"DNS:localhost")])
cert.set_serial_number(1000)
cert.gmtime_adj_notBefore(0)
cert.set_notAfter(b"21190102030405Z")
@ -59,7 +63,9 @@ class TestHttps(HttpsServerTest):
"valid",
]
confargs = dict(sslverify=False)
self.direct(url, resultlines, recursionlevel=0, confargs=confargs)
with patch.dict("os.environ",
{"REQUESTS_CA_BUNDLE": get_file("https_cert.pem")}):
self.direct(url, resultlines, recursionlevel=0, confargs=confargs)
def test_x509_to_dict(self):
with open(get_file("https_cert.pem"), "rb") as f: