Removed auth cookie on control.ashx websocket connect.
Ylian Saint-Hilaire committed
Nov 3, 2021 at 19:22 UTC
417598fcccc5314bd5b5d3399006396a396c4c88
3 files changed
+3
-6
public/scripts/meshcentral.js
+1
-4
@@ -23,10 +23,7 @@ var MeshServerCreateControl = function (domain, authCookie) {
23
if (obj.connectstate != 0) return;
24
obj.connectstate = 0;
25
var url = window.location.protocol.replace('http', 'ws') + '//' + window.location.host + domain + 'control.ashx' + (urlargs.key ? ('?key=' + urlargs.key) : '');
26
- if (obj.authCookie && (obj.authCookie != '')) {
27
- url += '?moreargs=1'
28
- //url += '?auth=' + obj.authCookie;
29
- }
26
+ if (obj.authCookie && (obj.authCookie != '')) { url += '?moreargs=1' }
27
obj.socket = new WebSocket(url);
28
obj.socket.onopen = function (e) { obj.connectstate = 1; if (obj.authCookie && (obj.authCookie != '')) { obj.send({ 'action': 'urlargs', 'args': { 'auth': obj.authCookie } }); } }
29
obj.socket.onmessage = obj.xxOnMessage;
views/default-mobile.handlebars
+1
-1
@@ -1284,7 +1284,7 @@
1284
document.onclick = function (e) { if ((xxdialogMode == 999) && (e.target.id != 'topMenuIcon')) { QV('topMenu', false); xxdialogMode = 0; } }
1285
1286
// Connect to the mesh server
1287
- meshserver = MeshServerCreateControl(domainUrl, authCookie);
1287
+ meshserver = MeshServerCreateControl(domainUrl);
1288
meshserver.onStateChanged = onStateChanged;
1289
meshserver.onMessage = onMessage;
1290
meshserver.trace = args.trace;
views/default.handlebars
+1
-1
@@ -1513,7 +1513,7 @@
1513
setTimeout(function() { mainUpdate(512); }, 200);
1514
1515
// Connect to the mesh server
1516
- meshserver = MeshServerCreateControl(domainUrl, authCookie);
1516
+ meshserver = MeshServerCreateControl(domainUrl);
1517
meshserver.onStateChanged = onStateChanged;
1518
meshserver.onMessage = onMessage;
1519
meshserver.trace = args.trace;