0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

log remote id if versions do not match, allow file:// to access websocket

Browse source
This commit is contained in:
j 2016-01-17 20:30:19 +05:30
parent 954491759e
commit 9c1c653582
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oml/nodes.py
View file

@ -193,7 +193,7 @@ class Node(Thread):
version = r.headers.get('X-Node-Protocol', None) version = r.headers.get('X-Node-Protocol', None)
if version != settings.NODE_PROTOCOL: if version != settings.NODE_PROTOCOL:
logger.debug('version does not match local: %s remote %s', settings.NODE_PROTOCOL, version) logger.debug('version does not match local: %s remote %s (%s)', settings.NODE_PROTOCOL, version, self.user_id)
self.online = False self.online = False
if version > settings.NODE_PROTOCOL: if version > settings.NODE_PROTOCOL:
state.update_required = True state.update_required = True

2
oml/websocket.py
View file

@ -28,7 +28,7 @@ class Handler(WebSocketHandler):
) )
def open(self): def open(self):
if self.request.headers['origin'] not in ('null', 'http://127.0.0.1:9842') \ if self.request.headers['origin'] not in ('null', 'file://', 'http://127.0.0.1:9842') \
and self.request.host not in self.request.headers['origin']: and self.request.host not in self.request.headers['origin']:
logger.debug('reject cross site attempt to open websocket %s', self.request) logger.debug('reject cross site attempt to open websocket %s', self.request)
self.close() self.close()