Rename websocket detection

This commit is contained in:
shortcutme 2017-01-08 17:26:59 +01:00
parent 612d885ad2
commit 2447279191

View file

@ -93,9 +93,9 @@ class UiRequest(object):
def isProxyRequest(self):
return self.env["PATH_INFO"].startswith("http://")
def isWebSocket(self):
def isWebSocketRequest(self):
return self.env.get("HTTP_UPGRADE") == "websocket"
def isAjaxRequest(self):
return self.env.get("HTTP_X_REQUESTED_WITH") == "XMLHttpRequest"
@ -198,9 +198,10 @@ class UiRequest(object):
return self.actionSiteMedia("/media" + path) # Only serve html files with frame
if self.isAjaxRequest():
return self.error403("Ajax request not allowed to load wrapper") # No ajax allowed on wrapper
if self.isWebSocket():
return self.error403("WebSocket not allowed to load wrapper") # No websocket
if self.isWebSocketRequest():
return self.error403("WebSocket request not allowed to load wrapper") # No websocket
if "text/html" not in self.env["HTTP_ACCEPT"]:
return self.error403("Invalid Accept header to load wrapper")
if "prefetch" in self.env.get("HTTP_X_MOZ", "") or "prefetch" in self.env.get("HTTP_PURPOSE", ""):