mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Ensure that the login account should be locked after N number of attempts. N is configurable using the 'MAX_LOGIN_ATTEMPTS' parameter. Fixes #6337
This commit is contained in:
committed by
Akshay Joshi
parent
c2db647379
commit
a3d3c74e67
@@ -129,6 +129,10 @@ def validate_user(data):
|
||||
if 'auth_source' in data and data['auth_source'] != "":
|
||||
new_data['auth_source'] = data['auth_source']
|
||||
|
||||
if 'locked' in data and not data['locked']:
|
||||
new_data['locked'] = data['locked']
|
||||
new_data['login_attempts'] = 0
|
||||
|
||||
return new_data
|
||||
|
||||
|
||||
@@ -207,7 +211,8 @@ def user(uid):
|
||||
'email': u.email,
|
||||
'active': u.active,
|
||||
'role': u.roles[0].id,
|
||||
'auth_source': u.auth_source
|
||||
'auth_source': u.auth_source,
|
||||
'locked': u.locked
|
||||
}
|
||||
else:
|
||||
users = User.query.all()
|
||||
@@ -219,7 +224,8 @@ def user(uid):
|
||||
'email': u.email,
|
||||
'active': u.active,
|
||||
'role': u.roles[0].id,
|
||||
'auth_source': u.auth_source
|
||||
'auth_source': u.auth_source,
|
||||
'locked': u.locked
|
||||
})
|
||||
|
||||
res = users_data
|
||||
@@ -316,7 +322,8 @@ def create_user(data):
|
||||
'username': usr.username,
|
||||
'email': usr.email,
|
||||
'active': usr.active,
|
||||
'role': usr.roles[0].id
|
||||
'role': usr.roles[0].id,
|
||||
'locked': usr.locked
|
||||
}
|
||||
|
||||
|
||||
@@ -599,7 +606,8 @@ def update(uid):
|
||||
'email': usr.email,
|
||||
'active': usr.active,
|
||||
'role': usr.roles[0].id,
|
||||
'auth_source': usr.auth_source
|
||||
'auth_source': usr.auth_source,
|
||||
'locked': usr.locked
|
||||
}
|
||||
|
||||
return ajax_response(
|
||||
|
||||
@@ -436,6 +436,19 @@ define([
|
||||
editable: function(m) {
|
||||
return (m.get('auth_source') == DEFAULT_AUTH_SOURCE);
|
||||
},
|
||||
},{
|
||||
id: 'locked',
|
||||
label: gettext('Locked'),
|
||||
type: 'switch',
|
||||
cell: 'switch',
|
||||
disabled: false,
|
||||
sortable: false,
|
||||
editable: function (m){
|
||||
if (!m.get('locked')) {
|
||||
return false;
|
||||
}
|
||||
return (m.get('id') != userInfo['id']);
|
||||
},
|
||||
}],
|
||||
validate: function() {
|
||||
var errmsg = null,
|
||||
|
||||
Reference in New Issue
Block a user