Merge branch 'knaperek-master' into user-fetching-customization

Author: mhindery

djangosaml2/acs_failures.py

@@ -7,6 +7,6 @@
 from django.shortcuts import render
 
 
-def template_failure(request, exception=None, **kwargs):
+def template_failure(request, exception=None, status=403, **kwargs):
     """ Renders a simple template with an error message. """
-    return render(request, 'djangosaml2/login_error.html', {'exception': exception}, status=kwargs.get('status', 403))
+    return render(request, 'djangosaml2/login_error.html', {'exception': exception}, status=status)

djangosaml2/tests/__init__.py

@@ -53,8 +53,6 @@
 
 User = get_user_model()
 
-PY_VERSION = sys.version_info[:2]
-
 
 class SAML2Tests(TestCase):
 

djangosaml2/views.py

@@ -316,7 +316,7 @@ def assertion_consumer_service(request,
                              create_unknown_user=create_unknown_user)
     if user is None:
         logger.warning("Could not authenticate user received in SAML Assertion. Session info: %s", session_info)
-        return fail_acs_response(request, exception=Exception('No user could be authenticated.'))
+        return fail_acs_response(request, exception=PermissionDenied('No user could be authenticated.'))
 
     auth.login(request, user)
     _set_subject_id(request.session, session_info['name_id'])