Update code

Author: arkid15r

backend/Makefile

@@ -115,7 +115,7 @@ update-data: \
 	owasp-scrape-committees \
 	owasp-scrape-projects \
 	github-update-project-related-repositories \
-	github-update-external-repositories \
+	github-update-owasp-related-organizations \
 	github-update-users \
 	owasp-aggregate-projects \
 	owasp-update-events \

backend/apps/github/Makefile

@@ -9,14 +9,14 @@ github-update-owasp-organization:
 	@echo "Updating OWASP GitHub organization"
 	@CMD="python manage.py github_update_owasp_organization" $(MAKE) exec-backend-command
 
+github-update-owasp-related-organizations:
+	@echo "Updating external OWASP GitHub organizations"
+	@CMD="python manage.py github_update_external_organizations" $(MAKE) exec-backend-command
+
 github-update-project-related-repositories:
 	@echo "Updating OWASP project related GitHub repositories"
 	@CMD="python manage.py github_update_project_related_repositories" $(MAKE) exec-backend-command
 
-github-update-external-repositories:
-	@echo "Updating external OWASP GitHub repositories"
-	@CMD="python manage.py github_update_external_repositories" $(MAKE) exec-backend-command
-
 github-update-users:
 	@echo "Updating GitHub users"
 	@CMD="python manage.py github_update_users" $(MAKE) exec-backend-command

backend/apps/github/management/commands/github_update_owasp_related_organizations.py

@@ -0,0 +1,96 @@
+"""A command to update external OWASP repositories from GitHub data."""
+
+import logging
+import os
+
+import github
+from django.core.management.base import BaseCommand
+from github.GithubException import BadCredentialsException
+
+from apps.core.utils.index import unregister_indexes
+from apps.github.common import sync_repository
+from apps.github.constants import GITHUB_ITEMS_PER_PAGE
+from apps.github.models.organization import Organization
+
+logger: logging.Logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    """Fetch external OWASP GitHub repositories and update relevant entities."""
+
+    help = "Fetch external OWASP GitHub repositories and update relevant entities."
+
+    def add_arguments(self, parser) -> None:
+        """Add command-line arguments to the parser.
+
+        Args:
+            parser (argparse.ArgumentParser): The argument parser instance.
+
+        """
+        parser.add_argument(
+            "--organization",
+            required=False,
+            type=str,
+            help="The organization name (e.g. juice-shop, DefectDojo')",
+        )
+
+    def handle(self, *_args, **options) -> None:
+        """Handle the command execution.
+
+        Args:
+            *_args: Variable length argument list.
+            **options: Arbitrary keyword arguments containing command options.
+
+        """
+        unregister_indexes()  # Disable automatic indexing
+
+        try:
+            gh = github.Github(os.getenv("GITHUB_TOKEN"), per_page=GITHUB_ITEMS_PER_PAGE)
+        except BadCredentialsException:
+            logger.warning(
+                "Invalid GitHub token. Please create and update .env file with a valid token."
+            )
+            return
+
+        organizations = Organization.related_organizations
+        if organization := options["organization"]:
+            organizations = organizations.filter(login__iexact=organization)
+
+        if not organizations.exists():
+            logger.error("No OWASP related organizations found")
+            return
+
+        organizations_count = organizations.count()
+        for idx, organization in enumerate(organizations):
+            prefix = f"{idx + 1} of {organizations_count}"
+            print(f"{prefix:<10} {organization.url}")
+
+            if organization.related_projects.count() != 1:
+                logger.error(
+                    "Couldn't identify related project for external organization %s. "
+                    "The related projects: %s.",
+                    organization,
+                    organization.related_projects,
+                )
+                continue
+
+            gh_organization = gh.get_organization(organization.login)
+            gh_repositories = gh_organization.get_repos(
+                type="public",
+                sort="created",
+                direction="desc",
+            )
+            gh_repositories_count = gh_repositories.totalCount
+            for idx_repository, gh_repository in enumerate(gh_repositories):
+                prefix = f"{idx_repository + 1} of {gh_repositories_count}"
+                repository_url = (
+                    f"https://github.com/{organization.login}/{gh_repository.name.lower()}"
+                )
+                print(f"{prefix:<12} {repository_url}")
+
+                try:
+                    _, repository = sync_repository(gh_repository)
+                    organization.related_projects.first().repositories.add(repository)
+                except Exception:
+                    logger.exception("Error syncing repository %s", repository_url)
+                    continue

backend/apps/github/migrations/0031_alter_repository_organization.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.3 on 2025-06-29 18:01
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0030_alter_organization_is_owasp_related_organization"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="repository",
+            name="organization",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="repositories",
+                to="github.organization",
+                verbose_name="Organization",
+            ),
+        ),
+    ]

