From c124aeaf1421ae95d3aec4799045cb810f3c7c3f Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 9 Jun 2016 16:01:16 -0400 Subject: [PATCH] Change ldap and other sso defaults to remove from team/admin 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. --- awx/sso/backends.py | 6 +++--- awx/sso/pipeline.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/sso/backends.py b/awx/sso/backends.py index e36b616084..3d5edb7ec9 100644 --- a/awx/sso/backends.py +++ b/awx/sso/backends.py @@ -176,7 +176,7 @@ class SAMLAuth(BaseSAMLAuth): 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. ''' @@ -220,7 +220,7 @@ def on_populate_user(sender, **kwargs): org_map = getattr(backend.settings, 'ORGANIZATION_MAP', {}) for org_name, org_opts in org_map.items(): 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) remove_admins = bool(org_opts.get('remove_admins', remove)) _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']) team, created = Team.objects.get_or_create(name=team_name, organization=org) 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, remove) diff --git a/awx/sso/pipeline.py b/awx/sso/pipeline.py index a79aecacb0..756e64279d 100644 --- a/awx/sso/pipeline.py +++ b/awx/sso/pipeline.py @@ -44,7 +44,7 @@ def prevent_inactive_login(backend, details, user=None, *args, **kwargs): 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 more expressions. @@ -95,7 +95,7 @@ def update_user_orgs(backend, details, user=None, *args, **kwargs): continue # 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) remove_admins = bool(org_opts.get('remove_admins', remove)) _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). team = Team.objects.get_or_create(name=team_name, organization=org)[0] 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)