Merge branch 'main' into fix-homepage-container-flexibility

Author: OUMIMANDAL

.github/workflows/run-ci-cd.yaml

@@ -119,7 +119,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run Trivy Repository Scan
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           scan-type: repo
           trivy-config: trivy.yaml
@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run Trivy Filesystem Scan
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           scan-type: fs
           trivy-config: trivy.yaml
@@ -362,7 +362,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Scan backend image
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           exit-code: 0
           image-ref: owasp/nest:backend-staging
@@ -372,7 +372,7 @@ jobs:
           version: latest
 
       - name: Scan frontend image
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           exit-code: 1
           image-ref: owasp/nest:frontend-staging
@@ -616,7 +616,7 @@ jobs:
 
       - name: Scan backend image
         continue-on-error: true
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           exit-code: 1
           image-ref: owasp/nest:backend-production
@@ -626,7 +626,7 @@ jobs:
 
       - name: Scan frontend image
         continue-on-error: true
-        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
+        uses: aquasecurity/trivy-action@f9424c10c36e288d5fa79bd3dfd1aeb2d6eae808
         with:
           exit-code: 1
           image-ref: owasp/nest:frontend-production

.pre-commit-config.yaml

@@ -10,7 +10,9 @@ repos:
         exclude: (.github|pnpm-lock.yaml)
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.9
+
+    rev: v0.12.11
+
     hooks:
       - id: ruff
         args:

backend/Makefile

@@ -1,5 +1,6 @@
 include backend/apps/ai/Makefile
 include backend/apps/github/Makefile
+include backend/apps/nest/Makefile
 include backend/apps/owasp/Makefile
 include backend/apps/slack/Makefile
 

backend/apps/github/migrations/0035_alter_user_bio_alter_user_is_owasp_staff.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.5 on 2025-08-16 02:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("github", "0034_merge_20250804_1817"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="bio",
+            field=models.TextField(blank=True, default="", max_length=1000, verbose_name="Bio"),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="is_owasp_staff",
+            field=models.BooleanField(
+                default=False,
+                help_text="Indicates if the user is OWASP Foundation staff.",
+                verbose_name="Is OWASP Staff",
+            ),
+        ),
+    ]

backend/apps/github/models/user.py

@@ -27,7 +27,7 @@ class Meta:
         ]
         verbose_name_plural = "Users"
 
-    bio = models.TextField(verbose_name="Bio", max_length=1000, default="")
+    bio = models.TextField(verbose_name="Bio", max_length=1000, blank=True, default="")
     is_hireable = models.BooleanField(verbose_name="Is hireable", default=False)
     twitter_username = models.CharField(
         verbose_name="Twitter username", max_length=50, default="", blank=True
@@ -37,8 +37,8 @@ class Meta:
 
     is_owasp_staff = models.BooleanField(
         default=False,
-        verbose_name="OWASP Staff",
-        help_text="Indicates if the user is an OWASP staff member.",
+        verbose_name="Is OWASP Staff",
+        help_text="Indicates if the user is OWASP Foundation staff.",
     )
 
     contributions_count = models.PositiveIntegerField(

backend/apps/nest/Makefile

@@ -0,0 +1,3 @@
+nest-update-badges:
+	@echo "Updating Nest user badges"
+	@CMD="python manage.py nest_update_badges" $(MAKE) exec-backend-command

backend/apps/nest/admin/__init__.py

@@ -3,3 +3,4 @@
 from .api_key import ApiKeyAdmin
 from .badge import BadgeAdmin
 from .user import UserAdmin
+from .user_badge import UserBadgeAdmin

backend/apps/nest/admin/user_badge.py

@@ -0,0 +1,35 @@
+"""Admin configuration for the user badge model in the OWASP app."""
+
+from django.contrib import admin
+
+from apps.nest.models.user_badge import UserBadge
+
+
+class UserBadgeAdmin(admin.ModelAdmin):
+    """Admin for UserBadge model."""
+
+    autocomplete_fields = (
+        "badge",
+        "user",
+    )
+    list_display = (
+        "user",
+        "badge",
+        "note",
+        "nest_created_at",
+        "nest_updated_at",
+    )
+    list_filter = ("is_active", "badge__name")
+    readonly_fields = (
+        "nest_created_at",
+        "nest_updated_at",
+    )
+    search_fields = (
+        "badge__name",
+        "note",
+        "user__login",
+        "user__name",
+    )
+
+
+admin.site.register(UserBadge, UserBadgeAdmin)