0001-add-kwargs-template_base-to-LoginView-35083.patch

Benjamin Dauvergne, 29 septembre 2019 17:51

Voir les différences: en ligne côte à côte

Subject: [PATCH] add kwargs template_base to LoginView (#35083)

 mellon/templates/mellon/base.html |  2 +-
 mellon/views.py                   | 15 ++++++++++++---
 tests/templates/theme.html        |  7 +++++++
 tests/test_sso_slo.py             | 22 ++++++++++++++++++++++
 tests/urls_tests.py               |  2 --
 tests/urls_tests_template_base.py | 26 ++++++++++++++++++++++++++
 6 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 tests/templates/theme.html
 create mode 100644 tests/urls_tests_template_base.py

mellon/templates/mellon/base.html
1		{% extends "base.html" %}
	1	{% extends template_base\|default:"base.html" %}
2	2
3	3	{% block extra_scripts %}
4	4	{% block mellon_extra_scripts %}

     class LoginView(ProfileMixin, LogMixin, View):
         @property
         def template_base(self):
             return self.kwargs.get('template_base', 'base.html')
         def get_idp(self, request):
             entity_id = request.POST.get('entityID') or request.GET.get('entityID')
             if not entity_id:
-...
             next_url = error_url or self.get_next_url(default=resolve_url(settings.LOGIN_REDIRECT_URL))
             return render(request, 'mellon/authentication_failed.html',
+                          {
                               'template_base': self.template_base,
                               'debug': settings.DEBUG,
                               'reason': reason,
                               'status_codes': status_codes,
-...
                     self.log.warning('user %s (NameID is %r) is inactive, login refused', user,
                                      attributes['name_id_content'])
                     return render(request, 'mellon/inactive_user.html', {
                         'template_base': self.template_base,
                         'user': user,
                         'saml_attributes': attributes})
             else:
                 self.log.warning('no user found for NameID %r', attributes['name_id_content'])
                 return render(request, 'mellon/user_not_found.html',
                               {'saml_attributes': attributes})
                 return render(request, 'mellon/user_not_found.html', {
                                   'template_base': self.template_base,
                                   'saml_attributes': attributes
                               })
             request.session['lasso_session_dump'] = login.session.dump()
             return HttpResponseRedirect(next_url)
-...
             url = app_settings.DISCOVERY_SERVICE_URL
             params = {
                 # prevent redirect loops with the discovery service
                 'entityID': request.build_absolute_uri(reverse('mellon_metadata')),
                 'entityID': request.build_absolute_uri(
                     reverse('mellon_metadata')),
                 'return': return_url,
+            }
             if is_passive:

tests/templates/theme.html
	1	<html>
	2	<body>
	3	<p>Theme is ok</p>
	4	{% block content %}
	5	{% endblock %}
	6	</body>
	7	</html>

     import lasso
     import pytest
     from pytest import fixture
     import django
-...
      u'urn:oasis:names:tc:SAML:2.0:status:RequestDenied']" in caplog.text
     @pytest.mark.urls('urls_tests_template_base')
     def test_template_base(db, app, idp, caplog, sp_settings):
         response = app.get(reverse('mellon_login'))
         url, body, relay_state = idp.process_authn_request_redirect(
             response['Location'],
             auth_result=False,
             msg='User is not allowed to login')
         response = app.post(reverse('mellon_login'), params={'SAMLResponse': body, 'RelayState': relay_state})
         assert 'Theme is ok' in response.text
     def test_no_template_base(db, app, idp, caplog, sp_settings):
         response = app.get(reverse('mellon_login'))
         url, body, relay_state = idp.process_authn_request_redirect(
             response['Location'],
             auth_result=False,
             msg='User is not allowed to login')
         response = app.post(reverse('mellon_login'), params={'SAMLResponse': body, 'RelayState': relay_state})
         assert 'Theme is ok' not in response.text
     def test_sso_request_denied_artifact(db, app, caplog, sp_settings, idp_metadata, idp_private_key, rf):
         sp_settings.MELLON_DEFAULT_ASSERTION_CONSUMER_BINDING = 'artifact'
         request = rf.get('/')

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import django
     from django.conf.urls import url, include
     from django.http import HttpResponse

     # django-mellon - SAML2 authentication for Django
     # Copyright (C) 2014-2019 Entr'ouvert
     # This program is free software: you can redistribute it and/or modify
     # it under the terms of the GNU Affero General Public License as
     # published by the Free Software Foundation, either version 3 of the
     # License, or (at your option) any later version.
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.conf.urls import url, include
     from django.http import HttpResponse
     def homepage(request):
         return HttpResponse('ok')
     urlpatterns = [
         url('^', include('mellon.urls'), kwargs={'template_base': 'theme.html'}),
         url('^$', homepage, name='homepage'),
+    ]
+    -

Projet

Général

Profil

Produits Entr'ouvert » django-mellon

0001-add-kwargs-template_base-to-LoginView-35083.patch