backend/apps/github/models/managers/organization.py

@@ -0,0 +1,20 @@
+"""OWASP app organization managers."""
+
+from django.db import models
+
+from apps.owasp.constants import OWASP_ORGANIZATION_NAME
+
+
+class RelatedOrganizationsManager(models.Manager):
+    """OWASP related organizations manager."""
+
+    def get_queryset(self):
+        """Get open milestones."""
+        return (
+            super()
+            .get_queryset()
+            .filter(
+                is_owasp_related_organization=True,
+            )
+            .exclude(login=OWASP_ORGANIZATION_NAME)
+        )

backend/apps/github/models/organization.py

@@ -1,13 +1,21 @@
 """Github app organization model."""
 
+from __future__ import annotations
+
 from functools import lru_cache
+from typing import TYPE_CHECKING
 
+from django.apps import apps
 from django.db import models
 
 from apps.common.models import BulkSaveModel, TimestampedModel
 from apps.github.models.common import GenericUserModel, NodeModel
+from apps.github.models.managers.organization import RelatedOrganizationsManager
 from apps.github.models.mixins import OrganizationIndexMixin
 
+if TYPE_CHECKING:  # pragma: no cover
+    from django.db.models import QuerySet
+
 
 class Organization(
     BulkSaveModel,
@@ -18,6 +26,9 @@ class Organization(
 ):
     """Organization model."""
 
+    objects = models.Manager()
+    related_organizations = RelatedOrganizationsManager()
+
     class Meta:
         db_table = "github_organizations"
         verbose_name_plural = "Organizations"
@@ -38,6 +49,17 @@ def __str__(self) -> str:
         """
         return self.name
 
+    @property
+    def related_projects(self) -> QuerySet:
+        """Return organization related projects."""
+        return (
+            apps.get_model("owasp", "Project")  # Dynamic import.
+            .objects.filter(
+                repositories__in=self.repositories.all(),
+            )
+            .distinct()
+        )
+
     def from_github(self, gh_organization) -> None:
         """Update the instance based on GitHub organization data.
 
@@ -69,7 +91,7 @@ def bulk_save(organizations) -> None:  # type: ignore[override]
         BulkSaveModel.bulk_save(Organization, organizations)
 
     @staticmethod
-    def update_data(gh_organization, *, save: bool = True) -> "Organization":
+    def update_data(gh_organization, *, save: bool = True) -> Organization:
         """Update organization data.
 
         Args:

backend/apps/github/models/repository.py

@@ -88,6 +88,7 @@ class Meta:
     organization = models.ForeignKey(
         "github.Organization",
         verbose_name="Organization",
+        related_name="repositories",
         blank=True,
         null=True,
         on_delete=models.SET_NULL,

backend/tests/apps/github/management/commands/github_update_external_repositories_test.py renamed to backend/tests/apps/github/management/commands/github_update_owasp_related_repositories_test.py

@@ -4,7 +4,7 @@
 import pytest
 from github.GithubException import BadCredentialsException
 
-from apps.github.management.commands.github_update_external_repositories import (
+from apps.github.management.commands.github_update_owasp_related_organizations import (
     Command,
     Organization,
 )
@@ -63,17 +63,17 @@ def setup(self, monkeypatch, command):
         self.mock_gh = mock.Mock()
         gh_factory = mock.Mock(return_value=self.mock_gh)
         monkeypatch.setattr(
-            "apps.github.management.commands.github_update_external_repositories.github.Github",
+            "apps.github.management.commands.github_update_owasp_related_organizations.github.Github",
             gh_factory,
         )
         self.mock_sync_repository = mock.Mock()
         monkeypatch.setattr(
-            "apps.github.management.commands.github_update_external_repositories.sync_repository",
+            "apps.github.management.commands.github_update_owasp_related_organizations.sync_repository",
             self.mock_sync_repository,
         )
         self.mock_org_filter = mock.Mock()
         monkeypatch.setattr(
-            "apps.github.management.commands.github_update_external_repositories.Organization.objects.filter",
+            "apps.github.management.commands.github_update_owasp_related_organizations.Organization.objects.filter",
             self.mock_org_filter,
         )
         self.command = command
@@ -172,7 +172,9 @@ def test_handle_with_specific_organization(self):
         ),
     ],
 )
-@mock.patch("apps.github.management.commands.github_update_external_repositories.sync_repository")
+@mock.patch(
+    "apps.github.management.commands.github_update_owasp_related_organizations.sync_repository"
+)
 def test_sync_organization_repositories_error_handling(
     mock_sync_repository, command, mock_gh_repository, side_effects
 ):