From 24472791913a13cb624fef2a656c47237b512333 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sun, 8 Jan 2017 17:26:59 +0100 Subject: [PATCH] Rename websocket detection --- src/Ui/UiRequest.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index 2059e68f..14075071 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -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", ""):