oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also return ws error to websocket connection

Browse source
This commit is contained in:
shortcutme 2019-04-12 15:03:43 +02:00
parent 6ad8a10f37
commit 0f72085c2a
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Ui/UiRequest.py
View file

@ -720,11 +720,11 @@ class UiRequest(object):
try: try:
user = self.getCurrentUser() user = self.getCurrentUser()
except Exception as err: except Exception as err:
self.log.error("Error in data/user.json: %s" % err) ws.send(json.dumps({"error": "Error in data/user.json: %s" % err}))
return self.error500() return self.error500("Error in data/user.json: %s" % err)
if not user: if not user:
self.log.error("No user found") ws.send(json.dumps({"error": "No user found"}))
return self.error403() return self.error403("No user found")
ui_websocket = UiWebsocket(ws, site, self.server, user, self) ui_websocket = UiWebsocket(ws, site, self.server, user, self)
site.websockets.append(ui_websocket) # Add to site websockets to allow notify on events site.websockets.append(ui_websocket) # Add to site websockets to allow notify on events
self.server.websockets.append(ui_websocket) self.server.websockets.append(ui_websocket)
@ -736,8 +736,8 @@ class UiRequest(object):
site_check.websockets.remove(ui_websocket) site_check.websockets.remove(ui_websocket)
return "Bye." return "Bye."
else: # No site found by wrapper key else: # No site found by wrapper key
self.log.error("Wrapper key not found: %s" % wrapper_key) ws.send(json.dumps({"error": "Wrapper key not found: %s" % wrapper_key}))
return self.error403() return self.error403("Wrapper key not found: %s" % wrapper_key)
else: else:
self.start_response("400 Bad Request", []) self.start_response("400 Bad Request", [])
return [b"Not a websocket request!"] return [b"Not a websocket request!"]
@ -786,6 +786,7 @@ class UiRequest(object):
# Send bad request error # Send bad request error
def error400(self, message=""): def error400(self, message=""):
self.sendHeader(400, noscript=True) self.sendHeader(400, noscript=True)
self.log.error("Error 400: %s" % message)
return self.formatError("Bad Request", message) return self.formatError("Bad Request", message)
# You are not allowed to access this # You are not allowed to access this
@ -802,6 +803,7 @@ class UiRequest(object):
# Internal server error # Internal server error
def error500(self, message=":("): def error500(self, message=":("):
self.sendHeader(500, noscript=True) self.sendHeader(500, noscript=True)
self.log.error("Error 500: %s" % message)
return self.formatError("Server error", message) return self.formatError("Server error", message)
@helper.encodeResponse @helper.encodeResponse