mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7600 from minrk/check-streams

Browse Source 
protect websocket against errant messages
This commit is contained in:
Thomas Kluyver 2015-01-26 17:39:10 -08:00
commit 2b7b0dbfc2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IPython/html/services/kernels/handlers.py
View File

@ -214,6 +214,10 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
stream.on_recv_stream(self._on_zmq_reply) stream.on_recv_stream(self._on_zmq_reply)
def on_message(self, msg): def on_message(self, msg):
if not self.channels:
# already closed, ignore the message
self.log.debug("Received message on closed websocket %r", msg)
return
if isinstance(msg, bytes): if isinstance(msg, bytes):
msg = deserialize_binary_message(msg) msg = deserialize_binary_message(msg)
else: else:
@ -222,6 +226,9 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
if channel is None: if channel is None:
self.log.warn("No channel specified, assuming shell: %s", msg) self.log.warn("No channel specified, assuming shell: %s", msg)
channel = 'shell' channel = 'shell'
if channel not in self.channels:
self.log.warn("No such channel: %r", channel)
return
stream = self.channels[channel] stream = self.channels[channel]
self.session.send(stream, msg) self.session.send(stream, msg)