##// END OF EJS Templates
Merge pull request #6797 from minrk/qt-complete-request...
Merge pull request #6797 from minrk/qt-complete-request only complete on current line

File last commit:

r18338:d8b24cf1
r18479:8d6041bb merge
Show More
zmqhandlers.py
257 lines | 8.4 KiB | text/x-python | PythonLexer
MinRK
interrogate kernel_info to get protocol version for adaptation
r16697 """Tornado handlers for WebSocket <-> ZMQ sockets."""
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
MinRK
interrogate kernel_info to get protocol version for adaptation
r16697 # Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
MinRK
only use zmq.jsonapi when talking to zmq sockets...
r17021 import json
MinRK
support buffers in comm messages...
r18329 import struct
MinRK
only use zmq.jsonapi when talking to zmq sockets...
r17021
Thomas Kluyver
Update imports for Python 3...
r13354 try:
Kyle Kelley
Indicate Py3 vs. Py2 codepath.
r14652 from urllib.parse import urlparse # Py 3
Kyle Kelley
Add Origin Checking.
r14646 except ImportError:
Kyle Kelley
Indicate Py3 vs. Py2 codepath.
r14652 from urlparse import urlparse # Py 2
Kyle Kelley
Add Origin Checking.
r14646
try:
Thomas Kluyver
Update imports for Python 3...
r13354 from http.cookies import SimpleCookie # Py 3
except ImportError:
from Cookie import SimpleCookie # Py 2
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653 import logging
MinRK
make CORS configurable...
r17106
import tornado
MinRK
send ping every 30 seconds to keep websockets alive
r17341 from tornado import ioloop
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653 from tornado import web
from tornado import websocket
from IPython.kernel.zmq.session import Session
MinRK
test websocket-friendly binary message roundtrip...
r18335 from IPython.utils.jsonutil import date_default, extract_dates
MinRK
fix some unicode in zmqhandlers...
r11330 from IPython.utils.py3compat import PY3, cast_unicode
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
Brian E. Granger
Updating imports.
r10667 from .handlers import IPythonHandler
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
MinRK
support buffers in comm messages...
r18329 def serialize_binary_message(msg):
"""serialize a message as a binary blob
Header:
4 bytes: number of msg parts (nbufs) as 32b int
4 * nbufs bytes: offset for each buffer as integer as 32b int
Offsets are from the start of the buffer, including the header.
Returns
-------
The message serialized to bytes.
"""
MinRK
test websocket-friendly binary message roundtrip...
r18335 # don't modify msg or buffer list in-place
msg = msg.copy()
buffers = list(msg.pop('buffers'))
MinRK
support buffers in comm messages...
r18329 bmsg = json.dumps(msg, default=date_default).encode('utf8')
buffers.insert(0, bmsg)
nbufs = len(buffers)
offsets = [4 * (nbufs + 1)]
for buf in buffers[:-1]:
offsets.append(offsets[-1] + len(buf))
MinRK
unsigned ints for offsets...
r18338 offsets_buf = struct.pack('!' + 'I' * (nbufs + 1), nbufs, *offsets)
MinRK
support buffers in comm messages...
r18329 buffers.insert(0, offsets_buf)
return b''.join(buffers)
MinRK
s/unserialize/deserialize
r18330 def deserialize_binary_message(bmsg):
"""deserialize a message from a binary blog
MinRK
support buffers in comm messages...
r18329
Header:
4 bytes: number of msg parts (nbufs) as 32b int
4 * nbufs bytes: offset for each buffer as integer as 32b int
Offsets are from the start of the buffer, including the header.
Returns
-------
message dictionary
"""
MinRK
test websocket-friendly binary message roundtrip...
r18335 nbufs = struct.unpack('!i', bmsg[:4])[0]
MinRK
unsigned ints for offsets...
r18338 offsets = list(struct.unpack('!' + 'I' * nbufs, bmsg[4:4*(nbufs+1)]))
MinRK
support buffers in comm messages...
r18329 offsets.append(None)
bufs = []
for start, stop in zip(offsets[:-1], offsets[1:]):
bufs.append(bmsg[start:stop])
MinRK
test websocket-friendly binary message roundtrip...
r18335 msg = json.loads(bufs[0].decode('utf8'))
msg['header'] = extract_dates(msg['header'])
msg['parent_header'] = extract_dates(msg['parent_header'])
MinRK
support buffers in comm messages...
r18329 msg['buffers'] = bufs[1:]
return msg
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653 class ZMQStreamHandler(websocket.WebSocketHandler):
MinRK
make CORS configurable...
r17106
def check_origin(self, origin):
MinRK
s/cors_/allow_/...
r17116 """Check Origin == Host or Access-Control-Allow-Origin.
Tornado >= 4 calls this method automatically, raising 403 if it returns False.
We call it explicitly in `open` on Tornado < 4.
"""
if self.allow_origin == '*':
MinRK
make CORS configurable...
r17106 return True
Kyle Kelley
Handle variations of name for origin
r14732
Kyle Kelley
Performing check only on open.
r14700 host = self.request.headers.get("Host")
Kyle Kelley
Add Origin Checking.
r14646
Kyle Kelley
Name change to same_origin
r14703 # If no header is provided, assume we can't verify origin
MinRK
better log messages when rejecting cross-origin requests
r17881 if origin is None:
self.log.warn("Missing Origin header, rejecting WebSocket connection.")
return False
if host is None:
self.log.warn("Missing Host header, rejecting WebSocket connection.")
MinRK
make CORS configurable...
r17106 return False
MinRK
only compare host:port in Websocket.check_origin...
r17851 origin = origin.lower()
origin_host = urlparse(origin).netloc
MinRK
make CORS configurable...
r17106
# OK if origin matches host
MinRK
only compare host:port in Websocket.check_origin...
r17851 if origin_host == host:
MinRK
make CORS configurable...
r17106 return True
# Check CORS headers
MinRK
s/cors_/allow_/...
r17116 if self.allow_origin:
MinRK
better log messages when rejecting cross-origin requests
r17881 allow = self.allow_origin == origin
MinRK
s/cors_/allow_/...
r17116 elif self.allow_origin_pat:
MinRK
better log messages when rejecting cross-origin requests
r17881 allow = bool(self.allow_origin_pat.match(origin))
MinRK
make CORS configurable...
r17106 else:
MinRK
s/cors_/allow_/...
r17116 # No CORS headers deny the request
MinRK
better log messages when rejecting cross-origin requests
r17881 allow = False
if not allow:
self.log.warn("Blocking Cross Origin WebSocket Attempt. Origin: %s, Host: %s",
origin, host,
)
return allow
Kyle Kelley
Add Origin Checking.
r14646
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653 def clear_cookie(self, *args, **kwargs):
"""meaningless for websockets"""
pass
def _reserialize_reply(self, msg_list):
"""Reserialize a reply message using JSON.
MinRK
s/unserialize/deserialize
r18330 This takes the msg list from the ZMQ socket, deserializes it using
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653 self.session and then serializes the result using JSON. This method
should be used by self._on_zmq_reply to build messages that can
be sent back to the browser.
"""
idents, msg_list = self.session.feed_identities(msg_list)
MinRK
s/unserialize/deserialize
r18330 msg = self.session.deserialize(msg_list)
MinRK
support buffers in comm messages...
r18329 if msg['buffers']:
buf = serialize_binary_message(msg)
return buf
else:
smsg = json.dumps(msg, default=date_default)
return cast_unicode(smsg)
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
def _on_zmq_reply(self, msg_list):
# Sometimes this gets triggered when the on_close method is scheduled in the
# eventloop but hasn't been called.
if self.stream.closed(): return
try:
msg = self._reserialize_reply(msg_list)
except Exception:
self.log.critical("Malformed message: %r" % msg_list, exc_info=True)
else:
MinRK
support buffers in comm messages...
r18329 self.write_message(msg, binary=isinstance(msg, bytes))
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
def allow_draft76(self):
"""Allow draft 76, until browsers such as Safari update to RFC 6455.
This has been disabled by default in tornado in release 2.2.0, and
support will be removed in later versions.
"""
return True
MinRK
send ping every 30 seconds to keep websockets alive
r17341 # ping interval for keeping websockets alive (30 seconds)
WS_PING_INTERVAL = 30000
Brian E. Granger
Moving base ZMQ handlers to base/zmqhandlers.py.
r10653
class AuthenticatedZMQStreamHandler(ZMQStreamHandler, IPythonHandler):
MinRK
send ping every 30 seconds to keep websockets alive
r17341 ping_callback = None
Richard Everson
Check time of last ping before timing out a missing pong.
r17841 last_ping = 0
MinRK
close websocket connections on ping/pong timeout...
r17635 last_pong = 0
@property
def ping_interval(self):
"""The interval for websocket keep-alive pings.
Set ws_ping_interval = 0 to disable pings.
"""
return self.settings.get('ws_ping_interval', WS_PING_INTERVAL)
@property
def ping_timeout(self):
"""If no ping is received in this many milliseconds,
close the websocket connection (VPNs, etc. can fail to cleanly close ws connections).
Default is max of 3 pings or 30 seconds.
"""
return self.settings.get('ws_ping_timeout',
max(3 * self.ping_interval, WS_PING_INTERVAL)
)
MinRK
send ping every 30 seconds to keep websockets alive
r17341
MinRK
make CORS configurable...
r17106 def set_default_headers(self):
"""Undo the set_default_headers in IPythonHandler
which doesn't make sense for websockets
"""
pass
MinRK
remove on_first_message authentication...
r18277
def get(self, *args, **kwargs):
Kyle Kelley
Performing check only on open.
r14700 # Check to see that origin matches host directly, including ports
MinRK
make CORS configurable...
r17106 # Tornado 4 already does CORS checking
if tornado.version_info[0] < 4:
if not self.check_origin(self.get_origin()):
MinRK
s/cors_/allow_/...
r17116 raise web.HTTPError(403)
MinRK
remove on_first_message authentication...
r18277
# authenticate the request before opening the websocket
if self.get_current_user() is None:
self.log.warn("Couldn't authenticate WebSocket connection")
raise web.HTTPError(403)
MinRK
allow session_id to be undefined when starting kernel channels
r18307 if self.get_argument('session_id', False):
MinRK
remove on_first_message authentication...
r18277 self.session.session = cast_unicode(self.get_argument('session_id'))
else:
self.log.warn("No session ID specified")
return super(AuthenticatedZMQStreamHandler, self).get(*args, **kwargs)
def initialize(self):
MinRK
don't use parent=self in handlers...
r11105 self.session = Session(config=self.config)
MinRK
remove on_first_message authentication...
r18277
def open(self, kernel_id):
self.kernel_id = cast_unicode(kernel_id, 'ascii')
MinRK
close websocket connections on ping/pong timeout...
r17635
# start the pinging
if self.ping_interval > 0:
Richard Everson
Check time of last ping before timing out a missing pong.
r17841 self.last_ping = ioloop.IOLoop.instance().time() # Remember time of last ping
self.last_pong = self.last_ping
MinRK
close websocket connections on ping/pong timeout...
r17635 self.ping_callback = ioloop.PeriodicCallback(self.send_ping, self.ping_interval)
self.ping_callback.start()
MinRK
send ping every 30 seconds to keep websockets alive
r17341
def send_ping(self):
"""send a ping to keep the websocket alive"""
if self.stream.closed() and self.ping_callback is not None:
self.ping_callback.stop()
return
MinRK
close websocket connections on ping/pong timeout...
r17635
Richard Everson
Check time of last ping before timing out a missing pong.
r17841 # check for timeout on pong. Make sure that we really have sent a recent ping in
# case the machine with both server and client has been suspended since the last ping.
now = ioloop.IOLoop.instance().time()
since_last_pong = 1e3 * (now - self.last_pong)
since_last_ping = 1e3 * (now - self.last_ping)
if since_last_ping < 2*self.ping_interval and since_last_pong > self.ping_timeout:
MinRK
close websocket connections on ping/pong timeout...
r17635 self.log.warn("WebSocket ping timeout after %i ms.", since_last_pong)
self.close()
return
MinRK
send ping every 30 seconds to keep websockets alive
r17341
self.ping(b'')
Richard Everson
Check time of last ping before timing out a missing pong.
r17841 self.last_ping = now
MinRK
close websocket connections on ping/pong timeout...
r17635 def on_pong(self, data):
self.last_pong = ioloop.IOLoop.instance().time()