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

Change ldap and other sso defaults to remove from team/admin

Browse Source 
Previously the default was not to remove an sso user from a team or as
an admin if they were removed from the SSO service.  This changes that
and updates some readme-type lines.
This commit is contained in:
Matthew Jones
2016-06-09 16:01:16 -04:00
parent 5a145ddd47
commit c124aeaf14
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/sso/backends.py
View File

@@ -176,7 +176,7 @@ class SAMLAuth(BaseSAMLAuth):
return super(SAMLAuth, self).get_user(user_id) return super(SAMLAuth, self).get_user(user_id)
def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=False): def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=True):
''' '''
Hepler function to update m2m relationship based on LDAP group membership. Hepler function to update m2m relationship based on LDAP group membership.
''' '''
@@ -220,7 +220,7 @@ def on_populate_user(sender, **kwargs):
org_map = getattr(backend.settings, 'ORGANIZATION_MAP', {}) org_map = getattr(backend.settings, 'ORGANIZATION_MAP', {})
for org_name, org_opts in org_map.items(): for org_name, org_opts in org_map.items():
org, created = Organization.objects.get_or_create(name=org_name) org, created = Organization.objects.get_or_create(name=org_name)
remove = bool(org_opts.get('remove', False)) remove = bool(org_opts.get('remove', True))
admins_opts = org_opts.get('admins', None) admins_opts = org_opts.get('admins', None)
remove_admins = bool(org_opts.get('remove_admins', remove)) remove_admins = bool(org_opts.get('remove_admins', remove))
_update_m2m_from_groups(user, ldap_user, org.admin_role.members, admins_opts, _update_m2m_from_groups(user, ldap_user, org.admin_role.members, admins_opts,
@@ -238,7 +238,7 @@ def on_populate_user(sender, **kwargs):
org, created = Organization.objects.get_or_create(name=team_opts['organization']) org, created = Organization.objects.get_or_create(name=team_opts['organization'])
team, created = Team.objects.get_or_create(name=team_name, organization=org) team, created = Team.objects.get_or_create(name=team_name, organization=org)
users_opts = team_opts.get('users', None) users_opts = team_opts.get('users', None)
remove = bool(team_opts.get('remove', False)) remove = bool(team_opts.get('remove', True))
_update_m2m_from_groups(user, ldap_user, team.member_role.users, users_opts, _update_m2m_from_groups(user, ldap_user, team.member_role.users, users_opts,
remove) remove)

6
awx/sso/pipeline.py
View File

@@ -44,7 +44,7 @@ def prevent_inactive_login(backend, details, user=None, *args, **kwargs):
raise AuthInactive(backend) raise AuthInactive(backend)
def _update_m2m_from_expression(user, rel, expr, remove=False): def _update_m2m_from_expression(user, rel, expr, remove=True):
''' '''
Helper function to update m2m relationship based on user matching one or Helper function to update m2m relationship based on user matching one or
more expressions. more expressions.
@@ -95,7 +95,7 @@ def update_user_orgs(backend, details, user=None, *args, **kwargs):
continue continue
# Update org admins from expression(s). # Update org admins from expression(s).
remove = bool(org_opts.get('remove', False)) remove = bool(org_opts.get('remove', True))
admins_expr = org_opts.get('admins', None) admins_expr = org_opts.get('admins', None)
remove_admins = bool(org_opts.get('remove_admins', remove)) remove_admins = bool(org_opts.get('remove_admins', remove))
_update_m2m_from_expression(user, org.admin_role.members, admins_expr, remove_admins) _update_m2m_from_expression(user, org.admin_role.members, admins_expr, remove_admins)
@@ -133,5 +133,5 @@ def update_user_teams(backend, details, user=None, *args, **kwargs):
# Update team members from expression(s). # Update team members from expression(s).
team = Team.objects.get_or_create(name=team_name, organization=org)[0] team = Team.objects.get_or_create(name=team_name, organization=org)[0]
users_expr = team_opts.get('users', None) users_expr = team_opts.get('users', None)
remove = bool(team_opts.get('remove', False)) remove = bool(team_opts.get('remove', True))
_update_m2m_from_expression(user, team.member_role.members, users_expr, remove) _update_m2m_from_expression(user, team.member_role.members, users_expr, remove)