Fixed agent locking url when AgentAliasDNS is used.
Ylian Saint-Hilaire committed
Jun 17, 2022 at 09:22 UTC
1fbbc6caaaf95e09044a67335e0810a63dd6aec0
2 files changed
+5
-16
meshcentral.js
+3
-1
@@ -2865,7 +2865,9 @@ function CreateMeshCentralServer(config, args) {
2865
serverSignedAgentsPath = obj.path.join(obj.datapath, 'signedagents' + suffix);
2866
signDesc = (domain.title ? domain.title : agentSignCertInfo.cert.subject.hash);
2867
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
2868
- signUrl = 'https://' + ((domain.dns != null) ? domain.dns : obj.certificates.CommonName);
2868
+ var httpsHost = ((domain.dns != null) ? domain.dns : obj.certificates.CommonName);
2869
+ if (obj.args.agentaliasdns != null) { httpsHost = obj.args.agentaliasdns; }
2870
+ signUrl = 'https://' + httpsHost;
2871
if (httpsPort != 443) { signUrl += ':' + httpsPort; }
2872
var xdomain = (domain.dns == null) ? domain.id : '';
2873
if (xdomain != '') xdomain += '/';
package.json
+2
-15
@@ -37,34 +37,21 @@
37
"sample-config-advanced.json"
38
],
39
"dependencies": {
40
- "@yetzt/nedb": "^1.8.0",
40
"archiver": "^5.3.1",
41
"body-parser": "^1.19.0",
42
"cbor": "~5.2.0",
43
"compression": "^1.7.4",
44
"cookie-session": "^1.4.0",
46
- "esprima": "^4.0.1",
45
"express": "^4.17.0",
46
"express-handlebars": "^5.3.5",
47
"express-ws": "^4.0.0",
50
- "html-minifier": "^4.0.0",
51
- "image-size": "^1.0.1",
48
"ipcheck": "^0.1.0",
53
- "jsdom": "^19.0.0",
54
- "loadavg-windows": "^1.1.1",
55
- "minify-js": "^0.0.4",
49
"minimist": "^1.2.5",
50
"multiparty": "^4.2.1",
51
+ "@yetzt/nedb": "^1.8.0",
52
"node-forge": "^1.0.0",
59
- "node-windows": "^0.1.4",
60
- "nodemailer": "^6.7.5",
61
- "otplib": "^10.2.3",
62
- "pg": "^8.7.1",
63
- "pgtools": "^0.3.2",
64
- "web-push": "^3.5.0",
53
"ws": "^5.2.3",
66
- "yauzl": "^2.10.0",
67
- "yubikeyotp": "^0.2.0"
54
+ "yauzl": "^2.10.0"
55
},
56
"engines": {
57
"node": ">=10.0.0"