3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app: Wrap incoming requests in a WebRequest object 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-09 06:59:00 -05:00
parent 30c236f1a9
commit faa415a823
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moonraker/app.py
View File

@ -12,7 +12,7 @@ from inspect import isclass
from tornado.escape import url_unescape from tornado.escape import url_unescape
from tornado.routing import Rule, PathMatches, AnyMatches from tornado.routing import Rule, PathMatches, AnyMatches
from utils import ServerError from utils import ServerError
from websockets import WebsocketManager, WebSocket from websockets import WebRequest, WebsocketManager, WebSocket
from authorization import AuthorizedRequestHandler, AuthorizedFileHandler from authorization import AuthorizedRequestHandler, AuthorizedFileHandler
from authorization import Authorization from authorization import Authorization
@ -270,7 +270,7 @@ class RemoteRequestHandler(AuthorizedRequestHandler):
args = self.query_parser(self.request) args = self.query_parser(self.request)
try: try:
result = await self.server.make_request( result = await self.server.make_request(
self.remote_callback, args) WebRequest(self.remote_callback, args))
except ServerError as e: except ServerError as e:
raise tornado.web.HTTPError( raise tornado.web.HTTPError(
e.status_code, str(e)) from e e.status_code, str(e)) from e
@ -307,7 +307,8 @@ class LocalRequestHandler(AuthorizedRequestHandler):
if self.request.query: if self.request.query:
args = self.query_parser(self.request) args = self.query_parser(self.request)
try: try:
result = await self.callback(self.request.path, method, args) result = await self.callback(
WebRequest(self.request.path, args, method))
except ServerError as e: except ServerError as e:
raise tornado.web.HTTPError( raise tornado.web.HTTPError(
e.status_code, str(e)) from e e.status_code, str(e)) from e