diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-09 11:32:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-09 11:32:24 +0000 |
| commit | 9551893ce2f5370b447ed544eeade3b49be7c37f (patch) | |
| tree | 5bafc7cb078c838f638905cb796876479d280bbd | |
| parent | 9c74981b9e488225df65d7499bedfeae94b5586d (diff) | |
| parent | 2747ea6f56137bf675acb15614041c654375a7b5 (diff) | |
| download | zuul-9551893ce2f5370b447ed544eeade3b49be7c37f.tar.gz | |
Merge "Fix DeprecationWarning: ssl.PROTOCOL_TLS is deprecated"
| -rw-r--r-- | tests/unit/test_streaming.py | 2 | ||||
| -rw-r--r-- | zuul/lib/fingergw.py | 2 | ||||
| -rw-r--r-- | zuul/lib/streamer_utils.py | 2 | ||||
| -rwxr-xr-x | zuul/web/__init__.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/test_streaming.py b/tests/unit/test_streaming.py index 12b33e5c6..7e6a2e635 100644 --- a/tests/unit/test_streaming.py +++ b/tests/unit/test_streaming.py @@ -165,7 +165,7 @@ class TestStreamingBase(tests.base.AnsibleZuulTestCase): self.streaming_data[name] = '' with socket.create_connection(gateway_address) as s: if self.fingergw_use_ssl: - context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) context.verify_mode = ssl.CERT_REQUIRED context.check_hostname = False context.load_cert_chain( diff --git a/zuul/lib/fingergw.py b/zuul/lib/fingergw.py index bd947f113..184c9762d 100644 --- a/zuul/lib/fingergw.py +++ b/zuul/lib/fingergw.py @@ -71,7 +71,7 @@ class RequestHandler(streamer_utils.BaseFingerRequestHandler): ''' with socket.create_connection((server, port), timeout=10) as s: if use_ssl: - context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) context.verify_mode = ssl.CERT_REQUIRED context.check_hostname = self.fingergw.tls_verify_hostnames context.load_cert_chain(self.fingergw.tls_cert, diff --git a/zuul/lib/streamer_utils.py b/zuul/lib/streamer_utils.py index 04de4b8cb..a50fb4142 100644 --- a/zuul/lib/streamer_utils.py +++ b/zuul/lib/streamer_utils.py @@ -168,7 +168,7 @@ class CustomThreadingTCPServer(socketserver.ThreadingTCPServer): if all([self.server_ssl_key, self.server_ssl_cert, self.server_ssl_ca]): - context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) context.load_cert_chain(self.server_ssl_cert, self.server_ssl_key) context.load_verify_locations(self.server_ssl_ca) context.verify_mode = ssl.CERT_REQUIRED diff --git a/zuul/web/__init__.py b/zuul/web/__init__.py index 7f27cd970..47226fd7d 100755 --- a/zuul/web/__init__.py +++ b/zuul/web/__init__.py @@ -395,7 +395,7 @@ class LogStreamer(object): self.finger_socket = socket.create_connection( (server, port), timeout=10) if use_ssl: - context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) context.verify_mode = ssl.CERT_REQUIRED context.check_hostname = self.zuulweb.finger_tls_verify_hostnames context.load_cert_chain( |