Fixed 2FA clear for email, #2963
Ylian Saint-Hilaire committed
Jul 29, 2021 at 13:01 UTC
f1fd5ad58857f0833369381cc2f638b836f707e0
2 files changed
+17
-2
package.json
+14
-1
@@ -36,6 +36,8 @@
36
"sample-config-advanced.json"
37
],
38
"dependencies": {
39
+ "archiver": "^4.0.2",
40
+ "archiver-zip-encrypted": "^1.0.10",
41
"body-parser": "^1.19.0",
42
"cbor": "~5.2.0",
43
"compression": "^1.7.4",
@@ -43,14 +45,25 @@
45
"express": "^4.17.0",
46
"express-handlebars": "^3.1.0",
47
"express-ws": "^4.0.0",
48
+ "image-size": "^1.0.0",
49
"ipcheck": "^0.1.0",
50
+ "loadavg-windows": "^1.1.1",
51
"minimist": "^1.2.0",
52
+ "mongodb": "^4.0.1",
53
"multiparty": "^4.2.1",
54
"nedb": "^1.8.0",
55
"node-forge": "^0.10.0",
56
+ "node-rdpjs-2": "^0.3.5",
57
+ "node-windows": "^1.0.0-beta.5",
58
+ "nodemailer": "^6.6.3",
59
+ "otplib": "^10.2.3",
60
+ "saslprep": "^1.0.3",
61
+ "ssh2": "^1.1.0",
62
+ "web-push": "^3.4.5",
63
"ws": "^5.2.3",
64
"xmldom": "^0.5.0",
53
- "yauzl": "^2.10.0"
65
+ "yauzl": "^2.10.0",
66
+ "yubikeyotp": "^0.2.0"
67
},
68
"repository": {
69
"type": "git",
views/default.handlebars
+3
-1
@@ -13900,12 +13900,14 @@
13900
}
13901
13902
var multiFactor = 0;
13903
- if ((user.otpsecret > 0) || (user.otphkeys > 0)) {
13903
+ if ((user.otpsecret > 0) || (user.otphkeys > 0) || (user.otpekey > 0)) {
13904
multiFactor = 1;
13905
var factors = [];
13906
if (user.otpsecret > 0) { factors.push("Authentication App"); }
13907
if (user.otphkeys > 0) { factors.push("Security Key"); }
13908
+ if (user.otpekey > 0) { factors.push("Email"); }
13909
if (user.otpkeys > 0) { factors.push("Backup Codes"); }
13910
+ if (user.otpdev > 0) { factors.push("Device Push"); }
13911
if ((user.phone != null) && (features & 0x04000000)) { factors.push("SMS"); }
13912
x += addDeviceAttribute("Security", '<img src="images/key12.png" height=12 width=11 title="' + "2nd factor authentication enabled" + '" style="margin-top:2px" /> ' + factors.join(', '));
13913
}