0003-manager-show-deleted-users-informations-in-journal-5.patch

Benjamin Dauvergne, 21 mai 2021 11:07

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

Subject: [PATCH 3/3] manager: show deleted users informations in journal
 (#51808)

 .../journal/templates/journal/event_list.html |  2 +-
 src/authentic2/custom_user/models.py          |  8 ++-
 src/authentic2/manager/journal_event_types.py | 65 ++++++++++---------
 src/authentic2/manager/journal_views.py       |  6 ++
 tests/test_manager_journal.py                 | 10 +++
 5 files changed, 60 insertions(+), 31 deletions(-)

             {% endif %}
                         <tr data-event-id="{{ event.id }}" data-event-cursor="{{ event.cursor }}" data-event-type="{{ event.type.name }}">
                             <td class="journal-list--timestamp-column">{% block event-timestamp %}{{ event.timestamp }}{% endblock %}</td>
                             <td class="journal-list--user-column" {% if event.user %}data-user-id="{{ event.user.id }}"{% endif %}>{% block event-user %}{{ event.user.get_full_name|default:"-" }}{% endblock %}</td>
                             <td class="journal-list--user-column" {% if event.user %}data-user-id="{{ event.user.id }}"{% endif %}>{% block event-user %}{% firstof event.user.get_full_name event.user "-" %}{% endblock %}</td>
                             <td class="journal-list--session-column">{% block event-session %}{{ event.session_id_shortened|default:"-" }}{% endblock %}</td>
                             <td class="journal-list--message-column">{% block event-message %}{{ event.message|default:"-" }}{% endblock %}</td>
                         </tr>

+            )
             cls.objects.filter(deleted__lt=threshold).delete()
         def __str__(self):
         def __repr__(self):
             return 'DeletedUser(old_id=%s, old_uuid=%s…, old_email=%s)' % (
                 self.old_user_id or '-',
                 (self.old_uuid or '')[:6],
                 self.old_email or '-',
+            )
         def __str__(self):
             data = ['#%d' % self.old_user_id]
             if self.old_email:
                 data.append(self.old_email)
             return _('deleted user (%s)') % ', '.join(data)
         class Meta:
             verbose_name = _('deleted user')
             verbose_name_plural = _('deleted users')

         LDAP_DEACTIVATION_REASON_NOT_PRESENT,
         LDAP_DEACTIVATION_REASON_OLD_SOURCE,
+    )
     from authentic2.custom_user.models import DeletedUser
     from authentic2.journal_event_types import EventTypeWithService, get_attributes_label
     from django_rbac.utils import get_role_model
