diff --git a/package.json b/package.json index 3c58c0a1..3147aa7f 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,8 @@ "sample-config-advanced.json" ], "dependencies": { + "archiver": "^4.0.2", + "archiver-zip-encrypted": "^1.0.10", "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", @@ -43,14 +45,25 @@ "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", + "image-size": "^1.0.0", "ipcheck": "^0.1.0", + "loadavg-windows": "^1.1.1", "minimist": "^1.2.0", + "mongodb": "^4.0.1", "multiparty": "^4.2.1", "nedb": "^1.8.0", "node-forge": "^0.10.0", + "node-rdpjs-2": "^0.3.5", + "node-windows": "^1.0.0-beta.5", + "nodemailer": "^6.6.3", + "otplib": "^10.2.3", + "saslprep": "^1.0.3", + "ssh2": "^1.1.0", + "web-push": "^3.4.5", "ws": "^5.2.3", "xmldom": "^0.5.0", - "yauzl": "^2.10.0" + "yauzl": "^2.10.0", + "yubikeyotp": "^0.2.0" }, "repository": { "type": "git", diff --git a/views/default.handlebars b/views/default.handlebars index 385e8203..d3c16bf5 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -13900,12 +13900,14 @@ } var multiFactor = 0; - if ((user.otpsecret > 0) || (user.otphkeys > 0)) { + if ((user.otpsecret > 0) || (user.otphkeys > 0) || (user.otpekey > 0)) { multiFactor = 1; var factors = []; if (user.otpsecret > 0) { factors.push("Authentication App"); } if (user.otphkeys > 0) { factors.push("Security Key"); } + if (user.otpekey > 0) { factors.push("Email"); } if (user.otpkeys > 0) { factors.push("Backup Codes"); } + if (user.otpdev > 0) { factors.push("Device Push"); } if ((user.phone != null) && (features & 0x04000000)) { factors.push("SMS"); } x += addDeviceAttribute("Security", ' ' + factors.join(', ')); }