Merge pull request !2949 from rhodecode-enterprise-ce security-audit-improvements
Changes from branch: Security audit improvements
This commit is contained in:
commit
01e582003c
29 changed files with 423 additions and 26 deletions
|
|
@ -42,7 +42,9 @@ class TestAdminUsersView(TestController):
|
|||
response = self.app.get(route_path("users_data"), extra_environ=xhr_header)
|
||||
|
||||
all_users = (
|
||||
User.query().filter(User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER])).count()
|
||||
User.query()
|
||||
.filter(User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER, User.SECURITY_USER]))
|
||||
.count()
|
||||
)
|
||||
assert response.json["recordsTotal"] == all_users
|
||||
|
||||
|
|
@ -53,7 +55,9 @@ class TestAdminUsersView(TestController):
|
|||
)
|
||||
|
||||
all_users = (
|
||||
User.query().filter(User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER])).count()
|
||||
User.query()
|
||||
.filter(User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER, User.SECURITY_USER]))
|
||||
.count()
|
||||
)
|
||||
assert response.json["recordsTotal"] == all_users
|
||||
assert response.json["recordsFiltered"] == 0
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
|
|||
def user_actions(user_id, username):
|
||||
return _render("user_actions", user_id, username)
|
||||
|
||||
excluded_users = User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER])
|
||||
excluded_users = User.username.notin_([User.DEFAULT_USER, User.GHOST_USER, User.AI_USER, User.SECURITY_USER])
|
||||
users_data_total_count = User.query().filter(excluded_users).count()
|
||||
|
||||
users_data_total_inactive_count = User.query().filter(excluded_users).filter(User.active != true()).count()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue