Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 00:15:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6037

Browse Source
This commit is contained in:
Baris Usakli
2017-11-17 15:26:36 -05:00
parent ea3fde332b
commit 2065f895d5
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/admin/settings/user.json
View File

@@ -19,6 +19,8 @@
"themes": "Themes", "themes": "Themes",
"disable-user-skins": "Prevent users from choosing a custom skin", "disable-user-skins": "Prevent users from choosing a custom skin",
"account-protection": "Account Protection", "account-protection": "Account Protection",
"admin-relogin-duration": "Admin relogin duration (minutes)",
"admin-relogin-duration-help": "After a set amount of time accessing the admin section will require re-login, set to 0 to disable",
"login-attempts": "Login attempts per hour", "login-attempts": "Login attempts per hour",
"login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time", "login-attempts-help": "If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time",
"lockout-duration": "Account Lockout Duration (minutes)", "lockout-duration": "Account Lockout Duration (minutes)",

10
src/middleware/user.js
View File

@@ -173,10 +173,12 @@ module.exports = function (middleware) {
} }
var loginTime = req.session.meta ? req.session.meta.datetime : 0; var loginTime = req.session.meta ? req.session.meta.datetime : 0;
if (loginTime && parseInt(loginTime, 10) > Date.now() - 3600000) { var adminReloginDuration = (meta.config.adminReloginDuration || 60) * 60000;
var timeLeft = parseInt(loginTime, 10) - (Date.now() - 3600000); var disabled = parseInt(meta.config.adminReloginDuration, 10) === 0;
if (timeLeft < 300000) { if (disabled || (loginTime && parseInt(loginTime, 10) > Date.now() - adminReloginDuration)) {
req.session.meta.datetime += 300000; var timeLeft = parseInt(loginTime, 10) - (Date.now() - adminReloginDuration);
if (timeLeft < Math.min(300000, adminReloginDuration)) {
req.session.meta.datetime += Math.min(300000, adminReloginDuration);
} }
return next(); return next();

7
src/views/admin/settings/user.tpl
View File

@@ -105,6 +105,13 @@
<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/user:account-protection]]</div> <div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/user:account-protection]]</div>
<div class="col-sm-10 col-xs-12"> <div class="col-sm-10 col-xs-12">
<form> <form>
<div class="form-group">
<label for="adminReloginDuration">[[admin/settings/user:admin-relogin-duration]]</label>
<input id="adminReloginDuration" type="text" class="form-control" data-field="adminReloginDuration" placeholder="60" />
<p class="help-block">
[[admin/settings/user:admin-relogin-duration-help]]
</p>
</div>
<div class="form-group"> <div class="form-group">
<label for="loginAttempts">[[admin/settings/user:login-attempts]]</label> <label for="loginAttempts">[[admin/settings/user:login-attempts]]</label>
<input id="loginAttempts" type="text" class="form-control" data-field="loginAttempts" placeholder="5" /> <input id="loginAttempts" type="text" class="form-control" data-field="loginAttempts" placeholder="5" />