Adding aiohttp test with ssl

Author: leszekhanusz

gql/transport/aiohttp.py

@@ -112,23 +112,23 @@ def create_aiohttp_closed_event(session) -> asyncio.Event:
            An event that will be set once all transports have been properly closed.
         """
 
-        transports = 0
+        ssl_transports = 0
         all_is_lost = asyncio.Event()
 
         def connection_lost(exc, orig_lost):
-            nonlocal transports
+            nonlocal ssl_transports
 
             try:
                 orig_lost(exc)
             finally:
-                transports -= 1
-                if transports == 0:
+                ssl_transports -= 1
+                if ssl_transports == 0:
                     all_is_lost.set()
 
         def eof_received(orig_eof_received):
             try:
                 orig_eof_received()
-            except AttributeError:
+            except AttributeError:  # pragma: no cover
                 # It may happen that eof_received() is called after
                 # _app_protocol and _transport are set to None.
                 pass
@@ -139,7 +139,7 @@ def eof_received(orig_eof_received):
                 if proto is None:
                     continue
 
-                transports += 1
+                ssl_transports += 1
                 orig_lost = proto.connection_lost
                 orig_eof_received = proto.eof_received
 
@@ -150,7 +150,7 @@ def eof_received(orig_eof_received):
                     eof_received, orig_eof_received=orig_eof_received
                 )
 
-        if transports == 0:
+        if ssl_transports == 0:
             all_is_lost.set()
 
         return all_is_lost

tests/conftest.py

@@ -77,8 +77,7 @@ def pytest_collection_modifyitems(config, items):
                     item.add_marker(skip_transport)
 
 
-@pytest.fixture
-async def aiohttp_server():
+async def aiohttp_server_base(with_ssl=False):
     """Factory to create a TestServer instance, given an app.
 
     aiohttp_server(app, **kwargs)
@@ -89,7 +88,13 @@ async def aiohttp_server():
 
     async def go(app, *, port=None, **kwargs):  # type: ignore
         server = AIOHTTPTestServer(app, port=port)
-        await server.start_server(**kwargs)
+
+        start_server_args = {**kwargs}
+        if with_ssl:
+            testcert, ssl_context = get_localhost_ssl_context()
+            start_server_args["ssl"] = ssl_context
+
+        await server.start_server(**start_server_args)
         servers.append(server)
         return server
 
@@ -99,6 +104,18 @@ async def go(app, *, port=None, **kwargs):  # type: ignore
         await servers.pop().close()
 
 
+@pytest.fixture
+async def aiohttp_server():
+    async for server in aiohttp_server_base():
+        yield server
+
+
+@pytest.fixture
+async def ssl_aiohttp_server():
+    async for server in aiohttp_server_base(with_ssl=True):
+        yield server
+
+
 # Adding debug logs to websocket tests
 for name in [
     "websockets.legacy.server",
@@ -121,6 +138,22 @@ async def go(app, *, port=None, **kwargs):  # type: ignore
 MS = 0.001 * int(os.environ.get("GQL_TESTS_TIMEOUT_FACTOR", 1))
 
 
+def get_localhost_ssl_context():
+    # This is a copy of certificate from websockets tests folder
+    #
+    # Generate TLS certificate with:
+    # $ openssl req -x509 -config test_localhost.cnf \
+    #       -days 15340 -newkey rsa:2048 \
+    #       -out test_localhost.crt -keyout test_localhost.key
+    # $ cat test_localhost.key test_localhost.crt > test_localhost.pem
+    # $ rm test_localhost.key test_localhost.crt
+    testcert = bytes(pathlib.Path(__file__).with_name("test_localhost.pem"))
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    ssl_context.load_cert_chain(testcert)
+
+    return (testcert, ssl_context)
+
+
 class WebSocketServer:
     """Websocket server on localhost on a free port.
 
@@ -141,20 +174,7 @@ async def start(self, handler, extra_serve_args=None):
             extra_serve_args = {}
 
         if self.with_ssl:
-            # This is a copy of certificate from websockets tests folder
-            #
-            # Generate TLS certificate with:
-            # $ openssl req -x509 -config test_localhost.cnf \
-            #       -days 15340 -newkey rsa:2048 \
-            #       -out test_localhost.crt -keyout test_localhost.key
-            # $ cat test_localhost.key test_localhost.crt > test_localhost.pem
-            # $ rm test_localhost.key test_localhost.crt
-            self.testcert = bytes(
-                pathlib.Path(__file__).with_name("test_localhost.pem")
-            )
-            ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-            ssl_context.load_cert_chain(self.testcert)
-
+            self.testcert, ssl_context = get_localhost_ssl_context()
             extra_serve_args["ssl"] = ssl_context
 
         # Start a server with a random open port

tests/test_aiohttp.py

@@ -1073,3 +1073,35 @@ async def handler(request):
         execution_result = await session.execute(query, get_execution_result=True)
 
         assert execution_result.extensions["key1"] == "val1"
+
+
+@pytest.mark.asyncio
+async def test_aiohttp_query_https(event_loop, ssl_aiohttp_server):
+    from aiohttp import web
+    from gql.transport.aiohttp import AIOHTTPTransport
+
+    async def handler(request):
+        return web.Response(text=query1_server_answer, content_type="application/json")
+
+    app = web.Application()
+    app.router.add_route("POST", "/", handler)
+    server = await ssl_aiohttp_server(app)
+
+    url = server.make_url("/")
+
+    assert str(url).startswith("https://")
+
+    sample_transport = AIOHTTPTransport(url=url, timeout=10)
+
+    async with Client(transport=sample_transport,) as session:
+
+        query = gql(query1_str)
+
+        # Execute query asynchronously
+        result = await session.execute(query)
+
+        continents = result["continents"]
+
+        africa = continents[0]
+
+        assert africa["code"] == "AF"