Return bad request if request doesn't have alias/userID field

Author: tulir

mautrix_appservice/appservice.py

@@ -116,7 +116,10 @@ async def _http_query_user(self, request: web.Request) -> web.Response:
         if not self._check_token(request):
             return web.Response(status=401)
 
-        user_id = request.match_info["userId"]
+        try:
+            user_id = request.match_info["userId"]
+        except KeyError:
+            return web.Response(status=400)
 
         try:
             response = await self.query_user(user_id)
@@ -132,7 +135,10 @@ async def _http_query_alias(self, request: web.Request) -> web.Response:
         if not self._check_token(request):
             return web.Response(status=401)
 
-        alias = request.match_info["alias"]
+        try:
+            alias = request.match_info["alias"]
+        except KeyError:
+            return web.Response(status=400)
 
         try:
             response = await self.query_alias(alias)