Merge branch 'dev' into 'master'

Fix: 2.2 RC1 Bug Fixes

See merge request ghostmanager/Ghostwriter!113

Author: chrismaddalena

ghostwriter/contrib/sites/migrations/0004_auto_20210406_0058.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.0.10 on 2021-04-06 00:58
+
+# Django Imports
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sites", "0003_set_site_domain_and_name"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="site",
+            options={
+                "ordering": ["domain"],
+                "verbose_name": "site",
+                "verbose_name_plural": "sites",
+            },
+        ),
+    ]

ghostwriter/modules/linting_utils.py

@@ -83,6 +83,7 @@
             ],
             "objective": "Discover Kenneth Parcell's true identity",
             "description": '<p>It is unclear if this is a jest and part of an HR-related "flag" or a real request. The client was light on details. The objective is wide open; asking the team to find any and all information related to Kenneth Parcel, a member of NBC\'s Page Program.</p>',
+            "description_rt": "",
             "complete": False,
             "marked_complete": "",
             "position": 1,
@@ -102,6 +103,7 @@
             ],
             "objective": "Access hosts and files containing celebrity PII",
             "description": "<p>The team may find methods of accessing data related to celebrities that appear on NBC programs. Use any discovered methods to access this information and capture evidence.</p>",
+            "description_rt": "",
             "complete": False,
             "marked_complete": "",
             "position": 1,
@@ -121,6 +123,7 @@
             ],
             "objective": "Escalate privileges in the NBC domain to Domain Administrator or equivalent",
             "description": "<p>Active Directory is a key component of the assessment, and client is keen to learn how many attack paths may be discovered to escalate privileges within the network.</p>",
+            "description_rt": "",
             "complete": False,
             "marked_complete": "",
             "position": 2,
@@ -131,6 +134,7 @@
             "ip_address": "12.31.13.90",
             "hostname": "PP00001.NBC.LOCAL",
             "note": "<p>Computer known to be used by Kenneth Parcell. May contain celebrity PII (Parcell performs tasks for Tracy Morgan) or provide information for the Parcell objective.</p>",
+            "note_rt": "",
             "compromised": False,
         }
     ],
@@ -140,6 +144,7 @@
             "scope": ["10.6.0.125"],
             "name": "Executive Computer",
             "description": "<p>This is Jack Donaghy's computer and should not be touched.</p>",
+            "description_rt": "",
             "disallowed": True,
             "requires_caution": False,
         },
@@ -148,6 +153,7 @@
             "scope": ["192.168.1.0/24", "10.100.0.0/16", "*.nbc.com", "NBC.LOCAL"],
             "name": "NBC Allowlist",
             "description": "<p>All hosts and domains in this list are allowed and related to core objectives.</p>",
+            "description_rt": "",
             "disallowed": False,
             "requires_caution": False,
         },
@@ -156,6 +162,7 @@
             "scope": ["12.31.13.0/24"],
             "name": "NBC Page Program",
             "description": "<p>Client advises caution while accessing this network and avoid detection. It is unclear why, but they have said it is related to the Kenneth Parcell objective.</p>",
+            "description_rt": "",
             "disallowed": False,
             "requires_caution": True,
         },

ghostwriter/reporting/tests/factories.py

@@ -0,0 +1,8 @@
+# 3rd Party Libraries
+import factory
+
+
+class FindingFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = "reporting.Finding"
+        django_get_or_create = ("title",)

ghostwriter/reporting/tests/test_models.py

@@ -0,0 +1,33 @@
+# Django Imports
+from django.test import TestCase
+
+from .factories import FindingFactory
+
+
+class FindingModelsTestCase(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.Finding = FindingFactory._meta.model
+
+    def test_crud_finding(self):
+        # Create
+        finding = FindingFactory(title="Awful Finding")
+
+        # Read
+        self.assertEqual(finding.title, "Awful Finding")
+        self.assertEqual(finding.pk, finding.id)
+        self.assertQuerysetEqual(
+            self.Finding.objects.all(), ["<Finding: [None] Awful Finding>"]
+        )
+
+        # Update
+        finding.title = "Not so Bad Finding"
+        finding.save()
+        self.assertQuerysetEqual(
+            self.Finding.objects.all(), ["<Finding: [None] Not so Bad Finding>"]
+        )
+
+        # Delete
+        finding.title = "Not so Bad Finding"
+        finding.delete()
+        assert not self.Finding.objects.all().exists()

ghostwriter/rolodex/forms_project.py

@@ -988,7 +988,7 @@ def __init__(self, *args, **kwargs):
     def clean_end_date(self):
         end_date = self.cleaned_data["end_date"]
         start_date = self.cleaned_data["start_date"]
-        # Check if end_date comes before the start_date
+        # Check if ``end_date`` comes before the ``start_date``
         if end_date < start_date:
             raise ValidationError(
                 _("The provided end date comes before the start date"),

ghostwriter/rolodex/signals.py

@@ -8,7 +8,7 @@
 from django.dispatch import receiver
 
 # Ghostwriter Libraries
-from ghostwriter.rolodex.models import Project, ProjectAssignment
+from ghostwriter.rolodex.models import Project
 from ghostwriter.shepherd.models import History, ServerHistory
 
 # Using __name__ resolves to ghostwriter.rolodex.signals
@@ -23,7 +23,7 @@ def update_project(sender, instance, **kwargs):
     """
     domain_checkouts = History.objects.filter(project=instance)
     server_checkouts = ServerHistory.objects.filter(project=instance)
-    project_assignments = ProjectAssignment.objects.filter(project=instance)
+
     for domain in domain_checkouts:
         if domain.start_date > instance.start_date or domain.end_date > instance.end_date:
             if domain.start_date > instance.start_date:
@@ -38,13 +38,3 @@ def update_project(sender, instance, **kwargs):
             if server.end_date > instance.end_date:
                 server.end_date = instance.end_date
             server.save()
-    for assignment in project_assignments:
-        if (
-            assignment.start_date > instance.start_date
-            or assignment.end_date > instance.end_date
-        ):
-            if assignment.start_date > instance.start_date:
-                assignment.start_date = instance.start_date
-            if assignment.end_date > instance.end_date:
-                assignment.end_date = instance.end_date
-            assignment.save()