Narrowed LIKE scope as was picking up unrelated rows

Fixed unawaited authentication plugin coros

Author: terricain

aiomysql/connection.py

@@ -795,38 +795,44 @@ async def _request_authentication(self):
                                        "for auth method %r", auth_plugin)
 
     async def _process_auth(self, plugin_name, auth_packet):
+        # These auth plugins do their own packet handling
         if plugin_name == b"caching_sha2_password":
-            return self.caching_sha2_password_auth(auth_packet)
+            await self.caching_sha2_password_auth(auth_packet)
         elif plugin_name == b"sha256_password":
-            return self.sha256_password_auth(auth_packet)
-        elif plugin_name == b"mysql_native_password":
-            # https://dev.mysql.com/doc/internals/en/
-            # secure-password-authentication.html#packet-Authentication::
-            # Native41
-            data = _auth.scramble_native_password(
-                self._password.encode('latin1'),
-                auth_packet.read_all())
-        elif plugin_name == b"mysql_old_password":
-            # https://dev.mysql.com/doc/internals/en/
-            # old-password-authentication.html
-            data = _auth.scramble_old_password(self._password.encode('latin1'),
-                                               auth_packet.read_all()) + b'\0'
-        elif plugin_name == b"mysql_clear_password":
-            # https://dev.mysql.com/doc/internals/en/
-            # clear-text-authentication.html
-            data = self._password.encode('latin1') + b'\0'
+            await self.sha256_password_auth(auth_packet)
         else:
-            raise OperationalError(
-                2059, "Authentication plugin '%s' not configured" % plugin_name
-            )
 
-        self.write_packet(data)
-        pkt = await self._read_packet()
-        pkt.check_error()
+            if plugin_name == b"mysql_native_password":
+                # https://dev.mysql.com/doc/internals/en/
+                # secure-password-authentication.html#packet-Authentication::
+                # Native41
+                data = _auth.scramble_native_password(
+                    self._password.encode('latin1'),
+                    auth_packet.read_all())
+            elif plugin_name == b"mysql_old_password":
+                # https://dev.mysql.com/doc/internals/en/
+                # old-password-authentication.html
+                data = _auth.scramble_old_password(
+                    self._password.encode('latin1'),
+                    auth_packet.read_all()
+                ) + b'\0'
+            elif plugin_name == b"mysql_clear_password":
+                # https://dev.mysql.com/doc/internals/en/
+                # clear-text-authentication.html
+                data = self._password.encode('latin1') + b'\0'
+            else:
+                raise OperationalError(
+                    2059, "Authentication plugin '{0}'"
+                          " not configured".format(plugin_name)
+                )
+
+            self.write_packet(data)
+            pkt = await self._read_packet()
+            pkt.check_error()
 
-        self._auth_plugin_used = plugin_name
+            self._auth_plugin_used = plugin_name
 
-        return pkt
+            return pkt
 
     async def caching_sha2_password_auth(self, pkt):
         # No password fast path

examples/example_ssl.py

@@ -0,0 +1,38 @@
+import asyncio
+import ssl
+import aiomysql
+
+ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+ctx.check_hostname = False
+ctx.load_verify_locations(cafile='../tests/ssl_resources/ssl/ca.pem')
+
+
+async def main():
+    async with aiomysql.create_pool(
+            host='localhost', port=3306, user='root',
+            password='rootpw', ssl=ctx,
+            auth_plugin='mysql_clear_password') as pool:
+
+        async with pool.get() as conn:
+            async with conn.cursor() as cur:
+                # Run simple command
+                await cur.execute("SHOW DATABASES;")
+                value = await cur.fetchall()
+
+                values = [item[0] for item in value]
+                # Spot check the answers, we should at least have mysql
+                # and information_schema
+                assert 'mysql' in values, \
+                    'Could not find the "mysql" table'
+                assert 'information_schema' in values, \
+                    'Could not find the "mysql" table'
+
+                # Check TLS variables
+                await cur.execute("SHOW STATUS LIKE 'Ssl_version%';")
+                value = await cur.fetchone()
+
+                # The context has TLS
+                assert value[1].startswith('TLS'), \
+                    'Not connected to the database with TLS'
+
+asyncio.get_event_loop().run_until_complete(main())

tests/conftest.py

@@ -36,14 +36,14 @@ def pytest_generate_tests(metafunc):
         metafunc.parametrize("loop_type", loop_type)
 
     if 'mysql_tag' in metafunc.fixturenames:
-        # tags = set(metafunc.config.option.mysql_tag)
-        # if not tags:
-        #     tags = ['5.7']
-        # elif 'all' in tags:
-        #     tags = ['5.6', '5.7', '8.0']
-        # else:
-        #     tags = list(tags)
-        metafunc.parametrize("mysql_tag", ['5.6', '8.0'], scope='session')
+        tags = set(metafunc.config.option.mysql_tag)
+        if not tags:
+            tags = ['5.6', '8.0']
+        elif 'all' in tags:
+            tags = ['5.6', '5.7', '8.0']
+        else:
+            tags = list(tags)
+        metafunc.parametrize("mysql_tag", tags, scope='session')
 
 
 # This is here unless someone fixes the generate_tests bit
@@ -288,7 +288,7 @@ def mysql_server(unused_port, docker, session_id, mysql_tag, request):
                     assert result['have_ssl'] == "YES", \
                         "SSL Not Enabled on docker'd MySQL"
 
-                    cursor.execute("SHOW STATUS LIKE '%Ssl_version%'")
+                    cursor.execute("SHOW STATUS LIKE 'Ssl_version%'")
 
                     result = cursor.fetchone()
                     # As we connected with TLS, it should start with that :D

tests/test_ssl.py

@@ -22,7 +22,7 @@ async def test_tls_connect(mysql_server, loop):
                     'Could not find the "mysql" table'
 
                 # Check TLS variables
-                await cur.execute("SHOW STATUS LIKE '%Ssl_version%';")
+                await cur.execute("SHOW STATUS LIKE 'Ssl_version%';")
                 value = await cur.fetchone()
 
                 # The context has TLS