ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
meejah 2019-03-21 01:52:45 -06:00
parent 816ceb12cb
commit dbea69c2d2
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/allmydata/web/logs.py
View File

@ -16,9 +16,15 @@ from .common import humanize_failure
class TokenAuthenticatedWebSocketServerProtocol(WebSocketServerProtocol): class TokenAuthenticatedWebSocketServerProtocol(WebSocketServerProtocol):
""" """
A WebSocket protocol that looks for an `Authorization:` header
with a `tahoe-lafs` scheme and a token matching our private config
for `api_auth_token`.
""" """
def onConnect(self, req): def onConnect(self, req):
"""
WebSocket callback
"""
if 'authorization' in req.headers: if 'authorization' in req.headers:
auth = req.headers['authorization'].encode('ascii').split(' ', 1) auth = req.headers['authorization'].encode('ascii').split(' ', 1)
if len(auth) == 2: if len(auth) == 2:
@ -40,18 +46,24 @@ class TokenAuthenticatedWebSocketServerProtocol(WebSocketServerProtocol):
) )
def _received_eliot_log(self, message): def _received_eliot_log(self, message):
"""
While this WebSocket connection is open, this function is
registered as an eliot destination
"""
# probably want a try/except around here? what do we do if # probably want a try/except around here? what do we do if
# transmission fails or anything else bad? # transmission fails or anything else bad happens?
self.sendMessage(json.dumps(message)) self.sendMessage(json.dumps(message))
def onOpen(self): def onOpen(self):
# self.factory.tahoe_client.add_log_streaming_client(self) """
# hmm, instead of something like ^ maybe we just add eliot WebSocket callback
# stuff ourselves... """
eliot.add_destination(self._received_eliot_log) eliot.add_destination(self._received_eliot_log)
def onClose(self, wasClean, code, reason): def onClose(self, wasClean, code, reason):
#self.factory.tahoe_client.remove_log_streaming_client(self) """
WebSocket callback
"""
try: try:
eliot.remove_destination(self._received_eliot_log) eliot.remove_destination(self._received_eliot_log)
except ValueError: except ValueError:
@ -69,14 +81,3 @@ def create_log_streaming_resource(client, websocket_url):
factory.tahoe_client = client factory.tahoe_client = client
factory.protocol = TokenAuthenticatedWebSocketServerProtocol factory.protocol = TokenAuthenticatedWebSocketServerProtocol
return WebSocketResource(factory) return WebSocketResource(factory)
def _create_log_streaming_resource(client):
factory = WebSocketServerFactory(u"ws://127.0.0.1:6301/logs_v1")
factory.protocol = WebSocketServerProtocol
if False:
res = WebSocketResource(factory)
else:
res = WebSocketResource(factory)
return res