0003-data_transfer-validate-models-before-updating-creati.patch

Benjamin Dauvergne, 15 avril 2020 11:42

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

Subject: [PATCH 3/4] data_transfer: validate models before updating/creating
 them (#41342)

To prevent collision between roles when altering their name and their
slug is already unique. Ex.:

   R1(slug=a, name=A) -import-> R1(slug=a, name=B)
   R2(slug=b, name=B)

 src/authentic2/data_transfer.py | 29 ++++++++++++++++++++++++++++-
 tests/test_data_transfer.py     | 17 +++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

     from functools import wraps
     from django.core.exceptions import ValidationError
     from django.core.exceptions import ValidationError, NON_FIELD_ERRORS
     from django.contrib.contenttypes.models import ContentType
     from django.utils.translation import ugettext_lazy as _
     from django.utils.text import format_lazy
     from django_rbac.models import Operation
     from django_rbac.utils import (
         get_ou_model, get_role_model, get_role_parenting_model, get_permission_model)
     from authentic2.decorators import errorcollector
     from authentic2.a2_rbac.models import RoleAttribute
     from authentic2.utils.lazy import lazy_join
-...
     def update_model(obj, d):
         for attr, value in d.items():
             setattr(obj, attr, value)
         errors = {}
         with errorcollector(errors):
             if hasattr(obj, 'validate'):
                 obj.validate()
         with errorcollector(errors):
             if hasattr(obj, 'validate_unique'):
                 obj.validate_unique()
         if errors:
             errorlist = []
             for key, messages in list(errors.items()):
                 if key == NON_FIELD_ERRORS:
                     errorlist.extend(messages)
                 else:
                     value = getattr(obj, key)
                     def error_list(messages):
                         for message in messages:
                             if isinstance(message, ValidationError):
                                 yield message.message
                             else:
                                 yield message
                     for message in error_list(messages):
                         errorlist.append(format_lazy(u'{}="{}": {}', obj.__class__._meta.get_field(key).verbose_name, value, message))
             raise ValidationError(errorlist)
         obj.save()

         d = export_site(ExportContext(export_ous=False))
         assert 'ous' not in d
     def test_role_validate_unique(db):
         ou = OU.objects.create(name='ou', slug='ou')
         Role.objects.create(name='role1', slug='role1', ou=ou)
         Role.objects.create(name='role2', slug='role2', ou=ou)
         data = {
             'roles': [
+                {
                     'name': 'role1',
                     'slug': 'role2',
                     'ou': {'slug': 'ou'},
+                }
+            ]
+        }
         with pytest.raises(ValidationError, match=r'Role "role1": name="role1": Name already used'):
             import_site(data)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0003-data_transfer-validate-models-before-updating-creati.patch