External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4396 from ryanpetrello/ldap-audit

Browse Source 
properly set `is_system_auditor` on initial LDAP login

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-30 15:28:23 +00:00
committed by GitHub
parent 5d6916f69e a47a2d8567
commit 8c4aac3b6c
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
awx/main/models/__init__.py
View File

@@ -122,18 +122,22 @@ def user_is_system_auditor(user):
@user_is_system_auditor.setter @user_is_system_auditor.setter
def user_is_system_auditor(user, tf): def user_is_system_auditor(user, tf):
if user.id: if not user.id:
if tf: # If the user doesn't have a primary key yet (i.e., this is the *first*
role = Role.singleton('system_auditor') # time they've logged in, and we've just created the new User in this
# must check if member to not duplicate activity stream # request), we need one to set up the system auditor role
if user not in role.members.all(): user.save()
role.members.add(user) if tf:
user._is_system_auditor = True role = Role.singleton('system_auditor')
else: # must check if member to not duplicate activity stream
role = Role.singleton('system_auditor') if user not in role.members.all():
if user in role.members.all(): role.members.add(user)
role.members.remove(user) user._is_system_auditor = True
user._is_system_auditor = False else:
role = Role.singleton('system_auditor')
if user in role.members.all():
role.members.remove(user)
user._is_system_auditor = False
User.add_to_class('is_system_auditor', user_is_system_auditor) User.add_to_class('is_system_auditor', user_is_system_auditor)