mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 20:40:17 +02:00
918ecf812c
* Add public field to AuthGroup * Add permission for users to join non-public groups By default this permission will be applied to the "Member" group to maintain the current behaviour. * Allow users to join public groups Users without the 'groupmanagement.request_groups' permission will be able to join groups marked as public but will not be able to see or join any other groups. * Prevent None state change from purging groups Currently when a user drops from Blue or Member state all groups and permissions are discarded. This softens that approach by not removing public groups and creates a distinction between the two activities. An argument could maybe be made for not removing permissions on a state change, but that is beyond the scope of this change. * Correct syntax for removing filtered groups * Add unit tests for disable user and member * Update services signals tests * Correct mocking call * Remove permissions checking from menu item
62 lines
2.3 KiB
Python
62 lines
2.3 KiB
Python
from __future__ import unicode_literals
|
|
|
|
import logging
|
|
|
|
from django.contrib.auth.models import User
|
|
from django.db import transaction
|
|
from django.db.models.signals import m2m_changed
|
|
from django.db.models.signals import pre_delete
|
|
from django.db.models.signals import pre_save
|
|
from django.dispatch import receiver
|
|
|
|
from alliance_auth.hooks import get_hooks
|
|
from authentication.tasks import disable_user
|
|
from authentication.tasks import set_state
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@receiver(m2m_changed, sender=User.groups.through)
|
|
def m2m_changed_user_groups(sender, instance, action, *args, **kwargs):
|
|
logger.debug("Received m2m_changed from %s groups with action %s" % (instance, action))
|
|
|
|
def trigger_service_group_update():
|
|
logger.debug("Triggering service group update for %s" % instance)
|
|
# Iterate through Service hooks
|
|
services = get_hooks('services_hook')
|
|
for fn in services:
|
|
svc = fn()
|
|
try:
|
|
svc.update_groups(instance)
|
|
except:
|
|
logger.exception('Exception running update_groups for services module %s on user %s' % (svc, instance))
|
|
|
|
if instance.pk and (action == "post_add" or action == "post_remove" or action == "post_clear"):
|
|
logger.debug("Waiting for commit to trigger service group update for %s" % instance)
|
|
transaction.on_commit(trigger_service_group_update)
|
|
|
|
|
|
@receiver(pre_delete, sender=User)
|
|
def pre_delete_user(sender, instance, *args, **kwargs):
|
|
logger.debug("Received pre_delete from %s" % instance)
|
|
disable_user(instance)
|
|
|
|
|
|
@receiver(pre_save, sender=User)
|
|
def pre_save_user(sender, instance, *args, **kwargs):
|
|
logger.debug("Received pre_save from %s" % instance)
|
|
# check if user is being marked active/inactive
|
|
if not instance.pk:
|
|
# new model being created
|
|
return
|
|
try:
|
|
old_instance = User.objects.get(pk=instance.pk)
|
|
if old_instance.is_active and not instance.is_active:
|
|
logger.info("Disabling services for inactivation of user %s" % instance)
|
|
disable_user(instance)
|
|
elif instance.is_active and not old_instance.is_active:
|
|
logger.info("Assessing state of reactivated user %s" % instance)
|
|
set_state(instance)
|
|
except User.DoesNotExist:
|
|
pass
|