mesh-1507: ssl adaptor should only be mounted for https:// connections

matt-mercer · matt-mercer · commit a5282ed7a24f · 2023-07-13T11:24:57.000+01:00
diff --git a/mesh_client/__init__.py b/mesh_client/__init__.py
@@ -284,7 +284,9 @@ def __init__(
         if verify is False:
             self._session.verify = False
 
-        self._session.mount(self._url, SSLContextAdapter(cert, verify, check_hostname, hostname_checks_common_name))
+        if self._url.lower().startswith("https://"):
+            self._session.mount(self._url, SSLContextAdapter(cert, verify, check_hostname, hostname_checks_common_name))
+
         self._session.headers = {
             "User-Agent": (
                 f"mesh_client;{__version__};N/A;{platform.processor() or platform.machine()};"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -49,6 +49,7 @@ coverage = "^7.2.7"
 pytest = "^7.4.0"
 importlib-metadata = {version = ">=4.11.4", python = "<3.12"}
 #importlib-resources = {version = "*", python = "<3.9"}
+pytest-httpserver = {version = "^1.0.8", python = ">=3.8,<4.0"}
 
 [tool.poetry.group.local.dependencies]
 ipython = {version = "^8.14.0", python = ">=3.9,<4.0"}
@@ -117,6 +118,7 @@ deps =
     requests>=2.26.0
     mock
     pytest
+    pytest-httpserver
 commands =
     python -m pytest
 
diff --git a/tests/mesh_sandbox_tests.py b/tests/mesh_sandbox_tests.py
@@ -1,10 +1,12 @@
 import io
 import os.path
+import sys
 from typing import List, cast
 from uuid import uuid4
 
 import pytest
 import requests
+from pytest_httpserver import HTTPServer
 from requests import HTTPError
 
 from mesh_client import CombineStreams, MeshClient, MeshError
@@ -279,3 +281,11 @@ def test_endpoint_lookup(alice: MeshClient, bob: MeshClient):
 def test_error_handling(alice: MeshClient, bob: MeshClient):
     with pytest.raises(MeshError):
         alice.send_message(bob_mailbox, b"")
+
+
+@pytest.mark.skipif(sys.version_info < (3, 8), reason="requires python3.8 or higher")
+def test_mesh_client_with_http_server(httpserver: HTTPServer):
+    httpserver.expect_request("/messageexchange/_ping").respond_with_json({}, status=200)
+
+    with MeshClient(httpserver.url_for(""), bob_mailbox, bob_password, max_chunk_size=5, verify=False) as client:
+        client.ping()
