mirror of
https://github.com/ansible/awx.git
synced 2024-11-01 08:21:15 +03:00
only run saml pipeline if saml social auth
* Do not trigger saml social auth pipeline methods if the user logging in was not created by the saml social auth backend.
This commit is contained in:
parent
de02138dfd
commit
e49dfd6ee2
@ -493,7 +493,8 @@ else:
|
||||
SOCIAL_AUTH_STRATEGY = 'social_django.strategy.DjangoStrategy'
|
||||
SOCIAL_AUTH_STORAGE = 'social_django.models.DjangoStorage'
|
||||
SOCIAL_AUTH_USER_MODEL = AUTH_USER_MODEL # noqa
|
||||
SOCIAL_AUTH_PIPELINE = (
|
||||
|
||||
_SOCIAL_AUTH_PIPELINE_BASE = (
|
||||
'social_core.pipeline.social_auth.social_details',
|
||||
'social_core.pipeline.social_auth.social_uid',
|
||||
'social_core.pipeline.social_auth.auth_allowed',
|
||||
@ -507,6 +508,12 @@ SOCIAL_AUTH_PIPELINE = (
|
||||
'awx.sso.pipeline.set_is_active_for_new_user',
|
||||
'social_core.pipeline.user.user_details',
|
||||
'awx.sso.pipeline.prevent_inactive_login',
|
||||
)
|
||||
SOCIAL_AUTH_PIPELINE = _SOCIAL_AUTH_PIPELINE_BASE + (
|
||||
'awx.sso.pipeline.update_user_orgs',
|
||||
'awx.sso.pipeline.update_user_teams',
|
||||
)
|
||||
SOCIAL_AUTH_SAML_PIPELINE = _SOCIAL_AUTH_PIPELINE_BASE + (
|
||||
'awx.sso.pipeline.update_user_orgs_by_saml_attr',
|
||||
'awx.sso.pipeline.update_user_teams_by_saml_attr',
|
||||
'awx.sso.pipeline.update_user_orgs',
|
||||
|
Loading…
Reference in New Issue
Block a user