0001-authenticators-add-advanced-setup-view-67875.patch

Valentin Deniaud, 17 août 2022 16:17

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

Subject: [PATCH] authenticators: add advanced setup view (#67875)

 .../apps/authenticators/manager_urls.py       |  5 ++++
 .../authenticator_advanced_edit_form.html     | 20 ++++++++++++++++
 .../authenticator_edit_form.html              | 13 ++++++++++
 src/authentic2/apps/authenticators/views.py   | 18 +++++++++++++-
 src/authentic2_auth_saml/forms.py             | 24 ++++++++++++++++++-
 .../migrations/0001_initial.py                |  4 ++--
 src/authentic2_auth_saml/models.py            | 11 ++++++---
 tests/test_manager_authenticators.py          | 18 +++++++++++---
 8 files changed, 103 insertions(+), 10 deletions(-)
 create mode 100644 src/authentic2/apps/authenticators/templates/authentic2/authenticators/authenticator_advanced_edit_form.html

                 views.edit,
                 name='a2-manager-authenticator-edit',
             ),
             path(
                 'authenticators/<int:pk>/edit/advanced/',
                 views.edit_advanced,
                 name='a2-manager-authenticator-edit-advanced',
             ),
             path(
                 'authenticators/<int:pk>/delete/',
                 views.delete,

     {% extends "authentic2/authenticators/authenticator_common.html" %}
     {% load i18n gadjo %}
     {% block breadcrumb %}
       {{ block.super }}
       <a href="{% url 'a2-manager-authenticator-detail' pk=object.pk %}">{{ object }}</a>
       <a href="{% url 'a2-manager-authenticator-edit' pk=object.pk %}">{% trans "Edit" %}</a>
       <a href="#"></a>
     {% endblock %}
     {% block content %}
       <form method="post" enctype="multipart/form-data">
         {% csrf_token %}
         {{ form|with_template }}
         <div class="buttons">
           <button>{% trans "Save" %}</button>
           <a class="cancel" href="{% url 'a2-manager-authenticator-detail' pk=object.pk %}">{% trans 'Cancel' %}</a>
         </div>
       </form>
     {% endblock %}

       <a href="#"></a>
     {% endblock %}
     {% block appbar %}
       {{ block.super }}
       {% if object.manager_advanced_form_class %}
         <span class="actions">
           <a class="extra-actions-menu-opener"></a>
           <ul class="extra-actions-menu">
             <li><a href="{% url 'a2-manager-authenticator-edit-advanced' pk=object.pk %}">{% trans "Advanced setup" %}</a></li>
           </ul>
         </span>
       {% endif %}
     {% endblock %}
     {% block content %}
       <form method="post" enctype="multipart/form-data">
         {% csrf_token %}

     from django.contrib import messages
     from django.core.exceptions import PermissionDenied
     from django.http import HttpResponseRedirect
     from django.http import Http404, HttpResponseRedirect
     from django.shortcuts import get_object_or_404
     from django.urls import reverse, reverse_lazy
     from django.utils.functional import cached_property
-...
     edit = AuthenticatorEditView.as_view()
     class AuthenticatorAdvancedEditView(AuthenticatorEditView):
         template_name = 'authentic2/authenticators/authenticator_advanced_edit_form.html'
         title = _('Edit authenticator (advanced)')
         def dispatch(self, *args, **kwargs):
             if not hasattr(self.get_object(), 'manager_advanced_form_class'):
                 raise Http404()
             return super().dispatch(*args, **kwargs)
         def get_form_class(self):
             return self.object.manager_advanced_form_class
     edit_advanced = AuthenticatorAdvancedEditView.as_view()
     class AuthenticatorDeleteView(AuthenticatorsMixin, DeleteView):
         template_name = 'authentic2/authenticators/authenticator_delete_form.html'
         title = _('Delete authenticator')

     class SAMLAuthenticatorForm(forms.ModelForm):
         class Meta:
             model = SAMLAuthenticator
             exclude = ('ou',)
             exclude = (
                 'ou',
                 'verify_ssl_certificate',
                 'transient_federation_attribute',
                 'realm',
                 'username_template',
                 'name_id_policy_format',
                 'name_id_policy_allow_create',
                 'force_authn',
                 'add_authnrequest_next_url_extension',
                 'group_attribute',
                 'create_group',
                 'error_url',
                 'error_redirect_after_timeout',
                 'authn_classref',
                 'attribute_mapping',
+            )
     class SAMLAuthenticatorAdvancedForm(forms.ModelForm):
         class Meta:
             model = SAMLAuthenticator
             fields = SAMLAuthenticatorForm.Meta.exclude
     class RoleChoiceField(forms.ModelChoiceField):

                         'realm',
                         models.CharField(
                             default='saml',
                             help_text='The default realm to associate to user, used when setting username.',
                             help_text='The default realm to associate to user, can be used in username template.',
                             max_length=32,
                             verbose_name='Realm',
                             verbose_name='Realm (realm)',
                         ),
                     ),
