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

Merge pull request #4312 from cchurch/saml-error-handling

Browse Source 
SAML error handling fixes
This commit is contained in:
Chris Church
2016-12-12 12:29:17 -05:00
committed by GitHub
parent bb7a201c2f 1e157c2255
commit c52366e580
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views.py
View File

@@ -534,7 +534,7 @@ class AuthView(APIView):
saml_backend_data = dict(backend_data.items()) saml_backend_data = dict(backend_data.items())
saml_backend_data['login_url'] = '%s?idp=%s' % (login_url, idp) saml_backend_data['login_url'] = '%s?idp=%s' % (login_url, idp)
full_backend_name = '%s:%s' % (name, idp) full_backend_name = '%s:%s' % (name, idp)
if err_backend == full_backend_name and err_message: if (err_backend == full_backend_name or err_backend == name) and err_message:
saml_backend_data['error'] = err_message saml_backend_data['error'] = err_message
data[full_backend_name] = saml_backend_data data[full_backend_name] = saml_backend_data
else: else:

7
awx/sso/conf.py
View File

@@ -924,13 +924,12 @@ register(
register( register(
'SOCIAL_AUTH_SAML_SP_ENTITY_ID', 'SOCIAL_AUTH_SAML_SP_ENTITY_ID',
field_class=fields.URLField, field_class=fields.CharField,
schemes=('http', 'https'),
allow_blank=True, allow_blank=True,
default='', default='',
label=_('SAML Service Provider Entity ID'), label=_('SAML Service Provider Entity ID'),
help_text=_('Set to a URL for a domain name you own (does not need to be a ' help_text=_('The application-defined unique identifier used as the '
'valid URL; only used as a unique ID).'), 'audience of the SAML service provider (SP) configuration.'),
category=_('SAML'), category=_('SAML'),
category_slug='saml', category_slug='saml',
feature_required='enterprise_auth', feature_required='enterprise_auth',

6
awx/sso/views.py
View File

@@ -83,7 +83,11 @@ class MetadataView(View):
'saml', 'saml',
redirect_uri=complete_url, redirect_uri=complete_url,
) )
metadata, errors = saml_backend.generate_metadata_xml() try:
metadata, errors = saml_backend.generate_metadata_xml()
except Exception as e:
logger.exception('unable to generate SAML metadata')
errors = e
if not errors: if not errors:
return HttpResponse(content=metadata, content_type='text/xml') return HttpResponse(content=metadata, content_type='text/xml')
else: else: