Fix for web relay using ports.
Ylian Saint-Hilaire committed
Jul 11, 2022 at 23:26 UTC
bcc2a8607e1bd11a8a064bd3ef53694d76d87fb1
2 files changed
+2
-2
meshcentral.js
+1
-1
@@ -1654,7 +1654,7 @@ function CreateMeshCentralServer(config, args) {
1654
if (obj.common.validateStrArray(obj.args.relaydns, 1) == false) { delete obj.args.relaydns; }
1655
1656
// Start the HTTP relay web server if needed
1657
- if ((obj.args.relaydns != null) && (typeof obj.args.relayport == 'number') && (obj.args.relayport != 0)) {
1657
+ if ((obj.args.relaydns == null) && (typeof obj.args.relayport == 'number') && (obj.args.relayport != 0)) {
1658
obj.webrelayserver = require('./webrelayserver.js').CreateWebRelayServer(obj, obj.db, obj.args, obj.certificates, function () { });
1659
}
1660
webrelayserver.js
+1
-1
@@ -63,7 +63,7 @@ module.exports.CreateWebRelayServer = function (parent, db, args, certificates,
63
// Setup a keygrip instance with higher default security, default hash is SHA1, we want to bump that up with SHA384
64
// If multiple instances of this server are behind a load-balancer, this secret must be the same for all instances
65
// If args.sessionkey is a string, use it as a single key, but args.sessionkey can also be used as an array of keys.
66
- const keygrip = require('keygrip')((typeof obj.args.sessionkey == 'string') ? [obj.args.sessionkey] : obj.args.sessionkey, 'sha384', 'base64');
66
+ const keygrip = require('keygrip')((typeof args.sessionkey == 'string') ? [args.sessionkey] : args.sessionkey, 'sha384', 'base64');
67
68
// Setup cookie session
69
const sessionOptions = {