mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 23:11:33 +00:00
Code Issues Releases Wiki Activity

Make TFWServer sign commands issued due to signed triggers

Browse Source
This commit is contained in:
Kristóf Tóth 2018-07-23 17:14:44 +02:00
parent 8ba99d8e36
commit e846a2b111
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tfw/networking/server/tfw_server.py
View File

@ -9,6 +9,7 @@ from tornado.web import Application
from tfw.networking.event_handlers import ServerUplinkConnector from tfw.networking.event_handlers import ServerUplinkConnector
from tfw.networking.server import EventHandlerConnector from tfw.networking.server import EventHandlerConnector
from tfw.networking import MessageSender from tfw.networking import MessageSender
from tfw.crypto import KeyManager, verify_message, sign_message
from tfw.config.logs import logging from tfw.config.logs import logging
from .zmq_websocket_proxy import ZMQWebSocketProxy from .zmq_websocket_proxy import ZMQWebSocketProxy
@ -24,6 +25,7 @@ class TFWServer:
def __init__(self): def __init__(self):
self._event_handler_connector = EventHandlerConnector() self._event_handler_connector = EventHandlerConnector()
self._uplink_connector = ServerUplinkConnector() self._uplink_connector = ServerUplinkConnector()
self._auth_key = KeyManager().auth_key
self.application = Application([( self.application = Application([(
r'/ws', ZMQWebSocketProxy, { r'/ws', ZMQWebSocketProxy, {
@ -37,13 +39,16 @@ class TFWServer:
def handle_trigger(self, message): def handle_trigger(self, message):
if 'trigger' in message: if 'trigger' in message:
LOG.debug('Executing handler for trigger "%s"', message.get('trigger', '')) LOG.debug('Executing handler for trigger "%s"', message.get('trigger', ''))
self._uplink_connector.send_to_eventhandler({ fsm_eh_command = {
'key': 'fsm', 'key': 'fsm',
'data': { 'data': {
'command': 'trigger', 'command': 'trigger',
'value': message.get('trigger', '') 'value': message['trigger']
} }
}) }
if verify_message(self._auth_key, message):
sign_message(self._auth_key, fsm_eh_command)
self._uplink_connector.send_to_eventhandler(fsm_eh_command)
def handle_recover(self, message): def handle_recover(self, message):
if message['key'] == 'recover': if message['key'] == 'recover':