update packages
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Oct 17, 2024 at 20:45 UTC
ac2703454243ab494ee425b9b1c2649a25c1b13a
5 files changed
+31
-28
dependencies.txt
+3
-3
@@ -3,7 +3,7 @@
3
"body-parser": "1.20.3",
4
"cbor": "5.2.0",
5
"compression": "1.7.4",
6
- "cookie-session": "2.0.0",
6
+ "cookie-session": "2.1.0",
7
"express": "4.21.1",
8
"express-handlebars": "7.1.3",
9
"express-ws": "5.0.2",
@@ -11,6 +11,6 @@
11
"minimist": "1.2.8",
12
"multiparty": "4.2.3",
13
"node-forge": "1.3.1",
14
- "ua-parser-js": "1.0.37",
15
- "ws": "8.17.1",
14
+ "ua-parser-js": "1.0.39",
15
+ "ws": "8.18.0",
16
"yauzl": "2.10.0"
\ No newline at end of file
docker/Dockerfile
+1
-1
@@ -88,7 +88,7 @@ RUN cd meshcentral && npm install && npm install nedb
88
89
# NOTE: ALL MODULES MUST HAVE A VERSION NUMBER AND THE VERSION MUST MATCH THAT USED IN meshcentral.js mainStart()
90
RUN if ! [ -z "$INCLUDE_MONGODBTOOLS" ]; then cd meshcentral && npm install mongodb@4.13.0 saslprep@1.0.3; fi
91
-RUN if ! [ -z "$PREINSTALL_LIBS" ] && [ "$PREINSTALL_LIBS" == "true" ]; then cd meshcentral && npm install ssh2@1.15.0 semver@7.5.4 nodemailer@6.9.8 image-size@1.0.2 wildleek@2.0.0 otplib@10.2.3 yubikeyotp@0.2.0; fi
91
+RUN if ! [ -z "$PREINSTALL_LIBS" ] && [ "$PREINSTALL_LIBS" == "true" ]; then cd meshcentral && npm install ssh2@1.16.0 semver@7.5.4 nodemailer@6.9.15 image-size@1.1.1 wildleek@2.0.0 otplib@10.2.3 yubikeyotp@0.2.0; fi
92
93
EXPOSE 80 443 4433
94
meshcentral.js
+5
-5
@@ -4207,14 +4207,14 @@ function mainStart() {
4207
4208
// Build the list of required modules
4209
// NOTE: ALL MODULES MUST HAVE A VERSION NUMBER AND THE VERSION MUST MATCH THAT USED IN Dockerfile
4210
- var modules = ['archiver@7.0.1', 'body-parser@1.20.3', 'cbor@5.2.0', 'compression@1.7.4', 'cookie-session@2.0.0', 'express@4.21.1', 'express-handlebars@7.1.3', 'express-ws@5.0.2', 'ipcheck@0.1.0', 'minimist@1.2.8', 'multiparty@4.2.3', '@yetzt/nedb', 'node-forge@1.3.1', 'ua-parser-js@1.0.37', 'ws@8.17.1', 'yauzl@2.10.0'];
4210
+ var modules = ['archiver@7.0.1', 'body-parser@1.20.3', 'cbor@5.2.0', 'compression@1.7.4', 'cookie-session@2.1.0', 'express@4.21.1', 'express-handlebars@7.1.3', 'express-ws@5.0.2', 'ipcheck@0.1.0', 'minimist@1.2.8', 'multiparty@4.2.3', '@yetzt/nedb', 'node-forge@1.3.1', 'ua-parser-js@1.0.39', 'ws@8.18.0', 'yauzl@2.10.0'];
4211
if (require('os').platform() == 'win32') { modules.push('node-windows@0.1.14'); modules.push('loadavg-windows@1.1.1'); if (sspi == true) { modules.push('node-sspi@0.2.10'); } } // Add Windows modules
4212
if (ldap == true) { modules.push('ldapauth-fork@5.0.5'); }
4213
- if (ssh == true) { modules.push('ssh2@1.15.0'); }
4213
+ if (ssh == true) { modules.push('ssh2@1.16.0'); }
4214
if (passport != null) { modules.push(...passport); }
4215
if (captcha == true) { modules.push('svg-captcha@1.4.0'); }
4216
4217
- if (sessionRecording == true) { modules.push('image-size@1.0.2'); } // Need to get the remote desktop JPEG sizes to index the recodring file.
4217
+ if (sessionRecording == true) { modules.push('image-size@1.1.1'); } // Need to get the remote desktop JPEG sizes to index the recodring file.
4218
if (config.letsencrypt != null) { modules.push('acme-client@4.2.5'); } // Add acme-client module. We need to force v4.2.4 or higher since olver versions using SHA-1 which is no longer supported by Let's Encrypt.
4219
if (config.settings.mqtt != null) { modules.push('aedes@0.39.0'); } // Add MQTT Modules
4220
if (config.settings.mysql != null) { modules.push('mysql2@3.6.2'); } // Add MySQL.
@@ -4228,7 +4228,7 @@ function mainStart() {
4228
if (config.settings.plugins != null) { modules.push('semver@7.5.4'); } // Required for version compat testing and update checks
4229
if ((config.settings.plugins != null) && (config.settings.plugins.proxy != null)) { modules.push('https-proxy-agent@7.0.2'); } // Required for HTTP/HTTPS proxy support
4230
else if (config.settings.xmongodb != null) { modules.push('mongojs@3.1.0'); } // Add MongoJS, old driver.
4231
- if (nodemailer || ((config.smtp != null) && (config.smtp.name != 'console')) || (config.sendmail != null)) { modules.push('nodemailer@6.9.8'); } // Add SMTP support
4231
+ if (nodemailer || ((config.smtp != null) && (config.smtp.name != 'console')) || (config.sendmail != null)) { modules.push('nodemailer@6.9.15'); } // Add SMTP support
4232
if (sendgrid || (config.sendgrid != null)) { modules.push('@sendgrid/mail'); } // Add SendGrid support
4233
if ((args.translate || args.dev) && (Number(process.version.match(/^v(\d+\.\d+)/)[1]) >= 16)) { modules.push('jsdom@22.1.0'); modules.push('esprima@4.0.1'); modules.push('html-minifier@4.0.0'); } // Translation support
4234
if (typeof config.settings.crowdsec == 'object') { modules.push('@crowdsec/express-bouncer@0.1.0'); } // Add CrowdSec bounser module (https://www.npmjs.com/package/@crowdsec/express-bouncer)
@@ -4257,7 +4257,7 @@ function mainStart() {
4257
}
4258
4259
// Desktop multiplexor support
4260
- if (config.settings.desktopmultiplex === true) { modules.push('image-size@1.0.2'); }
4260
+ if (config.settings.desktopmultiplex === true) { modules.push('image-size@1.1.1'); }
4261
4262
// SMS support
4263
if (config.sms != null) {
package-lock.json
+19
-16
@@ -14,7 +14,7 @@
14
"body-parser": "1.20.3",
15
"cbor": "5.2.0",
16
"compression": "1.7.4",
17
- "cookie-session": "2.0.0",
17
+ "cookie-session": "2.1.0",
18
"express": "4.21.1",
19
"express-handlebars": "7.1.3",
20
"express-ws": "5.0.2",
@@ -22,8 +22,8 @@
22
"minimist": "1.2.8",
23
"multiparty": "4.2.3",
24
"node-forge": "1.3.1",
25
- "ua-parser-js": "1.0.37",
26
- "ws": "8.17.1",
25
+ "ua-parser-js": "1.0.39",
26
+ "ws": "8.18.0",
27
"yauzl": "2.10.0"
28
},
29
"bin": {
@@ -421,11 +421,11 @@
421
}
422
},
423
"node_modules/cookie-session": {
424
- "version": "2.0.0",
425
- "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.0.0.tgz",
426
- "integrity": "sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg==",
424
+ "version": "2.1.0",
425
+ "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.0.tgz",
426
+ "integrity": "sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ==",
427
"dependencies": {
428
- "cookies": "0.8.0",
428
+ "cookies": "0.9.1",
429
"debug": "3.2.7",
430
"on-headers": "~1.0.2",
431
"safe-buffer": "5.2.1"
@@ -472,9 +472,9 @@
472
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
473
},
474
"node_modules/cookies": {
475
- "version": "0.8.0",
476
- "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz",
477
- "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==",
475
+ "version": "0.9.1",
476
+ "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
477
+ "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
478
"dependencies": {
479
"depd": "~2.0.0",
480
"keygrip": "~1.1.0"
@@ -1821,9 +1821,9 @@
1821
}
1822
},
1823
"node_modules/ua-parser-js": {
1824
- "version": "1.0.37",
1825
- "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
1826
- "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
1824
+ "version": "1.0.39",
1825
+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.39.tgz",
1826
+ "integrity": "sha512-k24RCVWlEcjkdOxYmVJgeD/0a1TiSpqLg+ZalVGV9lsnr4yqu0w7tX/x2xX6G4zpkgQnRf89lxuZ1wsbjXM8lw==",
1827
"funding": [
1828
{
1829
"type": "opencollective",
@@ -1838,6 +1838,9 @@
1838
"url": "https://github.com/sponsors/faisalman"
1839
}
1840
],
1841
+ "bin": {
1842
+ "ua-parser-js": "script/cli.js"
1843
+ },
1844
"engines": {
1845
"node": "*"
1846
}
@@ -2003,9 +2006,9 @@
2006
}
2007
},
2008
"node_modules/ws": {
2006
- "version": "8.17.1",
2007
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
2008
- "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
2009
+ "version": "8.18.0",
2010
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
2011
+ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
2012
"engines": {
2013
"node": ">=10.0.0"
2014
},
package.json
+3
-3
@@ -42,7 +42,7 @@
42
"body-parser": "1.20.3",
43
"cbor": "5.2.0",
44
"compression": "1.7.4",
45
- "cookie-session": "2.0.0",
45
+ "cookie-session": "2.1.0",
46
"express": "4.21.1",
47
"express-handlebars": "7.1.3",
48
"express-ws": "5.0.2",
@@ -50,8 +50,8 @@
50
"minimist": "1.2.8",
51
"multiparty": "4.2.3",
52
"node-forge": "1.3.1",
53
- "ua-parser-js": "1.0.37",
54
- "ws": "8.17.1",
53
+ "ua-parser-js": "1.0.39",
54
+ "ws": "8.18.0",
55
"yauzl": "2.10.0"
56
},
57
"engines": {