Merge branch 'main' into CA-531-display-toast-on-login-when-license-i…

…s-nearing-expiration
intuitem · Nov 22, 2024 · 3dda938 · 3dda938
2 parents e053b45 + fe84a80
commit 3dda938
Show file tree

Hide file tree

Showing 95 changed files with 3,794 additions and 666 deletions.
diff --git a/README.md b/README.md
@@ -500,6 +500,8 @@ Set DJANGO_DEBUG=False for security reason.
 - RO: Romanian
 - HI: Hindi
 - UR: Urdu
+- CZ: Czech
+- SV: Swedish
 
 ## Contributors 🤝
 

diff --git a/backend/ciso_assistant/settings.py b/backend/ciso_assistant/settings.py
@@ -311,6 +311,7 @@ def set_ciso_assistant_url(_, __, event_dict):
     ("hi", "Hindi"),
     ("ur", "Urdu"),
     ("cz", "Czech"),
+    ("sv", "Swedish"),
 ]
 
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))

diff --git a/backend/core/migrations/0035_riskscenario_existing_applied_controls.py b/backend/core/migrations/0035_riskscenario_existing_applied_controls.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.1 on 2024-11-09 08:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0034_fix_loaded_libraries_objects_meta"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="riskscenario",
+            name="existing_applied_controls",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="risk_scenarios_e",
+                to="core.appliedcontrol",
+                verbose_name="Existing Applied controls",
+            ),
+        ),
+    ]
diff --git a/backend/core/migrations/0036_asset_owner.py b/backend/core/migrations/0036_asset_owner.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.1.1 on 2024-11-18 16:21
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0035_riskscenario_existing_applied_controls"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="asset",
+            name="owner",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="assets",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Owner",
+            ),
+        ),
+    ]
diff --git a/backend/core/migrations/0037_appliedcontrol_priority.py b/backend/core/migrations/0037_appliedcontrol_priority.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.1 on 2024-11-19 15:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0036_asset_owner"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="appliedcontrol",
+            name="priority",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                choices=[(1, "P1"), (2, "P2"), (3, "P3"), (4, "P4")],
+                null=True,
+                verbose_name="Priority",
+            ),
+        ),
+    ]
diff --git a/backend/core/migrations/0038_asset_disaster_recovery_objectives_and_more.py b/backend/core/migrations/0038_asset_disaster_recovery_objectives_and_more.py
@@ -0,0 +1,99 @@
+# Generated by Django 5.1.1 on 2024-11-22 07:00
+
+import core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0037_appliedcontrol_priority"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="asset",
+            name="disaster_recovery_objectives",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="The disaster recovery objectives of the asset",
+                validators=[
+                    core.validators.JSONSchemaInstanceValidator(
+                        {
+                            "$id": "https://ciso-assistant.com/schemas/assets/security_objectives.schema.json",
+                            "$schema": "https://json-schema.org/draft/2020-12/schema",
+                            "description": "The security objectives of the asset",
+                            "properties": {
+                                "objectives": {
+                                    "patternProperties": {
+                                        "^[a-z_]+$": {
+                                            "properties": {
+                                                "value": {
+                                                    "minimum": 0,
+                                                    "type": "integer",
+                                                }
+                                            },
+                                            "type": "object",
+                                        }
+                                    },
+                                    "type": "object",
+                                }
+                            },
+                            "title": "Security objectives",
+                            "type": "object",
+                        }
+                    )
+                ],
+                verbose_name="Disaster recovery objectives",
+            ),
+        ),
+        migrations.AddField(
+            model_name="asset",
+            name="reference_link",
+            field=models.URLField(
+                blank=True,
+                help_text="External url for action follow-up (eg. Jira ticket)",
+                max_length=2048,
+                null=True,
+                verbose_name="Link",
+            ),
+        ),
+        migrations.AddField(
+            model_name="asset",
+            name="security_objectives",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="The security objectives of the asset",
+                validators=[
+                    core.validators.JSONSchemaInstanceValidator(
+                        {
+                            "$id": "https://ciso-assistant.com/schemas/assets/security_objectives.schema.json",
+                            "$schema": "https://json-schema.org/draft/2020-12/schema",
+                            "description": "The security objectives of the asset",
+                            "properties": {
+                                "objectives": {
+                                    "patternProperties": {
+                                        "^[a-z_]+$": {
+                                            "properties": {
+                                                "is_enabled": {"type": "boolean"},
+                                                "value": {
+                                                    "minimum": 0,
+                                                    "type": "integer",
+                                                },
+                                            },
+                                            "type": "object",
+                                        }
+                                    },
+                                    "type": "object",
+                                }
+                            },
+                            "title": "Security objectives",
+                            "type": "object",
+                        }
+                    )
+                ],
+                verbose_name="Security objectives",
+            ),
+        ),
+    ]