mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-06-28 21:45:11 +00:00
Code Issues Releases Wiki Activity

Implement message validation in TFW proxying

Browse Source
This commit is contained in:
Kristóf Tóth
2018-04-13 20:56:28 +02:00
parent ecec1cde59
commit b082279916
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tfw/networking/server/zmq_websocket_handler.py
View File

@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
from tornado.websocket import WebSocketHandler
from tfw.networking import deserialize_tfw_msg
from tfw.networking import deserialize_tfw_msg, validate_message
from tfw.config.logs import logging
LOG = logging.getLogger(__name__)
@ -32,15 +32,17 @@ class ZMQWebSocketHandler(WebSocketHandler, ABC):
keyhandlers = {'mirror': self.mirror}
message = deserialize_tfw_msg(*msg_parts)
key = message['key']
LOG.debug('Received on pull socket: %s', message)
if not validate_message(message):
return
self.handle_trigger(message)
if key not in keyhandlers:
if message['key'] not in keyhandlers:
for instance in ZMQWebSocketHandler.instances:
instance.write_message(message)
else:
try:
keyhandlers[key](message)
keyhandlers[message['key']](message)
except KeyError:
LOG.error('Invalid mirror message format! Ignoring.')
@ -50,7 +52,8 @@ class ZMQWebSocketHandler(WebSocketHandler, ABC):
def on_message(self, message):
LOG.debug('Received on WebSocket: %s', message)
self.send_message(self.make_eventhandler_response(message))
if validate_message(message):
self.send_message(self.make_eventhandler_response(message))
@abstractmethod
def make_eventhandler_response(self, message):