External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5497 from jainnikhil30/devel

Browse Source 
fix the saml_admin_attr not working

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-01-03 14:25:59 +00:00
committed by GitHub
parent 0809c27bd1 93dda04fd0
commit 18e9121db4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/sso/pipeline.py
View File

@@ -78,7 +78,7 @@ def _update_m2m_from_expression(user, related, expr, remove=True):
related.remove(user) related.remove(user)
def _update_org_from_attr(user, related, attr, remove, remove_admins): def _update_org_from_attr(user, related, attr, remove, remove_admins, remove_auditors):
from awx.main.models import Organization from awx.main.models import Organization
org_ids = [] org_ids = []
@@ -97,6 +97,9 @@ def _update_org_from_attr(user, related, attr, remove, remove_admins):
[o.admin_role.members.remove(user) for o in [o.admin_role.members.remove(user) for o in
Organization.objects.filter(Q(admin_role__members=user) & ~Q(id__in=org_ids))] Organization.objects.filter(Q(admin_role__members=user) & ~Q(id__in=org_ids))]
if remove_auditors:
[o.auditor_role.members.remove(user) for o in
Organization.objects.filter(Q(auditor_role__members=user) & ~Q(id__in=org_ids))]
def update_user_orgs(backend, details, user=None, *args, **kwargs): def update_user_orgs(backend, details, user=None, *args, **kwargs):
''' '''
@@ -162,9 +165,9 @@ def update_user_orgs_by_saml_attr(backend, details, user=None, *args, **kwargs):
attr_admin_values = kwargs.get('response', {}).get('attributes', {}).get(org_map.get('saml_admin_attr'), []) attr_admin_values = kwargs.get('response', {}).get('attributes', {}).get(org_map.get('saml_admin_attr'), [])
attr_auditor_values = kwargs.get('response', {}).get('attributes', {}).get(org_map.get('saml_auditor_attr'), []) attr_auditor_values = kwargs.get('response', {}).get('attributes', {}).get(org_map.get('saml_auditor_attr'), [])
_update_org_from_attr(user, "member_role", attr_values, remove, False) _update_org_from_attr(user, "member_role", attr_values, remove, False, False)
_update_org_from_attr(user, "admin_role", attr_admin_values, False, remove_admins) _update_org_from_attr(user, "admin_role", attr_admin_values, False, remove_admins, False)
_update_org_from_attr(user, "auditor_role", attr_auditor_values, False, remove_auditors) _update_org_from_attr(user, "auditor_role", attr_auditor_values, False, False, remove_auditors)
def update_user_teams_by_saml_attr(backend, details, user=None, *args, **kwargs): def update_user_teams_by_saml_attr(backend, details, user=None, *args, **kwargs):