Feature/dsgvo deletion

announcements/models.py

@@ -13,7 +13,6 @@ class Announcement(models.Model):
     LEVEL_WARNING = 'warning'
     LEVEL_ERROR = 'error'
     LEVEL_CHOICES = (
-        (LEVEL_DEBUG, _('Debug')),
         (LEVEL_INFO, _('Info')),
         (LEVEL_SUCCESS, _('Success')),
         (LEVEL_WARNING, _('Warning')),

cosinnus/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 # The cosinnus version
-VERSION = '2.0.0'
+VERSION = '2.2.8'
 
 celery_app = None
 

cosinnus/admin.py

@@ -21,8 +21,10 @@
 from django.utils.translation import gettext_lazy as _
 from django_reverse_admin import ReverseModelAdmin
 
+from cosinnus.backends import elastic_threading_disabled
 from cosinnus.conf import settings
 from cosinnus.core import signals
+from cosinnus.core.registries import attached_object_registry
 from cosinnus.forms.widgets import PrettyJSONWidget
 from cosinnus.models.cms import CosinnusMicropage
 from cosinnus.models.conference import CosinnusConferencePremiumCapacityInfo, CosinnusConferenceSettings
@@ -56,6 +58,7 @@
 from cosinnus.models.widget import WidgetConfig
 from cosinnus.utils.dashboard import create_initial_group_widgets
 from cosinnus.utils.group import get_cosinnus_group_model
+from cosinnus.utils.permissions import check_user_superuser
 from cosinnus.utils.urls import group_aware_reverse
 
 
@@ -82,9 +85,11 @@ def admin_log_action(user, instance, message):
 
 class SingleDeleteActionMixin(object):
     def get_actions(self, request):
-        self.actions.append('really_delete_selected')
+        # replace the django delete-selected action with ours
+        self.actions = list(set(list(self.actions) + ['really_delete_selected']))
         actions = super(SingleDeleteActionMixin, self).get_actions(request)
-        del actions['delete_selected']
+        if 'delete_selected' in actions:
+            del actions['delete_selected']
         return actions
 
     def really_delete_selected(self, request, queryset):
@@ -307,6 +312,48 @@ class MembershipInline(admin.StackedInline):
     extra = 0
 
 
+class ProjectScheduledForDeletionAtFilter(admin.SimpleListFilter):
+    """Will show groups that are scheduled for deletion (or not)"""
+
+    title = _('Scheduled for Deletion?')
+
+    # Parameter for the filter that will be used in the URL query.
+    parameter_name = 'groupscheduledfordeletion'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', _('Yes')),
+            ('no', _('No')),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.exclude(scheduled_for_deletion_at__exact=None)
+        if self.value() == 'no':
+            return queryset.filter(scheduled_for_deletion_at__exact=None)
+
+
+class ProjectInactivityNotificationSentFilter(admin.SimpleListFilter):
+    """Will show projects where notification were sent about the pending deletion due to inactivity."""
+
+    title = _('Inactivity Notification Sent?')
+
+    # Parameter for the filter that will be used in the URL query.
+    parameter_name = 'groupinactivitynotificationsent'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', _('Yes')),
+            ('no', _('No')),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.exclude(inactivity_notification_sent_at__exact=None)
+        if self.value() == 'no':
+            return queryset.filter(inactivity_notification_sent_at__exact=None)
+
+
 class CosinnusProjectAdmin(admin.ModelAdmin):
     actions = [
         'convert_to_society',
@@ -333,6 +380,8 @@ class CosinnusProjectAdmin(admin.ModelAdmin):
         'portal',
         'public',
         'is_active',
+        ProjectScheduledForDeletionAtFilter,
+        ProjectInactivityNotificationSentFilter,
     )
     search_fields = (
         'name',
@@ -345,12 +394,15 @@ class CosinnusProjectAdmin(admin.ModelAdmin):
         'last_modified',
         'is_premium_currently',
         'attached_objects',
+        'last_activity',
+        'inactivity_notification_sent_at',
     ]
     raw_id_fields = ('parent',)
     exclude = [
         'is_conference',
     ]
-    inlines = [CosinnusConferenceSettingsInline]
+    if settings.COSINNUS_CONFERENCES_ENABLED:
+        inlines = [CosinnusConferenceSettingsInline]
 
     ALL_TYPES_CLASSES = [CosinnusProject, CosinnusSociety, CosinnusConference]
 
@@ -685,7 +737,8 @@ class CosinnusPortalAdmin(admin.ModelAdmin):
         'top_color',
         'bottom_color',
     )
