3FA improvement for control.ashx
Ylian Saint-Hilaire committed
Sep 18, 2020 at 11:50 UTC
52f6d1b4dc77ff571abbdf73dc98117b5c27c7cd
1 file changed
+3
-4
webserver.js
+3
-4
@@ -4804,10 +4804,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
4804
obj.app.ws(url + 'webrelay.ashx', function (ws, req) { PerformWSSessionAuth(ws, req, false, handleRelayWebSocket); });
4805
obj.app.ws(url + 'webider.ashx', function (ws, req) { PerformWSSessionAuth(ws, req, false, function (ws1, req1, domain, user, cookie) { obj.meshIderHandler.CreateAmtIderSession(obj, obj.db, ws1, req1, obj.args, domain, user); }); });
4806
obj.app.ws(url + 'control.ashx', function (ws, req) {
4807
- PerformWSSessionAuth(ws, req, false, function (ws1, req1, domain, user, cookie) {
4808
- if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { ws.close(); return; } // Check 3FA URL key
4809
- obj.meshUserHandler.CreateMeshUser(obj, obj.db, ws1, req1, obj.args, domain, user);
4810
- });
4807
+ const domain = getDomain(req);
4808
+ if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { ws.close(); return; } // Check 3FA URL key
4809
+ PerformWSSessionAuth(ws, req, false, function (ws1, req1, domain, user, cookie) { obj.meshUserHandler.CreateMeshUser(obj, obj.db, ws1, req1, obj.args, domain, user); });
4810
});
4811
obj.app.ws(url + 'devicefile.ashx', function (ws, req) { obj.meshDeviceFileHandler.CreateMeshDeviceFile(obj, ws, null, req, domain); });
4812
obj.app.get(url + 'devicefile.ashx', handleDeviceFile);