Skip to content

Commit 70e25ef

Browse files
committed
stop creating default Dojo_Group_Member from user_post_save
OS no longer reads System_Settings.default_group / default_group_role / default_group_email_pattern to bootstrap a Dojo_Group_Member when a new user is created. Pro's post_save signal on Dojo_User (pro/authorization/signals.py) handles the same logic. Drop the Dojo_Group_Member import.
1 parent f171a1e commit 70e25ef

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

dojo/utils.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
from django.utils.translation import gettext as _
4646
from kombu import Connection
4747

48-
from dojo.authorization.models import Dojo_Group_Member
4948
from dojo.celery import app
5049
from dojo.finding.queries import get_authorized_findings
5150
from dojo.github.services import (
@@ -1398,19 +1397,10 @@ def get_site_url():
13981397
@receiver(post_save, sender=User)
13991398
@receiver(post_save, sender=Dojo_User)
14001399
def user_post_save(sender, instance, created, **kwargs):
1401-
# Default-Notifications row creation for new users now lives in
1400+
# Default-Notifications row creation for new users lives in
14021401
# dojo.notifications.signals.create_default_notifications.
1403-
if created:
1404-
system_settings = System_Settings.objects.get()
1405-
if system_settings.default_group and system_settings.default_group_role:
1406-
if (system_settings.default_group_email_pattern and re.fullmatch(system_settings.default_group_email_pattern, instance.email)) or \
1407-
not system_settings.default_group_email_pattern:
1408-
logger.info("setting default group for: " + str(instance))
1409-
dojo_group_member = Dojo_Group_Member(
1410-
group=system_settings.default_group,
1411-
user=instance,
1412-
role=system_settings.default_group_role)
1413-
dojo_group_member.save()
1402+
# Default-group Dojo_Group_Member bootstrapping lives in
1403+
# pro.authorization.signals (RBAC ownership is Pro's responsibility).
14141404

14151405
# Superusers shall always be staff
14161406
if instance.is_superuser and not instance.is_staff:

0 commit comments

Comments
 (0)