-    inlines = [CosinnusConferenceSettingsInline, CosinnusConferencePremiumCapacityInfoInline]
+    if settings.COSINNUS_CONFERENCES_ENABLED or settings.COSINNUS_BBB_ENABLE_GROUP_AND_EVENT_BBB_ROOMS:
+        inlines = [CosinnusConferenceSettingsInline, CosinnusConferencePremiumCapacityInfoInline]
 
     def queryset(self, request):
         """Allow portals to be accessed only by superusers and Portal-Admins"""
@@ -748,6 +801,7 @@ class UserProfileInline(admin.StackedInline):
         'deletion_triggered_by_self',
         '_is_guest',
         'guest_access_object',
+        'inactivity_notification_sent_at',
     )
     show_change_link = True
     view_on_site = False
@@ -880,6 +934,30 @@ def queryset(self, request, queryset):
             return queryset.filter(cosinnus_profile__scheduled_for_deletion_at__exact=None)
 
 
+_useradmin_excluded_list_filter = ['groups', 'is_staff']
+
+
+class UserInactivityNotificationSentFilter(admin.SimpleListFilter):
+    """Will show users that were notified on about the pending deletion due to inactivity."""
+
+    title = _('Inactivity Notification Sent?')
+
+    # Parameter for the filter that will be used in the URL query.
+    parameter_name = 'usersinactivitynotificationsent'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', _('Yes')),
+            ('no', _('No')),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.exclude(cosinnus_profile__inactivity_notification_sent_at__exact=None)
+        if self.value() == 'no':
+            return queryset.filter(cosinnus_profile__inactivity_notification_sent_at__exact=None)
+
+
 class UserAdmin(DjangoUserAdmin):
     fieldsets = (
         (
@@ -910,6 +988,8 @@ class UserAdmin(DjangoUserAdmin):
     actions = [
         'deactivate_users',
         'reactivate_users',
+        'deactivate_spam_users',
+        'logout_users',
         'export_as_csv',
         'log_in_as_user',
         'refresh_group_memberships',
@@ -924,6 +1004,7 @@ class UserAdmin(DjangoUserAdmin):
     if settings.COSINNUS_CLOUD_ENABLED:
         actions += [
             'force_redo_cloud_user_room_memberships',
+            'make_user_cloud_admin',
         ]
     list_display = (
         'email',
@@ -939,11 +1020,15 @@ class UserAdmin(DjangoUserAdmin):
         'is_staff',
         'scheduled_for_deletion_at',
     )
-    list_filter = list(DjangoUserAdmin.list_filter) + [
+    list_filter = [
+        field for field in list(DjangoUserAdmin.list_filter) if field not in _useradmin_excluded_list_filter
+    ] + [
+        'date_joined',
         UserHasLoggedInFilter,
         UserToSAcceptedFilter,
-        UserScheduledForDeletionAtFilter,
         EmailVerifiedFilter,
+        UserScheduledForDeletionAtFilter,
+        UserInactivityNotificationSentFilter,
         IsGuestFilter,
     ]
 
@@ -991,10 +1076,13 @@ def has_delete_permission(self, request, obj=None):
         return False
 
     def deactivate_users(self, request, queryset):
-        from cosinnus.views.profile import deactivate_user_and_mark_for_deletion
+        from cosinnus.views.profile_deletion import deactivate_user_and_mark_for_deletion
 
         count = 0
         for user in queryset:
+            if check_user_superuser(user):
+                self.message_user(request, 'Skipping deactivating a user that is an admin! Careful who you select!')
+                continue
             deactivate_user_and_mark_for_deletion(user)
             count += 1
         message = _(
@@ -1005,7 +1093,7 @@ def deactivate_users(self, request, queryset):
     deactivate_users.short_description = _('DEACTIVATE user accounts and DELETE them after 30 days')
 
     def reactivate_users(self, request, queryset):
-        from cosinnus.views.profile import reactivate_user
+        from cosinnus.views.profile_deletion import reactivate_user
 
         count = 0
         for user in queryset:
@@ -1016,6 +1104,101 @@ def reactivate_users(self, request, queryset):
 
     reactivate_users.short_description = _('Reactivate user accounts')
 
+    def deactivate_spam_users(self, request, queryset):
+        """For use on spam users that admins want to completely boot off the platform.
+        Will deactivate and mark for deletion the user, deactivate all groups they are the only admin of,
+        and hide all content from other groups and non-group-content ('visibility: only me')."""
+        # TODO: delete this function and replace it with the `get_registered_base_taggable_models`
+        #  once the changes from 'dsgvo-deletion' PR are in!
+        from django.apps import apps
+
+        from cosinnus.models.tagged import BaseTaggableObjectModel
+        from cosinnus.views.profile import deactivate_user_and_mark_for_deletion
+
+        def _get_registered_base_taggable_models():
+            base_taggable_object_models = []
+            for full_model_name in attached_object_registry:
+                app_label, model_name = full_model_name.split('.')
+                model = apps.get_model(app_label, model_name)
+                if issubclass(model, BaseTaggableObjectModel):
+                    base_taggable_object_models.append(model)
+            return base_taggable_object_models
+
+        models_to_hide_content = _get_registered_base_taggable_models() + [CosinnusIdea]
+
+        # TODO: move this function to views/profile_deletion.py once the changes from 'dsgvo-deletion' PR are in!
+        from cosinnus.models.tagged import BaseTagObject
+
+        def _deactivate_or_hide_all_user_content(user):
+            """Deactivate all groups a user is the only admin of,
+            and hide all content from other groups and non-group-content ('visibility: only me').
+            @return: returns a tuple of ints (num_deactivated_groups, hidden_content)"""
+            deactivated_groups = 0
+            hidden_content = 0
+            for group in CosinnusGroup.objects.get_for_user(user):
+                admins = CosinnusGroupMembership.objects.get_admins(group=group)
+                if [user.pk] == admins:
+                    # user is the only admin of the group, deactivate it
+                    group.is_active = False
+                    group.save()
+                    # remove group from search index
+                    group.remove_index()
+                    deactivated_groups += 1
+            # taggable objects (notes, events, ...) and ideas
+            for model_to_hide in models_to_hide_content:
+                for object_to_hide in model_to_hide.objects.filter(creator=user):
+                    # set visibility to user-only
+                    if hasattr(object_to_hide, 'media_tag') and getattr(object_to_hide, 'media_tag', None):
+                        media_tag = object_to_hide.media_tag
+                        if not media_tag.visibility == BaseTagObject.VISIBILITY_USER:
+                            media_tag.visibility = BaseTagObject.VISIBILITY_USER
+                            media_tag.save()
+                            hidden_content += 1
+                        # remove object from search index (always, just to be sure)
+                        object_to_hide.remove_index()
+            return deactivated_groups, hidden_content
+
+        user_count = 0
+        deactivated_groups_count = 0
+        hidden_content_count = 0
+        for user in queryset:
+            if check_user_superuser(user):
+                self.message_user(request, 'Skipping banning a user that is an admin! Careful who you select!')
+                continue
+            _group_count, _hidden_count = _deactivate_or_hide_all_user_content(user)
+            with elastic_threading_disabled():
+                deactivate_user_and_mark_for_deletion(user)
+                if hasattr(user, 'cosinnus_profile') and getattr(user, 'cosinnus_profile', None):
+                    profile = user.cosinnus_profile
+                    profile.remove_index()
+            deactivated_groups_count += _group_count
+            hidden_content_count += _hidden_count
+            user_count += 1
+        message = _(
+            '%(user_count)d User account(s) were deactivated successfully. \n'
+            '%(deactivated_groups_count)d groups and projects have been deactivated. \n'
+            '%(hidden_content_count)d contents have been set invisible. \n'
+            'The user(s) will be deleted after 30 days.'
+        ) % {
+            'user_count': user_count,
+            'deactivated_groups_count': deactivated_groups_count,
+            'hidden_content_count': hidden_content_count,
+        }
+        self.message_user(request, message)
+
+    deactivate_spam_users.short_description = _('(SPAM) DEACTIVATE user and their contents (user deletion in 30d)')
+
+    def logout_users(self, request, queryset):
+        count = 0
+        for user in queryset:
+            if hasattr(user, 'cosinnus_profile') and user.cosinnus_profile:
+                user.cosinnus_profile.force_logout_user()
+                count += 1
+        message = _('%(count)d Users were logged out.') % {'count': count}
+        self.message_user(request, message)
+
+    logout_users.short_description = _('Logout users')
+
     def log_in_as_user(self, request, queryset):
         user = queryset[0]
         user.backend = 'cosinnus.backends.EmailAuthBackend'
@@ -1116,6 +1299,18 @@ def force_redo_cloud_user_room_memberships(self, request, queryset):
             'Nextcloud: Fix missing Nextcloud folder membership for users'
         )
 
+        def make_user_cloud_admin(self, request, queryset):
+            from cosinnus_cloud.hooks import user_promoted_to_superuser
+
+            count = 0
+            for user in queryset:
+                user_promoted_to_superuser(None, user)
+                count += 1
+            message = _('%d Users were made Nextcloud admins.') % count
+            self.message_user(request, message)
+
+        make_user_cloud_admin.short_description = _('Nextcloud: Make user Nextcloud admin')
+
 
 admin.site.unregister(USER_MODEL)
 admin.site.register(USER_MODEL, UserAdmin)

cosinnus/api/serializers/portal.py

@@ -6,17 +6,23 @@
 from django.templatetags.static import static
 from rest_framework import serializers
 
+from cosinnus.conf import settings
 from cosinnus.models import CosinnusPortal
 
 __all__ = ('PortalSettingsSerializer',)
 
 
 class PortalSettingsSerializer(serializers.ModelSerializer):
+
+    display_name = serializers.SerializerMethodField()
     logo_image = serializers.SerializerMethodField()
 
     class Meta(object):
         model = CosinnusPortal
-        fields = ('name', 'background_image', 'logo_image', 'top_color', 'bottom_color', 'extra_css')
-
+        fields = ('name', 'display_name', 'background_image', 'logo_image', 'top_color', 'bottom_color', 'extra_css')
+
+    def get_display_name(self, obj):
+        return settings.COSINNUS_BASE_PAGE_TITLE_TRANS
+
     def get_logo_image(self, obj):
         return static('img/v2_navbar_brand.png')

cosinnus/api/serializers/user.py

@@ -64,7 +64,7 @@ class UserSerializer(serializers.ModelSerializer):
 
     class Meta(object):
         model = User
-        fields = ('id', 'username', 'first_name', 'last_name', 'profile')
+        fields = ('id', 'username', 'first_name', 'last_name', 'is_guest', 'profile')
 
 
 class UserSerializerWithToken(TokenObtainPairSerializer):

cosinnus/api/views/portal.py

@@ -125,7 +125,7 @@ class HeaderView(APIView):
     """
 
     def get(self, request):
-        context = Context({'request': request})
+        context = Context({'request': request, 'is_api_request': True})
         return Response(
             {
                 'html': cosinnus_menu_v2(context, request=request),