-...
     Role = get_role_model()
     def user_to_str(user):
         if hasattr(user, 'get_full_name'):
             return user.get_full_name()
         return str(user)
     class ManagerUserCreation(EventTypeDefinition):
         name = 'manager.user.creation'
         label = _('user creation')
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             # user journal page
             if context and context == user:
                 return _('creation by administrator')
             elif user:
                 # manager gloabal journal page
                 return _('creation of user "%s"') % user.get_full_name()
                 return _('creation of user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             new = event.get_data('new') or {}
             edited_attributes = ', '.join(get_attributes_label(new)) or ''
             if context and context == user:
                 return _('edit by administrator (%s)') % edited_attributes
             elif user:
                 user_full_name = user.get_full_name()
                 user_full_name = user_to_str(user)
                 return _('edit of user "{0}" ({1})').format(user_full_name, edited_attributes)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             new_email = event.get_data('email')
             if context and context == user:
                 return _('email change for email address "%s" requested by administrator') % new_email
             elif user:
                 user_full_name = user.get_full_name()
                 user_full_name = user_to_str(user)
                 return _('email change of user "{0}" for email address "{1}"').format(user_full_name, new_email)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             send_mail = event.get_data('send_mail')
             if context and context == user:
                 if send_mail:
-...
                 else:
                     return _('password change by administrator')
             elif user:
                 user_full_name = user.get_full_name()
                 user_full_name = user_to_str(user)
                 if send_mail:
                     return _('password change of user "%s" and notification by mail') % user_full_name
                 else:
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             email = event.get_data('email')
             if context and context == user:
                 return _('password reset request by administrator sent to "%s"') % email
             elif user:
                 return _('password reset request of "{0}" sent to "{1}"').format(user.get_full_name(), email)
                 return _('password reset request of "{0}" sent to "{1}"').format(user_to_str(user), email)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             if context and context == user:
                 return _('mandatory password change at next login set by administrator')
             elif user:
                 return _('mandatory password change at next login set for user "%s"') % user.get_full_name()
                 return _('mandatory password change at next login set for user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             if context and context == user:
                 return _('mandatory password change at next login unset by administrator')
             elif user:
                 return _('mandatory password change at next login unset for user "%s"') % user.get_full_name()
                 return _('mandatory password change at next login unset for user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             if context and context == user:
                 return _('activation by administrator')
             elif user:
                 return _('activation of user "%s"') % user.get_full_name()
                 return _('activation of user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             reason = event.get_data('reason')
             if context and context == user:
                 if reason == LDAP_DEACTIVATION_REASON_NOT_PRESENT:
-...
                         _(
                             'automatic deactivation of user "%s" because the associated LDAP account does not exist anymore'
+                        )
                         % user.get_full_name()
                         % user_to_str(user)
+                    )
                 elif reason == LDAP_DEACTIVATION_REASON_OLD_SOURCE:
                     return (
                         _(
                             'automatic deactivation of user "%s" because the associated LDAP source has been deleted'
+                        )
                         % user.get_full_name()
                         % user_to_str(user)
+                    )
                 else:
                     return _('deactivation of user "%s"') % user.get_full_name()
                     return _('deactivation of user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             (user,) = event.get_typed_references(User)
             (user,) = event.get_typed_references((DeletedUser, User))
             if context and context == user:
                 return _('deletion by administrator')
             elif user:
                 return _('deletion of user "%s"') % user.get_full_name()
                 return _('deletion of user "%s"') % user_to_str(user)
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             # first reference is to the service
             __, user = event.get_typed_references(None, User)
             __, user = event.get_typed_references(None, (DeletedUser, User))
             service_name = cls.get_service_name(event)
             if context and context == user:
                 return _('deletion of authorization of single sign on with "{service}" by administrator').format(
-...
             elif user:
                 return _('deletion of authorization of single sign on with "{service}" of user "{user}"').format(
                     service=service_name,
                     user=user.get_full_name(),
                     user=user_to_str(user),
+                )
             return super().get_message(event, context)
-...
         @classmethod
         def get_message(cls, event, context):
             role, member = event.get_typed_references(Role, User)
             role, member = event.get_typed_references(Role, (DeletedUser, User))
             role = role or event.get_data('role_name')
             member = member or event.get_data('member_name')
             if context == member:
-...
         @classmethod
         def get_message(cls, event, context):
             role, member = event.get_typed_references(Role, User)
             role, member = event.get_typed_references(Role, (DeletedUser, User))
             role = role or event.get_data('role_name')
             member = member or event.get_data('member_name')
             if context == member:
-...
         @classmethod
         def record(cls, user, session, role, admin_user):
             data = {
                 'admin_user_name': admin_user.get_full_name(),
                 'admin_user_name': user_to_str(admin_user),
                 'admin_user_uuid': admin_user.uuid,
+            }
             super().record(user=user, session=session, role=role, references=[admin_user], data=data)
         @classmethod
         def get_message(cls, event, context):
             role, admin_user = event.get_typed_references(Role, User)
             role, admin_user = event.get_typed_references(Role, (DeletedUser, User))
             role = role or event.get_data('role_name')
             admin_user = admin_user or event.get_data('admin_user_name')
             if context == role:
-...
         @classmethod
         def get_message(cls, event, context):
             role, admin_user = event.get_typed_references(Role, User)
             role, admin_user = event.get_typed_references(Role, (DeletedUser, User))
             role = role or event.get_data('role_name')
             admin_user = admin_user or event.get_data('admin_user_name')
             if context == role:

             return qs
         def prefetcher(self, model, pks):
             if not issubclass(model, User):
                 return
             for deleted_user in DeletedUser.objects.filter(old_user_id__in=pks):
                 yield deleted_user.old_user_id, deleted_user
     class BaseJournalView(views.TitleMixin, views.MediaMixin, views.MultipleOUMixin, JournalView):
         template_name = 'authentic2/manager/journal.html'

             'addition of user "user (111111)" as administrator of role "role1"',
             'removal of role "role2" as administrator of role "role1"',
+        ]
     def test_delete_user(app, superuser, events):
         old_user_id = events['user'].id
         events['user'].delete()
         response = login(app, user=superuser, path="/manage/journal/")
         response.form.set('search', events['user'].email)
         response = response.form.submit()
         assert len(response.pyquery('tbody tr')) == 20
         assert 'deletion of user &quot;deleted user (#%s, user@example.com)&quot;' % old_user_id in str(response)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0003-manager-show-deleted-users-informations-in-journal-5.patch