Dojo_Group: Support for "RemoteUser" in model

dojo/db_migrations/0202_alter_dojo_group_social_provider.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.13 on 2024-01-25 00:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0201_populate_finding_sla_expiration_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dojo_group',
+            name='social_provider',
+            field=models.CharField(blank=True, choices=[('AzureAD', 'AzureAD'), ('Remote', 'Remote')], help_text='Group imported from a social provider.', max_length=10, null=True, verbose_name='Social Authentication Provider'),
+        ),
+    ]

dojo/models.py

@@ -246,14 +246,16 @@ class UserContactInfo(models.Model):
 
 class Dojo_Group(models.Model):
     AZURE = 'AzureAD'
+    REMOTE = 'Remote'
     SOCIAL_CHOICES = (
         (AZURE, _('AzureAD')),
+        (REMOTE, _('Remote')),
     )
     name = models.CharField(max_length=255, unique=True)
     description = models.CharField(max_length=4000, null=True, blank=True)
     users = models.ManyToManyField(Dojo_User, through='Dojo_Group_Member', related_name='users', blank=True)
     auth_group = models.ForeignKey(Group, null=True, blank=True, on_delete=models.CASCADE)
-    social_provider = models.CharField(max_length=10, choices=SOCIAL_CHOICES, blank=True, null=True, help_text='Group imported from a social provider.', verbose_name='Social Authentication Provider')
+    social_provider = models.CharField(max_length=10, choices=SOCIAL_CHOICES, blank=True, null=True, help_text=_('Group imported from a social provider.'), verbose_name=_('Social Authentication Provider'))
 
     def __str__(self):
         return self.name

dojo/pipeline.py

@@ -98,7 +98,7 @@ def update_azure_groups(backend, uid, user=None, social=None, *args, **kwargs):
             except Exception as e:
                 logger.error(f"Could not call microsoft graph API or save groups to member: {e}")
         if len(group_names) > 0:
-            assign_user_to_groups(user, group_names, 'AzureAD')
+            assign_user_to_groups(user, group_names, Dojo_Group.AZURE)
         if settings.AZUREAD_TENANT_OAUTH2_CLEANUP_GROUPS:
             cleanup_old_groups_for_user(user, group_names)
 

dojo/remote_user.py

@@ -6,6 +6,7 @@
 from netaddr import IPAddress
 from django.conf import settings
 from dojo.pipeline import assign_user_to_groups, cleanup_old_groups_for_user
+from dojo.models import Dojo_Group
 
 logger = logging.getLogger(__name__)
 
@@ -77,7 +78,7 @@ def configure_user(self, request, user, created=True):
 
         if settings.AUTH_REMOTEUSER_GROUPS_HEADER and \
           settings.AUTH_REMOTEUSER_GROUPS_HEADER in request.META:
-            assign_user_to_groups(user, request.META[settings.AUTH_REMOTEUSER_GROUPS_HEADER].split(','), 'Remote')
+            assign_user_to_groups(user, request.META[settings.AUTH_REMOTEUSER_GROUPS_HEADER].split(','), Dojo_Group.REMOTE)
 
         if settings.AUTH_REMOTEUSER_GROUPS_CLEANUP and \
           settings.AUTH_REMOTEUSER_GROUPS_HEADER and \

unittests/test_remote_user.py

@@ -16,8 +16,8 @@ def setUp(self):
             last_name='original_last',
             email='original@mail.com',
         )
-        self.group1, _ = Dojo_Group.objects.get_or_create(name="group1", social_provider="Remote")
-        self.group2, _ = Dojo_Group.objects.get_or_create(name="group2", social_provider="Remote")
+        self.group1, _ = Dojo_Group.objects.get_or_create(name="group1", social_provider=Dojo_Group.REMOTE)
+        self.group2, _ = Dojo_Group.objects.get_or_create(name="group2", social_provider=Dojo_Group.REMOTE)
 
     @override_settings(AUTH_REMOTEUSER_ENABLED=False)
     def test_disabled(self):