External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

more efficiently determine saml team mapping

Browse Source
This commit is contained in:
Chris Meyers
2018-01-09 10:45:10 -05:00
parent 664bdec57f
commit 0a9d3d47b9
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
awx/sso/pipeline.py
View File

@@ -186,27 +186,30 @@ def update_user_teams_by_saml_attr(backend, details, user=None, *args, **kwargs)
if team_map.get('saml_attr') is None: if team_map.get('saml_attr') is None:
return return
attr_values = kwargs.get('response', {}).get('attributes', {}).get(team_map['saml_attr'], []) saml_team_names = set(kwargs
.get('response', {})
.get('attributes', {})
.get(team_map['saml_attr'], []))
team_ids = [] team_ids = []
for team_name in attr_values: for team_name_map in team_map.get('team_org_map', []):
for team_name_map in team_map.get('team_org_map', []): team_name = team_name_map.get('team', '')
if team_name_map.get('team', '') == team_name: if team_name in saml_team_names:
if multiple_orgs: if multiple_orgs:
if not team_name_map.get('organization', ''): if not team_name_map.get('organization', ''):
# Settings field validation should prevent this. # Settings field validation should prevent this.
logger.error("organization name invalid for team {}".format(team_name)) logger.error("organization name invalid for team {}".format(team_name))
continue continue
org = Organization.objects.get_or_create(name=team_name_map['organization'])[0] org = Organization.objects.get_or_create(name=team_name_map['organization'])[0]
else: else:
try: try:
org = Organization.objects.order_by('pk')[0] org = Organization.objects.order_by('pk')[0]
except IndexError: except IndexError:
continue continue
team = Team.objects.get_or_create(name=team_name, organization=org)[0] team = Team.objects.get_or_create(name=team_name, organization=org)[0]
team_ids.append(team.id) team_ids.append(team.id)
team.member_role.members.add(user) team.member_role.members.add(user)
if team_map.get('remove', True): if team_map.get('remove', True):
[t.member_role.members.remove(user) for t in [t.member_role.members.remove(user) for t in