Projet

Général

Profil

0001-auth_saml-clarify-some-parameters-67875.patch

Valentin Deniaud, 13 septembre 2022 15:23

Télécharger (4,07 ko)

Voir les différences:

Subject: [PATCH 1/2] auth_saml: clarify some parameters (#67875)

 .../migrations/0001_initial.py                |  8 +++-----
 src/authentic2_auth_saml/models.py            | 19 ++++---------------
 tests/test_manager_authenticators.py          |  1 -
 3 files changed, 7 insertions(+), 21 deletions(-)
src/authentic2_auth_saml/migrations/0001_initial.py
50 50
                (
51 51
                    'provision',
52 52
                    models.BooleanField(
53
                        default=True,
54
                        help_text='Create user if their username does not already exists.',
55
                        verbose_name='Provision',
53
                        default=True, verbose_name='Create user if their username does not already exists'
56 54
                    ),
57 55
                ),
58 56
                (
......
81 79
                    'realm',
82 80
                    models.CharField(
83 81
                        default='saml',
84
                        help_text='The default realm to associate to user, used when setting username.',
82
                        help_text='The default realm to associate to user, can be used in username template.',
85 83
                        max_length=32,
86
                        verbose_name='Realm',
84
                        verbose_name='Realm (realm)',
87 85
                    ),
88 86
                ),
89 87
                (
src/authentic2_auth_saml/models.py
38 38
    )
39 39
    metadata = models.TextField(_('Metadata (XML)'), blank=True)
40 40

  
41
    provision = models.BooleanField(
42
        _('Provision'),
43
        default=True,
44
        help_text=_('Create user if their username does not already exists.'),
45
    )
41
    provision = models.BooleanField(_('Create user if their username does not already exists'), default=True)
46 42
    verify_ssl_certificate = models.BooleanField(
47 43
        _('Verify SSL certificate'),
48 44
        default=True,
......
57 53
        blank=True,
58 54
    )
59 55
    realm = models.CharField(
60
        _('Realm'),
56
        _('Realm (realm)'),
61 57
        max_length=32,
62
        help_text=_('The default realm to associate to user, used when setting username.'),
58
        help_text=_('The default realm to associate to user, can be used in username template.'),
63 59
        default='saml',
64 60
    )
65 61
    username_template = models.CharField(
......
144 140
    type = 'saml'
145 141
    how = ['saml']
146 142
    manager_view_template_name = 'authentic2_auth_saml/authenticator_detail.html'
147
    description_fields = [
148
        'show_condition',
149
        'metadata_url',
150
        'metadata_path',
151
        'metadata',
152
        'provision',
153
        'username_template',
154
    ]
143
    description_fields = ['show_condition', 'metadata_url', 'metadata_path', 'metadata', 'provision']
155 144

  
156 145
    class Meta:
157 146
        verbose_name = _('SAML')
tests/test_manager_authenticators.py
284 284

  
285 285
    authenticator = SAMLAuthenticator.objects.filter(slug='test').get()
286 286
    resp = app.get(authenticator.get_absolute_url())
287
    assert 'Username template: {attributes[name_id_content]}@{realm}' in resp.text
288 287
    assert 'Provision: True' in resp.text
289 288
    assert 'Metadata file path' not in resp.text
290 289

  
291
-