0002-auth_saml-display-xml-metadata-in-separate-view-7049.patch

Valentin Deniaud, 20 octobre 2022 17:42

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

Subject: [PATCH 2/2] auth_saml: display xml metadata in separate view (#70492)

 src/authentic2/apps/authenticators/models.py | 10 +++++----
 src/authentic2_auth_saml/models.py           |  9 ++++++++
 src/authentic2_auth_saml/urls.py             | 11 ++++++++--
 src/authentic2_auth_saml/views.py            | 23 ++++++++++++++++++++
 tests/test_manager_authenticators.py         | 19 ++++++++++++++++
 5 files changed, 66 insertions(+), 6 deletions(-)

     from django.db.models import Max
     from django.shortcuts import render, reverse
     from django.utils.formats import date_format
     from django.utils.html import format_html
     from django.utils.text import capfirst
     from django.utils.translation import gettext_lazy as _
     from django.utils.translation import pgettext_lazy
-...
                 if isinstance(value, datetime.datetime):
                     value = date_format(value, 'DATETIME_FORMAT')
                 yield _('%(field)s: %(value)s') % {
                     'field': capfirst(self._meta.get_field(field).verbose_name),
                     'value': value,
+                }
                 yield format_html(
                     _('{field}: {value}'),
                     field=capfirst(self._meta.get_field(field).verbose_name),
                     value=value,
+                )
         def shown(self, ctx=()):
             if not self.show_condition:

     from django.contrib.postgres.fields import JSONField
     from django.core.exceptions import ValidationError
     from django.db import models
     from django.urls import reverse
     from django.utils.safestring import mark_safe
     from django.utils.translation import gettext_lazy as _
     from authentic2.apps.authenticators.models import (
-...
                 getattr(settings, 'MELLON_PRIVATE_KEY', '') and getattr(settings, 'MELLON_PUBLIC_KEYS', '')
+            )
         def get_metadata_display(self):
             if not self.metadata:
                 return ''
             url = reverse('a2-manager-saml-authenticator-metadata', kwargs={'pk': self.pk})
             return mark_safe('<a href=%s>%s</a>' % (url, _('View metadata')))
         def login(self, request, *args, **kwargs):
             from . import views

     # 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.urls import include, re_path
     from django.urls import include, path, re_path
     from . import views
     urlpatterns = [
         re_path(
             r'^accounts/saml/',
             include('mellon.urls'),
             kwargs={'template_base': 'authentic2/base.html', 'logout_next_url': '/logout/'},
+        )
         ),
         path(
             'authenticators/<int:pk>/metadata.xml',
             views.authenticator_metadata,
             name='a2-manager-saml-authenticator-metadata',
         ),
+    ]

     import xml.etree.ElementTree as ET
     from django.http import Http404, HttpResponse
     from django.shortcuts import render
     from django.template.loader import render_to_string
     from django.views.generic import DetailView
     from mellon.utils import get_idp
     from authentic2.utils.misc import redirect_to_login
     from .models import SAMLAuthenticator
     def login(request, authenticator, *args, **kwargs):
         context = kwargs.pop('context', {}).copy()
-...
             user_saml_identifier.idp = get_idp(user_saml_identifier.issuer.entity_id)
         context['user_saml_identifiers'] = user_saml_identifiers
         return render_to_string('authentic2_auth_saml/profile.html', context, request=request)
     class SAMLAuthenticatorMetadataView(DetailView):
         model = SAMLAuthenticator
         def get(self, *args, **kwargs):
             authenticator = self.get_object()
             if not authenticator.metadata:
                 raise Http404()
             metadata = ET.fromstring(authenticator.metadata)
             ET.indent(metadata)
             return HttpResponse(ET.tostring(metadata, encoding='utf-8'), content_type='text/xml')
     authenticator_metadata = SAMLAuthenticatorMetadataView.as_view()

         resp.form.submit(status=302)
     def test_authenticators_saml_view_metadata(app, superuser):
         authenticator = SAMLAuthenticator.objects.create(slug='idp1')
         resp = login(app, superuser)
         resp = app.get('/manage/authenticators/%s/detail/' % authenticator.pk)
         assert 'Metadata (XML):' not in resp.text
         assert app.get('/manage/authenticators/%s/metadata.xml' % authenticator.pk, status=404)
         authenticator.metadata = '<a><b></b></a>'
         authenticator.save()
         resp = app.get('/manage/authenticators/%s/detail/' % authenticator.pk)
         assert 'Metadata (XML):' in resp.text
         resp = resp.click('View metadata')
         assert resp.text == '<a>\n  <b />\n</a>'
     def test_authenticators_saml_missing_signing_key(app, superuser, settings):
         authenticator = SAMLAuthenticator.objects.create(slug='idp1')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-auth_saml-display-xml-metadata-in-separate-view-7049.patch