Combine ssl_verify with other SSL options

miguelgrinberg · Jan 5, 2024 · cea2f92 · cea2f92
1 parent c5f81cf
commit cea2f92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/engineio/client.py b/src/engineio/client.py
@@ -309,7 +309,10 @@ def _connect_websocket(self, url, headers, engineio_path):
                 self.ssl_verify = False
 
         if not self.ssl_verify:
-            extra_options['sslopt'] = {"cert_reqs": ssl.CERT_NONE}
+            if 'sslopt' in extra_options:
+                extra_options['sslopt'].update({"cert_reqs": ssl.CERT_NONE})
+            else:
+                extra_options['sslopt'] = {"cert_reqs": ssl.CERT_NONE}
 
         # combine internally generated options with the ones supplied by the
         # caller. The caller's options take precedence.

diff --git a/tests/common/test_client.py b/tests/common/test_client.py
@@ -879,7 +879,7 @@ def test_websocket_connection_with_cert(self, create_connection):
         http.auth = None
         http.proxies = None
         http.cert = 'foo.crt'
-        c = client.Client(http_session=http)
+        c = client.Client(http_session=http, ssl_verify=False)
         c._read_loop_polling = mock.MagicMock()
         c._read_loop_websocket = mock.MagicMock()
         c._write_loop = mock.MagicMock()
@@ -889,7 +889,7 @@ def test_websocket_connection_with_cert(self, create_connection):
 
         assert len(create_connection.call_args_list) == 1
         assert create_connection.call_args[1] == {
-            'sslopt': {'certfile': 'foo.crt'},
+            'sslopt': {'cert_reqs': ssl.CERT_NONE, 'certfile': 'foo.crt'},
             'header': {},
             'cookie': '',
             'enable_multithread': True,