Add compatibility to aiohttp to 2.2.5 and bump version

aiohttp 2 added a maximum size to requests which we needed to increase for
the fake API server to upload large blobs. I've set the request size on the
callback server to 8192 bytes which should be sufficient for any incoming
data from the Threema gateway server. (Note that downloading large blobs is
unaffected by this size limitation.)

Author: lgrahl

setup.py

@@ -58,7 +58,7 @@ def read(file):
         'logbook>=1.1.0,<2',
         'libnacl>=1.5.2,<2',
         'click>=6.7,<7',  # doesn't seem to follow semantic versioning
-        'aiohttp>=1.3.5,<2',
+        'aiohttp>=2.2.5,<3',
         'wrapt>=1.10.10,<2',
     ],
     tests_require=tests_require,

tests/conftest.py

@@ -377,7 +377,8 @@ def api_server_port():
 @pytest.fixture(scope='module')
 def api_server(request, event_loop, api_server_port, server):
     port = api_server_port
-    app = web.Application(loop=event_loop, router=server.router)
+    app = web.Application(
+        loop=event_loop, router=server.router, client_max_size=100 * (2**20))
     handler = app.make_handler()
 
     # Set up server

threema/gateway/bin/gateway_client.py

@@ -11,8 +11,6 @@
 import logbook
 import logbook.more
 
-from aiohttp.client_exceptions import ServerFingerprintMismatch
-
 from threema.gateway import __version__ as _version
 from threema.gateway import (
     Connection,
@@ -465,12 +463,11 @@ def main():
     exc = None
     try:
         cli()
+    except aiohttp.client_exceptions.ServerFingerprintMismatch:
+        error = 'Fingerprints did not match!'
     except Exception as exc_:
-        if isinstance(exc_, ServerFingerprintMismatch):
-            error = 'Fingerprints did not match!'
-        else:
-            error = str(exc_)
-            exc = exc_
+        error = str(exc_)
+        exc = exc_
     else:
         error = None
 

threema/gateway/e2e.py

@@ -167,7 +167,11 @@ def create_router(self):
 
     # noinspection PyMethodMayBeStatic
     def create_application(self, router, loop):
-        return web.Application(router=router, loop=loop)
+        # A box can contain up to 4000 bytes, so this should be sufficient.
+        # The remaining POST parameters aren't that big.
+        # See: https://gateway.threema.ch/en/developer/api
+        request_size_max = 8192
+        return web.Application(router=router, loop=loop, client_max_size=request_size_max)
 
     def create_handler(self):
         return self.application.make_handler()