Workaround for Safari + Websockets + basic auth

https://bugs.webkit.org/show_bug.cgi?id=80362

1 files changed, 13 insertions, 5 deletions

diff --git a/kvmd/web/js/session.js b/kvmd/web/js/session.js
index d3bbf91c..5e4a491b 100644
--- a/kvmd/web/js/session.js
+++ b/kvmd/web/js/session.js
@@ -20,11 +20,19 @@ var session = new function() {
 	};
 
 	this.startPoller = function() {
-		__ws = new WebSocket((location.protocol == "https:" ? "wss" : "ws") + "://" + location.host + "/kvmd/ws");
-		__ws.onopen = __wsOpenHandler;
-		__ws.onmessage = __wsMessageHandler;
-		__ws.onerror = __wsErrorHandler;
-		__ws.onclose = __wsCloseHandler;
+		var http = tools.makeRequest("GET", "/wsauth", function() {
+			if (http.readyState === 4) {
+				if (http.status === 200) {
+					__ws = new WebSocket((location.protocol == "https:" ? "wss" : "ws") + "://" + location.host + "/kvmd/ws");
+					__ws.onopen = __wsOpenHandler;
+					__ws.onmessage = __wsMessageHandler;
+					__ws.onerror = __wsErrorHandler;
+					__ws.onclose = __wsCloseHandler;
+				} else {
+					__wsCloseHandler(null);
+				}
+			}
+		});
 	};
 
 	var __wsOpenHandler = function(event) {