+                    (

             blank=True,
+        )
         realm = models.CharField(
             _('Realm'),
             _('Realm (realm)'),
             max_length=32,
             help_text=_('The default realm to associate to user, used when setting username.'),
             help_text=_('The default realm to associate to user, can be used in username template.'),
             default='saml',
+        )
         username_template = models.CharField(
-...
             'metadata_path',
             'metadata',
             'provision',
             'username_template',
+        ]
         class Meta:
-...
             return SAMLAuthenticatorForm
         @property
         def manager_advanced_form_class(self):
             from .forms import SAMLAuthenticatorAdvancedForm
             return SAMLAuthenticatorAdvancedForm
         def clean(self):
             if not (self.metadata or self.metadata_path or self.metadata_url):
                 raise ValidationError(_('One of the metadata fields must be filled.'))

         resp = app.get('/manage/authenticators/add/')
         assert 'Password' not in resp.text
         # password authenticator has no advanced setup form
         app.get('/manage/authenticators/%s/edit/advanced/' % authenticator.pk, status=404)
         app.get('/manage/authenticators/%s/edit/' % authenticator.pk)
         assert 'Advanced setup' not in resp.text
     @pytest.mark.freeze_time('2022-04-19 14:00')
     def test_authenticators_oidc(app, superuser, ou1, ou2):
-...
         authenticator = SAMLAuthenticator.objects.filter(slug='test').get()
         resp = app.get(authenticator.get_absolute_url())
         assert 'Username template: {attributes[name_id_content]}@{realm}' in resp.text
         assert 'Provision: True' in resp.text
         assert 'Metadata file path' not in resp.text
-...
         assert 'configuration is not complete' in resp.text
         resp = resp.click('Edit')
         assert 'attribute_mapping' not in resp.form.fields
         assert 'realm' not in resp.form.fields
         resp = resp.form.submit()
         assert 'One of the metadata fields must be filled.' in resp.text
         resp.form['metadata_path'] = '/var/lib/authentic2/metadata.xml'
         resp.form['attribute_mapping'] = '[{"attribute": "email", "saml_attribute": "mail", "mandatory": false}]'
         resp = resp.form.submit().follow()
         assert 'Metadata file path: /var/lib/authentic2/metadata.xml' in resp.text
         resp = resp.click('Edit')
         resp = resp.click('Advanced setup')
         resp.form['attribute_mapping'] = '[{"attribute": "email", "saml_attribute": "mail", "mandatory": false}]'
         resp.form['realm'] = 'abc'
         resp = resp.form.submit().follow()
         authenticator.refresh_from_db()
         assert authenticator.attribute_mapping == [
             {"attribute": "email", "saml_attribute": "mail", "mandatory": False}
+        ]
         assert authenticator.realm == 'abc'
         resp = resp.click('Enable').follow()
         assert 'Authenticator has been enabled.' in resp.text
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-authenticators-add-advanced-setup-view-67875.patch