0001-role-api-add-extra-role-attributes-21488.patch

Paul Marillonnet, 18 avril 2018 10:29

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

Subject: [PATCH] role api: add extra role attributes (#21488)

 src/authentic2/api_views.py | 26 +++++++++++++++++++++++--
 tests/conftest.py           | 13 +++++++++++++
 tests/test_api.py           | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 2 deletions(-)

     from rest_framework.exceptions import PermissionDenied, AuthenticationFailed
     from rest_framework.fields import CreateOnlyDefault
     from rest_framework.decorators import list_route, detail_route
     from rest_framework.utils import model_meta
     from django_filters.rest_framework import FilterSet
     from .custom_user.models import User
     from . import utils, decorators, attribute_kinds, app_settings, hooks
     from .models import Attribute, PasswordReset
     from .a2_rbac.models import RoleAttribute
     from .a2_rbac.utils import get_default_ou
-...
             exclude = ('date_joined', 'user_permissions', 'groups', 'last_login')
     class RoleAttributeSerializer(serializers.ModelSerializer):
         class Meta:
             model = RoleAttribute
             fields = ('name', 'kind', 'value')
     class RoleSerializer(serializers.ModelSerializer):
         ou = serializers.SlugRelatedField(
             many=False,
-...
             default=CreateOnlyDefault(get_default_ou),
             queryset=get_ou_model().objects.all(),
             slug_field='slug')
         role_attributes = RoleAttributeSerializer(
             many=True,
             read_only=False,
             required=False)
         @property
         def user(self):
-...
         def create(self, validated_data):
             ou = validated_data.get('ou')
             if 'role_attributes' in validated_data:
                 role_attributes_data = validated_data.pop('role_attributes')
             else:
                 role_attributes_data = ()
             # Creating roles also means being allowed to within the OU:
             if not self.user.has_ou_perm('a2_rbac.add_role', ou):
                 raise PermissionDenied(u'User %s can\'t create role in OU %s' % (self.user, ou))
             return super(RoleSerializer, self).create(validated_data)
             instance = self.Meta.model.objects.create(**validated_data)
             # Create additional RoleAttribute objects:
             for attribute_data in role_attributes_data:
                 RoleAttribute.objects.create(role=instance, **attribute_data)
             return instance
         def update(self, instance, validated_data):
             # Check role-updating permissions:
-...
         class Meta:
             model = get_role_model()
             fields = ('uuid', 'name', 'slug', 'ou',)
             fields = ('uuid', 'name', 'slug', 'ou', 'role_attributes')
             extra_kwargs = {'uuid': {'read_only': True}}

     from pytest_django.migrations import DisableMigrations
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.a2_rbac.models import RoleAttribute
     from authentic2_idp_oidc.models import OIDCClient
     from authentic2.authentication import OIDCUser
-...
         return Role.objects.create(name='rando', slug='rando', ou=ou_rando)
     @pytest.fixture
     def role_attribute_details(db, role_random):
         return RoleAttribute.objects.create(role=role_random, name='details',
                 kind='string', value='list')
     @pytest.fixture
     def role_attribute_emails(db, role_random):
         return RoleAttribute.objects.create(role=role_random, name='emails',
                 kind='string', value='list')
     @pytest.fixture
     def role_ou1(db, ou1):
         return Role.objects.create(name='role_ou1', slug='role_ou1', ou=ou1)

     from django.contrib.auth import get_user_model
     from django.contrib.contenttypes.models import ContentType
     from authentic2.a2_rbac.utils import get_default_ou
     from authentic2.a2_rbac.models import RoleAttribute
     from django_rbac.utils import get_role_model, get_ou_model
     from django_rbac.models import SEARCH_OP
     from authentic2.models import Service
-...
     from authentic2_idp_oidc.models import OIDCClient
     from utils import login, basic_authorization_header, get_link_from_mail
     pytestmark = pytest.mark.django_db
-...
         assert role.ou.slug == role_data['ou']
     def test_api_role_extra_attributes(app, admin_ou1, ou1):
         app.authorization = ('Basic', (admin_ou1.username, admin_ou1.username))
         role_data = {
             'slug': 'coffee-manager',
             'name': 'Coffee Manager',
             'ou': 'ou1',
             'role_attributes': [{
                 'name': 'details',
                 'kind': 'string',
                 'value': 'nodetails'
             },
+            {
                 'name': 'emails',
                 'kind': 'string',
                 'value': 'foo@email.none'
             }]
+        }
         resp = app.post_json('/api/roles/', params=role_data)
         assert isinstance(resp.json, dict)
         uuid = resp.json['uuid']
         role = get_role_model().objects.get(uuid=uuid)
         role_attributes = RoleAttribute.objects.filter(role=role)
         # Check extra role attributes :
         assert len(role_attributes) == 2
     def test_api_post_role_no_ou(app, superuser):
         app.authorization = ('Basic', (superuser.username, superuser.username))
         Role = get_role_model()
-...
         assert resp.json['ou'] == 'ou_rando'
     def test_api_get_role_attributes(app, admin_rando_role, role_random, role_attribute_details, role_attribute_emails):
         app.authorization = ('Basic', (admin_rando_role.username, admin_rando_role.username))
         resp = app.get('/api/roles/{}/'.format(role_random.uuid))
         assert len(RoleAttribute.objects.filter(role=role_random)) == 2
     def test_api_get_role_not_found(app, superuser):
         app.authorization = ('Basic', (superuser.username, superuser.username))
         app.get('/api/roles/thisisnotavalidroleslug/', status=404)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-role-api-add-extra-role-attributes-21488.patch