Merge pull request #395 from wwwjfy/ext-ssl

refs #387, add ssl parameters for all extensions

Author: wwwjfy

gino/ext/aiohttp.py

@@ -130,7 +130,7 @@ async def before_server_start(app_):
                 echo=config.setdefault('echo', False),
                 min_size=config.setdefault('pool_min_size', 5),
                 max_size=config.setdefault('pool_max_size', 10),
-                ssl=config.setdefault("ssl"),
+                ssl=config.setdefault('ssl'),
                 loop=app_.loop,
             )
 

gino/ext/quart.py

@@ -1,8 +1,6 @@
 import asyncio
 
-# noinspection PyPackageRequirements
 from quart import Quart, request
-# noinspection PyPackageRequirements
 from quart.exceptions import NotFound
 from sqlalchemy.engine.url import URL
 
@@ -21,7 +19,6 @@ async def get_or_404(cls, *args, **kwargs):
         return rv
 
 
-# noinspection PyClassHasNoInit
 class GinoExecutor(_Executor):
     async def first_or_404(self, *args, **kwargs):
         rv = await self.first(*args, **kwargs)
@@ -30,7 +27,6 @@ async def first_or_404(self, *args, **kwargs):
         return rv
 
 
-# noinspection PyClassHasNoInit
 class GinoConnection(_Connection):
     async def first_or_404(self, *args, **kwargs):
         rv = await self.first(*args, **kwargs)
@@ -39,7 +35,6 @@ async def first_or_404(self, *args, **kwargs):
         return rv
 
 
-# noinspection PyClassHasNoInit
 class GinoEngine(_Engine):
     connection_cls = GinoConnection
 
@@ -119,6 +114,7 @@ async def before_first_request():
                 echo=app.config.setdefault('DB_ECHO', False),
                 min_size=app.config.setdefault('DB_POOL_MIN_SIZE', 5),
                 max_size=app.config.setdefault('DB_POOL_MAX_SIZE', 10),
+                ssl=app.config.setdefault('DB_SSL'),
                 loop=asyncio.get_event_loop(),
             )
 

gino/ext/sanic.py

@@ -111,6 +111,7 @@ async def before_server_start(_, loop):
                 echo=app.config.setdefault('DB_ECHO', False),
                 min_size=app.config.setdefault('DB_POOL_MIN_SIZE', 5),
                 max_size=app.config.setdefault('DB_POOL_MAX_SIZE', 10),
+                ssl=app.config.setdefault('DB_SSL'),
                 loop=loop,
             )
 

gino/ext/tornado.py

@@ -73,7 +73,7 @@
 - ``'db_pool_max_inactive_conn_lifetime'`` -- number of seconds after which
   inactive connections in the pool will be closed.  Pass ``0`` to disable this
   mechanism. Default is ``300``;
-- ``'db_pool_max_queries '`` -- number of queries after a connection is closed
+- ``'db_pool_max_queries'`` -- number of queries after a connection is closed
   and replaced with a new connection. Default is ``50000``.
 
 
@@ -343,7 +343,7 @@ async def late_init(self, db: Gino, *, loop=None, options=_options):
                 options['db_pool_max_inactive_conn_lifetime']
             ),
             max_queries=options['db_pool_max_queries'],
-            loop=asyncio_loop
+            loop=asyncio_loop,
         )
 
 

tests/conftest.py

@@ -1,3 +1,5 @@
+import ssl
+
 import asyncpg
 import pytest
 import sqlalchemy
@@ -46,3 +48,11 @@ async def asyncpg_pool(sa_engine):
         await yield_(rv)
         await rv.execute('DELETE FROM gino_user_settings')
         await rv.execute('DELETE FROM gino_users')
+
+
+@pytest.fixture
+def ssl_ctx():
+    ctx = ssl.create_default_context()
+    ctx.check_hostname = False
+    ctx.verify_mode = ssl.CERT_NONE
+    return ctx

tests/test_aiohttp.py

@@ -87,14 +87,8 @@ async def test_client_dsn():
 
 @pytest.fixture
 @async_generator
-async def test_client_ssl():
-    import ssl
-
-    ctx = ssl.create_default_context()
-    ctx.check_hostname = False
-    ctx.verify_mode = ssl.CERT_NONE
-
-    await _test_client(dict(dsn=PG_URL, ssl=ctx))
+async def test_client_ssl(ssl_ctx):
+    await _test_client(dict(dsn=PG_URL, ssl=ssl_ctx))
 
 
 async def _test_index_returns_200(test_client):

tests/test_quart.py

@@ -1,4 +1,5 @@
 import sys
+
 import pytest
 
 # Quart only supports Python 3.6 or later
@@ -110,6 +111,19 @@ async def app():
     })
 
 
+@pytest.fixture
+@async_generator
+async def app_ssl(ssl_ctx):
+    await _app({
+        'DB_HOST': DB_ARGS['host'],
+        'DB_PORT': DB_ARGS['port'],
+        'DB_USER': DB_ARGS['user'],
+        'DB_PASSWORD': DB_ARGS['password'],
+        'DB_DATABASE': DB_ARGS['database'],
+        'DB_SSL': ssl_ctx,
+    })
+
+
 @pytest.fixture
 @async_generator
 async def app_dsn():
@@ -152,6 +166,10 @@ async def test(app):
     await _test(app)
 
 
+async def test_ssl(app_ssl):
+    await _test(app_ssl)
+
+
 async def test_dsn(app_dsn):
     await _test(app_dsn)
 

tests/test_sanic.py

@@ -76,6 +76,19 @@ async def app():
     })
 
 
+@pytest.fixture
+@async_generator
+async def app_ssl(ssl_ctx):
+    await _app({
+        'DB_HOST': DB_ARGS['host'],
+        'DB_PORT': DB_ARGS['port'],
+        'DB_USER': DB_ARGS['user'],
+        'DB_PASSWORD': DB_ARGS['password'],
+        'DB_DATABASE': DB_ARGS['database'],
+        'DB_SSL': ssl_ctx,
+    })
+
+
 @pytest.fixture
 @async_generator
 async def app_dsn():
@@ -116,5 +129,9 @@ def test(app):
     _test(app)
 
 
+def test_ssl(app_ssl):
+    _test(app_ssl)
+
+
 def test_dsn(app_dsn):
     _test(app_dsn)