0001-wip.patch

Valentin Deniaud, 19 juillet 2021 17:04

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

Subject: [PATCH] wip

 mellon/templates/mellon/debug_login.html | 10 +++
 mellon/urls.py                           |  1 +
 mellon/views.py                          | 85 ++++++++++++++++++------
 3 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 mellon/templates/mellon/debug_login.html

     {% load i18n %}
     {% block content %}
     <p><a class="button" href="?">{% trans "Try again" %}</a></p>
     <p><strong>{% trans "Attributes:" %}</strong> <pre>{{ attributes|pprint }}</pre></p>
     <p><strong>{% trans "SAML assertion:" %}</strong> <pre>{{ assertion_dump }}</pre></p>
     <p><strong>{% trans "SAML response:" %}</strong> <pre>{{ response_dump }}</pre></p>
     <p><strong>{% trans "SAML artifact:" %}</strong> <pre>{{ login.msgBody }}</pre></p>
     <p><strong>{% trans "Logs:" %}</strong> <pre>{{ logs }}</pre></p>
     {% endblock %}

mellon/urls.py
8	8
9	9	urlpatterns = [
10	10	url('login/$', views.login, name='mellon_login'),
	11	url('login/debug/$', views.debug_login, name='mellon_debug_login'),
11	12	url('logout/$', views.logout, name='mellon_logout'),
12	13	url('metadata/$', views.metadata, name='mellon_metadata'),
13	14	]

     from __future__ import unicode_literals
     from importlib import import_module
     from io import StringIO
     import logging
     import requests
     import lasso
-...
     import django.http
     from django.views.generic import View
     from django.http import HttpResponseRedirect, HttpResponse
     from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden
     from django.contrib import auth
     from django.contrib.auth import get_user_model
     from django.conf import settings
-...
     class LoginView(ProfileMixin, LogMixin, View):
         allow_redirect_to_debug = True
         def dispatch(self, request, *args, **kwargs):
             if request.session.get('mellon_debug_login') and self.allow_redirect_to_debug:
                 url = reverse('mellon_debug_login')
                 url = "%s?%s" % (url, request.META.get('QUERY_STRING', ''))
                 if request.method == 'POST':
                     url += '&' + request.POST.urlencode()
                 return HttpResponseRedirect(url)
             return super().dispatch(request, *args, **kwargs)
         @property
         def template_base(self):
             return self.kwargs.get('template_base', 'base.html')
-...
             next_url = self.get_next_url(default=resolve_url(settings.LOGIN_REDIRECT_URL))
             if user is not None:
                 if user.is_active:
                     utils.login(request, user)
                     session_index = attributes['session_index']
                     if session_index:
                         if not request.session.session_key:
                             request.session.create()
                         models.SessionIndex.objects.get_or_create(
                             saml_identifier=user.saml_identifier,
                             session_key=request.session.session_key,
                             session_index=session_index,
+                        )
                     self.log.info(
                         'user %s (NameID is %r) logged in using SAML', user, attributes['name_id_content']
+                    )
                     request.session['mellon_session'] = utils.flatten_datetime(attributes)
                     if 'session_not_on_or_after' in attributes and not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE:
                         request.session.set_expiry(
                             utils.get_seconds_expiry(attributes['session_not_on_or_after'])
+                        )
                     self.login(user, attributes)
                 else:
                     self.log.warning(
                         'user %s (NameID is %r) is inactive, login refused', user, attributes['name_id_content']
-...
             return HttpResponseRedirect(next_url)
         def login(self, user, attributes):
             utils.login(self.request, user)
             session_index = attributes['session_index']
             if session_index:
                 if not self.request.session.session_key:
                     self.request.session.create()
                 models.SessionIndex.objects.get_or_create(
                     saml_identifier=user.saml_identifier,
                     session_key=self.request.session.session_key,
                     session_index=session_index,
+                )
             self.log.info(
                 'user %s (NameID is %r) logged in using SAML', user, attributes['name_id_content']
+            )
             self.request.session['mellon_session'] = utils.flatten_datetime(attributes)
             if 'session_not_on_or_after' in attributes and not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE:
                 self.request.session.set_expiry(
                     utils.get_seconds_expiry(attributes['session_not_on_or_after'])
+                )
         def retry_login(self):
             """Retry login if it failed for a temporary error.
-...
     def metadata(request, **kwargs):
         metadata = utils.create_metadata(request)
         return HttpResponse(metadata, content_type='text/xml')
     class DebugLoginView(LoginView):
         allow_redirect_to_debug = False
         def dispatch(self, request, *args, **kwargs):
             if not request.user.is_superuser or not settings.DEBUG:
                 return HttpResponseForbidden()
             request.session['mellon_debug_login'] = True
             self.stream = StringIO()
             handler = logging.StreamHandler(self.stream)
             handler.setLevel(logging.DEBUG)
             self.log.root.addHandler(handler)
             return super().dispatch(request, *args, **kwargs)
         def authenticate(self, request, login, attributes):
             response = super().authenticate(request, login, attributes)
             request.session['mellon_debug_login'] = False
             context = {
                 'logs': self.stream.getvalue(),
                 'attributes': attributes,
                 'login': login,
                 'response_dump': login.response and login.response.debug(4),
                 'assertion_dump': login.assertion and login.assertion.debug(4),
+            }
             return self.render(request, 'mellon/debug_login.html', context)
         def login(self, user, *args, **kwargs):
             self.log.info('mellon: would login user %s (username %s)', user.get_full_name(), user)
     debug_login = csrf_exempt(DebugLoginView.as_view())
+    -

Projet

Général

Profil

Produits Entr'ouvert » django-mellon

0001-wip.patch