0001-authenticators-use-validator-instead-of-form-mixin-6.patch

Valentin Deniaud, 16 août 2022 12:23

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

Subject: [PATCH] authenticators: use validator instead of form mixin (#68177)

 src/authentic2/apps/authenticators/forms.py        | 14 +-------------
 .../apps/authenticators/migrations/0001_initial.py |  3 +++
 src/authentic2/apps/authenticators/models.py       |  3 ++-
 src/authentic2/utils/evaluate.py                   |  8 ++++++++
 src/authentic2_auth_fc/forms.py                    |  4 +---
 src/authentic2_auth_oidc/forms.py                  |  4 +---
 src/authentic2_auth_saml/forms.py                  |  4 +---
 7 files changed, 17 insertions(+), 23 deletions(-)

     from django.utils.translation import ugettext as _
     from authentic2.forms.mixins import SlugMixin
     from authentic2.utils.evaluate import ExpressionError, validate_condition
     from .models import BaseAuthenticator, LoginPasswordAuthenticator
     class AuthenticatorFormMixin:
         def clean_show_condition(self):
             condition = self.cleaned_data['show_condition']
             if condition:
                 try:
                     validate_condition(condition)
                 except ExpressionError as e:
                     raise ValidationError(e.message)
             return condition
     class AuthenticatorsOrderForm(forms.Form):
         order = forms.CharField(widget=forms.HiddenInput)
-...
             return super().save()
     class LoginPasswordAuthenticatorEditForm(AuthenticatorFormMixin, forms.ModelForm):
     class LoginPasswordAuthenticatorEditForm(forms.ModelForm):
         class Meta:
             model = LoginPasswordAuthenticator
             exclude = ('name', 'slug', 'ou', 'button_label')

     from django.conf import settings
     from django.db import migrations, models
     import authentic2.utils.evaluate
     class Migration(migrations.Migration):
-...
                             ),
                             max_length=1024,
                             verbose_name='Show condition',
                             validators=[authentic2.utils.evaluate.condition_validator],
                         ),
                     ),
+                    (

     from django.utils.translation import ugettext_lazy as _
     from authentic2 import views
     from authentic2.utils.evaluate import evaluate_condition
     from authentic2.utils.evaluate import condition_validator, evaluate_condition
     from .query import AuthenticatorManager
-...
                 'except if they come from the specified IP address. Available variables include '
                 'service_ou_slug, service_slug, remote_addr, login_hint and headers.'
             ),
             validators=[condition_validator],
+        )
         button_description = models.CharField(
             _('Login button description'),

     validate_condition = ConditionValidator()
     def condition_validator(value):
         try:
             validate_condition(value)
         except ExpressionError as e:
             raise ValidationError(e.message)
     condition_safe_globals = {
         '__builtins__': {
             'True': True,

     from django import forms
     from django.utils.translation import ugettext_lazy as _
     from authentic2.apps.authenticators.forms import AuthenticatorFormMixin
     from .models import SCOPE_CHOICES, FcAuthenticator
     class FcAuthenticatorForm(AuthenticatorFormMixin, forms.ModelForm):
     class FcAuthenticatorForm(forms.ModelForm):
         scopes = forms.MultipleChoiceField(
             label=_('Scopes'),
             choices=SCOPE_CHOICES,

     from django import forms
     from authentic2.apps.authenticators.forms import AuthenticatorFormMixin
     from .models import OIDCProvider
     class OIDCProviderEditForm(AuthenticatorFormMixin, forms.ModelForm):
     class OIDCProviderEditForm(forms.ModelForm):
         class Meta:
             model = OIDCProvider
             fields = '__all__'

     from django import forms
     from authentic2.apps.authenticators.forms import AuthenticatorFormMixin
     from .models import SAMLAuthenticator
     class SAMLAuthenticatorForm(AuthenticatorFormMixin, forms.ModelForm):
     class SAMLAuthenticatorForm(forms.ModelForm):
         class Meta:
             model = SAMLAuthenticator
             exclude = ('ou',)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-authenticators-use-validator-instead-of-form-mixin-6.patch