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

app: allow local handlers to select their supported protocol 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-09-03 17:54:29 -04:00
parent c523f35c5e
commit 059f5d6a73
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moonraker/app.py
View File

@ -165,17 +165,14 @@ class MoonrakerApp:
self.registered_base_handlers.append(api_def.uri) self.registered_base_handlers.append(api_def.uri)
def register_local_handler(self, uri, request_methods, def register_local_handler(self, uri, request_methods,
callback, http_only=False): callback, protocol=["http", "websocket"]):
if uri in self.registered_base_handlers: if uri in self.registered_base_handlers:
return return
api_def = self._create_api_definition( api_def = self._create_api_definition(
uri, request_methods, is_remote=False) uri, request_methods, is_remote=False)
msg = "Registering local endpoint - " msg = "Registering local endpoint"
msg += f"HTTP: ({' '.join(request_methods)}) {uri}" if "http" in protocol:
if not http_only: msg += f" - HTTP: ({' '.join(request_methods)}) {uri}"
msg += f"; Websocket: {', '.join(api_def.ws_methods)}"
self.wsm.register_local_handler(api_def, callback)
logging.info(msg)
params = {} params = {}
params['server'] = self.server params['server'] = self.server
params['auth'] = self.auth params['auth'] = self.auth
@ -184,6 +181,10 @@ class MoonrakerApp:
params['callback'] = callback params['callback'] = callback
self.mutable_router.add_handler(uri, LocalRequestHandler, params) self.mutable_router.add_handler(uri, LocalRequestHandler, params)
self.registered_base_handlers.append(uri) self.registered_base_handlers.append(uri)
if "websocket" in protocol:
msg += f" - Websocket: {', '.join(api_def.ws_methods)}"
self.wsm.register_local_handler(api_def, callback)
logging.info(msg)
def register_static_file_handler(self, pattern, file_path, def register_static_file_handler(self, pattern, file_path,
can_delete=False, op_check_cb=None): can_delete=False, op_check_cb=None):

4
moonraker/authorization.py
View File

@ -66,10 +66,10 @@ class Authorization:
# Register Authorization Endpoints # Register Authorization Endpoints
app.register_local_handler( app.register_local_handler(
"/access/api_key", ['GET', 'POST'], "/access/api_key", ['GET', 'POST'],
self._handle_apikey_request, http_only=True) self._handle_apikey_request, protocol=['http'])
app.register_local_handler( app.register_local_handler(
"/access/oneshot_token", ['GET'], "/access/oneshot_token", ['GET'],
self._handle_token_request, http_only=True) self._handle_token_request, protocol=['http'])
async def _handle_apikey_request(self, path, method, args): async def _handle_apikey_request(self, path, method, args):
if method.upper() == 'POST': if method.upper() == 'POST':