From faa415a823cfe203716165133b320573b1551f94 Mon Sep 17 00:00:00 2001 From: Arksine Date: Mon, 9 Nov 2020 06:59:00 -0500 Subject: [PATCH] app: Wrap incoming requests in a WebRequest object Signed-off-by: Eric Callahan --- moonraker/app.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/moonraker/app.py b/moonraker/app.py index e633959..31d9883 100644 --- a/moonraker/app.py +++ b/moonraker/app.py @@ -12,7 +12,7 @@ from inspect import isclass from tornado.escape import url_unescape from tornado.routing import Rule, PathMatches, AnyMatches from utils import ServerError -from websockets import WebsocketManager, WebSocket +from websockets import WebRequest, WebsocketManager, WebSocket from authorization import AuthorizedRequestHandler, AuthorizedFileHandler from authorization import Authorization @@ -270,7 +270,7 @@ class RemoteRequestHandler(AuthorizedRequestHandler): args = self.query_parser(self.request) try: result = await self.server.make_request( - self.remote_callback, args) + WebRequest(self.remote_callback, args)) except ServerError as e: raise tornado.web.HTTPError( e.status_code, str(e)) from e @@ -307,7 +307,8 @@ class LocalRequestHandler(AuthorizedRequestHandler): if self.request.query: args = self.query_parser(self.request) try: - result = await self.callback(self.request.path, method, args) + result = await self.callback( + WebRequest(self.request.path, args, method)) except ServerError as e: raise tornado.web.HTTPError( e.status_code, str(e)) from e