mirror of
https://github.com/ansible/awx.git
synced 2024-11-01 16:51:11 +03:00
SAML configuration changes based on feedback from field.
1. Default SOCIAL_AUTH_SAML_SP_ENTITY_ID to the Tower hostname/base URL. 2. Refer to the callback URL as the Assertion Consumer Service, per common SAML notation.
This commit is contained in:
parent
ec773f57d9
commit
b1e6264ac0
@ -890,16 +890,18 @@ register(
|
||||
def get_saml_metadata_url():
|
||||
return urlparse.urljoin(settings.TOWER_URL_BASE, reverse('sso:saml_metadata'))
|
||||
|
||||
def get_saml_entity_id():
|
||||
return settings.TOWER_URL_BASE
|
||||
|
||||
register(
|
||||
'SOCIAL_AUTH_SAML_CALLBACK_URL',
|
||||
field_class=fields.CharField,
|
||||
read_only=True,
|
||||
default=SocialAuthCallbackURL('saml'),
|
||||
label=_('SAML Service Provider Callback URL'),
|
||||
label=_('SAML Assertion Consumer Service (ACS) URL'),
|
||||
help_text=_('Register Tower as a service provider (SP) with each identity '
|
||||
'provider (IdP) you have configured. Provide your SP Entity ID '
|
||||
'and this callback URL for your application.'),
|
||||
'and this ACS URL for your application.'),
|
||||
category=_('SAML'),
|
||||
category_slug='saml',
|
||||
depends_on=['TOWER_URL_BASE'],
|
||||
@ -923,13 +925,15 @@ register(
|
||||
'SOCIAL_AUTH_SAML_SP_ENTITY_ID',
|
||||
field_class=fields.CharField,
|
||||
allow_blank=True,
|
||||
default='',
|
||||
default=get_saml_entity_id,
|
||||
label=_('SAML Service Provider Entity ID'),
|
||||
help_text=_('The application-defined unique identifier used as the '
|
||||
'audience of the SAML service provider (SP) configuration.'),
|
||||
'audience of the SAML service provider (SP) configuration. '
|
||||
'This is usually the URL for Tower.'),
|
||||
category=_('SAML'),
|
||||
category_slug='saml',
|
||||
feature_required='enterprise_auth',
|
||||
depends_on=['TOWER_URL_BASE'],
|
||||
)
|
||||
|
||||
register(
|
||||
|
Loading…
Reference in New Issue
Block a user