From 8c33349dcb23377d675e7f1a16c3efdc9c4a4b68 Mon Sep 17 00:00:00 2001 From: Aaron Kable Date: Tue, 7 Jan 2020 02:41:18 +0000 Subject: [PATCH 1/2] Purge groups not available to member on state change --- allianceauth/groupmanagement/admin.py | 4 ++-- allianceauth/groupmanagement/signals.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 allianceauth/groupmanagement/signals.py diff --git a/allianceauth/groupmanagement/admin.py b/allianceauth/groupmanagement/admin.py index 09d2aaa1..b122980b 100644 --- a/allianceauth/groupmanagement/admin.py +++ b/allianceauth/groupmanagement/admin.py @@ -4,7 +4,7 @@ from django.db.models.signals import pre_save, post_save, pre_delete, post_delet from django.dispatch import receiver from .models import AuthGroup from .models import GroupRequest - +from . import signals class AuthGroupInlineAdmin(admin.StackedInline): model = AuthGroup @@ -65,4 +65,4 @@ def redirect_post_delete(sender, signal=None, *args, **kwargs): @receiver(m2m_changed, sender=Group.permissions.through) def redirect_m2m_changed_permissions(sender, signal=None, *args, **kwargs): - m2m_changed.send(BaseGroup, *args, **kwargs) \ No newline at end of file + m2m_changed.send(BaseGroup, *args, **kwargs) diff --git a/allianceauth/groupmanagement/signals.py b/allianceauth/groupmanagement/signals.py new file mode 100644 index 00000000..57e3766b --- /dev/null +++ b/allianceauth/groupmanagement/signals.py @@ -0,0 +1,16 @@ +from allianceauth.authentication.signals import state_changed +from .managers import GroupManager +from .models import Group +from django.dispatch import receiver +import logging +logger = logging.getLogger(__name__) + +@receiver(state_changed) +def check_groups_on_state_change(sender, user, state, **kwargs): + logger.debug("Updating auth groups for {}".format(user)) + visible_groups = GroupManager.get_joinable_groups(state) + visible_groups = visible_groups | Group.objects.select_related('authgroup').filter(authgroup__internal=True) + groups = user.groups.all() + for g in groups: + if g not in visible_groups: + user.groups.remove(g) From 5b4dd6731ccae4665d63441fe9a8a17cd4e8bcab Mon Sep 17 00:00:00 2001 From: AaronKable Date: Tue, 28 Jan 2020 16:22:43 +0800 Subject: [PATCH 2/2] tests for the test god --- allianceauth/groupmanagement/tests.py | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 allianceauth/groupmanagement/tests.py diff --git a/allianceauth/groupmanagement/tests.py b/allianceauth/groupmanagement/tests.py new file mode 100644 index 00000000..b9acfe31 --- /dev/null +++ b/allianceauth/groupmanagement/tests.py @@ -0,0 +1,52 @@ +from unittest import mock + +from django.test import TestCase +from allianceauth.tests.auth_utils import AuthUtils +from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter +from django.contrib.auth.models import User, Group +from allianceauth.groupmanagement.signals import check_groups_on_state_change + +class GroupManagementStateTestCase(TestCase): + @classmethod + def setUpTestData(cls): + cls.user = AuthUtils.create_user('test') + AuthUtils.add_main_character(cls.user, 'test character', '1', corp_id='2', corp_name='test_corp', corp_ticker='TEST', alliance_id='3', alliance_name='TEST') + cls.user.profile.refresh_from_db() + cls.alliance = EveAllianceInfo.objects.create(alliance_id='3', alliance_name='test alliance', alliance_ticker='TEST', executor_corp_id='2') + cls.corp = EveCorporationInfo.objects.create(corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1) + cls.state_group = Group.objects.create(name='state_group') + cls.open_group = Group.objects.create(name='open_group') + cls.state = AuthUtils.create_state('test state', 500) + cls.state_group.authgroup.states.add(cls.state) + cls.state_group.authgroup.internal = False + cls.state_group.save() + + def setUp(self): + self.user.refresh_from_db() + self.state.refresh_from_db() + + def _refresh_user(self): + self.user = User.objects.get(pk=self.user.pk) + + def _refresh_test_group(self): + self.state_group = Group.objects.get(pk=self.state_group.pk) + + def test_drop_state_group(self): + + self.user.groups.add(self.open_group) + self.user.groups.add(self.state_group) + self.assertEqual(self.user.profile.state.name, "Guest") + + self.state.member_corporations.add(self.corp) + self._refresh_user() + self.assertEqual(self.user.profile.state, self.state) + groups = self.user.groups.all() + self.assertIn(self.state_group, groups) #keeps group + self.assertIn(self.open_group, groups) #public group unafected + + self.state.member_corporations.clear() + self._refresh_user() + self.assertEqual(self.user.profile.state.name, "Guest") + groups = self.user.groups.all() + self.assertNotIn(self.state_group, groups) #looses group + self.assertIn(self.open_group, groups) #public group unafected