0001-misc-remove-compatibility-code-with-old-authentic-ve.patch

Valentin Deniaud, 05 December 2022 12:32 PM

View differences: inline side by side

Subject: [PATCH] misc: remove compatibility code with old authentic version
 (#72027)

 hobo/agent/authentic2/apps.py                 |  7 +--
 .../management/commands/hobo_deploy.py        | 17 ++----
 .../management/commands/hobo_provision.py     | 12 +---
 hobo/agent/authentic2/provisionning.py        | 59 +++----------------
 4 files changed, 15 insertions(+), 80 deletions(-)

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from authentic2.a2_rbac.signals import post_soft_create, post_soft_delete
     from django.apps import AppConfig
     from django.conf import settings
     from django.db.models.signals import m2m_changed, post_save, pre_delete, pre_save
     try:
         from authentic2.a2_rbac.signals import post_soft_create, post_soft_delete
     except ImportError:
         # legacy
         from django_rbac.signals import post_soft_create, post_soft_delete
     class Plugin:
         def get_before_urls(self):

     from hobo.agent.authentic2.provisionning import Provisionning
     from hobo.agent.common.management.commands import hobo_deploy
     try:
         from authentic2.a2_rbac.models import RoleAttribute
         has_role_attributes = True
     except ImportError:
         has_role_attributes = False
     User = get_user_model()
-...
                         if su_role.name != name:
                             su_role.name = name
                             su_role.save()
                         if has_role_attributes:
                             su_role.attributes.get_or_create(name='is_superuser', kind='string', value='true')
                         else:
                             su_role.is_superuser = True
                             su_role.save()
                         su_role.is_superuser = True
                         su_role.save()
                         # pass the new attribute to the service
                         SAMLAttribute.objects.get_or_create(
                             name='is_superuser',

     from hobo.agent.authentic2.provisionning import Provisionning
     try:
         from authentic2.a2_rbac.models import RoleAttribute
         has_role_attributes = True
     except ImportError:
         has_role_attributes = False
     class Command(BaseCommand):
         help = 'Provision all roles or users'
-...
                     if users:
                         time.sleep(batch_sleep)
             if has_role_attributes:
                 roles_with_attributes = Role.objects.filter(attributes__name='is_superuser').children()
             else:
                 roles_with_attributes = Role.objects.filter(is_superuser=True).children()
             roles_with_attributes = Role.objects.filter(is_superuser=True).children()
             # first those without and admin attribute
             normal_users = qs.exclude(roles__in=roles_with_attributes)

     from hobo.agent.common import notify_agents
     from hobo.signature import sign_url
     try:
         from authentic2.a2_rbac.models import RoleAttribute
     except ImportError:
         class RoleAttribute:
             dummy = True
     User = get_user_model()
     logger = logging.getLogger(__name__)
-...
                         for role in user_roles.get(user.id, []):
                             if role.service_id != service.pk:
                                 continue
                             if hasattr(RoleAttribute, 'dummy'):
                                 role_is_superuser = role.is_superuser
                             else:
                                 for attribute in role.attributes.all():
                                     if attribute.name == 'is_superuser' and attribute.value == 'true':
                                         role_is_superuser = True
                             role_is_superuser = role.is_superuser
                     data['is_superuser'] = user.is_superuser or role_is_superuser
                     return data
                 # Find roles giving a superuser attribute
                 # If there is any role of this kind, we do one provisionning message for each user and
                 # each service.
                 if hasattr(RoleAttribute, 'dummy'):
                     roles_with_attributes = (
                         Role.objects.filter(members__in=users)
                         .parents(include_self=True)
                         .filter(is_superuser=True)
                         .exists()
+                    )
                 else:
                     roles_with_attributes = (
                         Role.objects.filter(members__in=users)
                         .parents(include_self=True)
                         .filter(attributes__name='is_superuser')
                         .exists()
+                    )
                 roles_with_attributes = (
                     Role.objects.filter(members__in=users)
                     .parents(include_self=True)
                     .filter(is_superuser=True)
                     .exists()
+                )
                 all_roles = Role.objects.all()
                 if not hasattr(RoleAttribute, 'dummy'):
                     all_roles = all_roles.prefetch_related('attributes')
                 roles = {r.id: r for r in all_roles}
                 user_roles = {}
                 parents = {}
-...
+                )
             roles = {role for role in roles if not is_forbidden_technical_role(role)}
             if mode == 'provision' and not hasattr(RoleAttribute, 'dummy'):
                 self.complete_roles(roles)
             if not roles:
                 return
-...
                 qs = LibertyProvider.objects.filter(ou__isnull=True)
             return [(service, service.entity_id) for service in qs]
         def complete_roles(self, roles):
             for role in roles:
                 role.emails = []
                 role.emails_to_members = True
                 role.details = ''
                 for attribute in role.attributes.all():
                     if attribute.name in ('emails', 'emails_to_members', 'details') and attribute.kind == 'json':
                         setattr(role, attribute.name, json.loads(attribute.value))
         def get_entity_id(self):
             tenant = getattr(connection, 'tenant', None)
             assert tenant
-...
             # we skip new instances
             if not instance.pk:
                 return
             if not isinstance(instance, (User, Role, RoleAttribute, AttributeValue)):
             if not isinstance(instance, (User, Role, AttributeValue)):
                 return
             # ignore last_login update on login
             if isinstance(instance, User) and (update_fields and set(update_fields) == {'last_login'}):
                 return
             if isinstance(instance, RoleAttribute):
                 instance = instance.role
             elif isinstance(instance, AttributeValue):
                 if not isinstance(instance.owner, User):
                     return
-...
                 return
             if not created:
                 return
             if not isinstance(instance, (User, Role, RoleAttribute, AttributeValue)):
             if not isinstance(instance, (User, Role, AttributeValue)):
                 return
             if isinstance(instance, RoleAttribute):
                 instance = instance.role
             elif isinstance(instance, AttributeValue):
                 if not isinstance(instance.owner, User):
                     return
-...
                 return
             if isinstance(instance, (User, Role)):
                 self.add_deleted(copy.copy(instance))
             elif isinstance(instance, RoleAttribute):
                 instance = instance.role
                 self.add_saved(instance)
             elif isinstance(instance, AttributeValue):
                 if not isinstance(instance.owner, User):
                     return
+    -

Project

General

Profile

Produits Entr'ouvert » Hobo

0001-misc-remove-compatibility-code-with-old-authentic-ve.patch