Skip to content

Commit

Permalink
changed default values for artifactstatus
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuhli
stuhli committed Nov 26, 2020
1 parent 47deda7 commit 35759c7
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
23 changes: 13 additions & 10 deletions dfirtrack_artifacts/migrations/0002_default_values.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ class Migration(migrations.Migration):

operations = [

migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Needs analysis', 'open');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Requested from customer', 'requested');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Collecting through EDR', 'collecting');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Processing ongoing', 'processing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Import ongoing', 'importing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Ready for analysis', 'ready');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Analysis ongoing', 'ongoing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Analysis finished', 'finished');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('Not available', 'unavailable');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('10_needs_analysis', '10_needs_analysis');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('20_requested', '20_requested');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('21_requested_again', '21_requested_again');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('25_collection_ongoing', '25_collection_ongoing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('30_processing_ongoing', '30_processing_ongoing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('40_import_ongoing', '40_import_ongoing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('50_ready_for_analysis', '50_ready_for_analysis');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('60_analysis_ongoing', '60_analysis_ongoing');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('70_analysis_finished', '70_analysis_finished');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('90_not_analyzed', '90_not_analyzed');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifactstatus (artifactstatus_name, artifactstatus_slug) VALUES ('95_not_available', '95_not_available');"),

migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifacttype (artifacttype_name, artifacttype_slug) VALUES ('Image', 'image');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifacttype (artifacttype_name, artifacttype_slug) VALUES ('File', 'file');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifacttype (artifacttype_name, artifacttype_slug) VALUES ('Image', 'image');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifacttype (artifacttype_name, artifacttype_slug) VALUES ('Information', 'information');"),
migrations.RunSQL("INSERT INTO dfirtrack_artifacts_artifacttype (artifacttype_name, artifacttype_slug) VALUES ('Triage', 'triage');"),

]
20 changes: 10 additions & 10 deletions dfirtrack_artifacts/tests/artifact/test_artifact_exporter_spreadsheet_xls_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def setUpTestData(cls):
# create user
test_user = User.objects.create_user(username='testuser_artifact_exporter_spreadsheet_xls', password='LTzoNHIdxiJydsaJKf1G')

# get object
artifactstatus_needs_analysis = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis')
# create object
artifactstatus_3 = Artifactstatus.objects.create(artifactstatus_name = 'artifactstatus_3')

# create object
artifactstatus_1 = Artifactstatus.objects.create(
Expand Down Expand Up @@ -55,7 +55,7 @@ def setUpTestData(cls):
# create object with maximum attributes
Artifact.objects.create(
artifact_name = 'artifact_exporter_spreadsheet_xls_artifact_1_all_attributes',
artifactstatus = artifactstatus_needs_analysis,
artifactstatus = artifactstatus_3,
artifacttype = artifacttype_1,
system = system_1,
artifact_source_path = 'C:\Temp\malicious.exe',
Expand All @@ -76,7 +76,7 @@ def setUpTestData(cls):
# create object with minimum attributes
Artifact.objects.create(
artifact_name = 'artifact_exporter_spreadsheet_xls_artifact_2_no_attributes',
artifactstatus = artifactstatus_needs_analysis,
artifactstatus = artifactstatus_3,
artifacttype = artifacttype_1,
system = system_1,
artifact_created_by_user_id = test_user,
Expand Down Expand Up @@ -153,9 +153,9 @@ def test_artifact_exporter_spreadsheet_xls_minimal_spreadsheet(self):
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_worksheet_artifacttype = False
artifact_exporter_spreadsheet_xls_config_model.save()
# get object
artifactstatus_needs_analysis = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis')
artifactstatus_3 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_3')
# add artifactstatus to choice for export
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_choice_artifactstatus.add(artifactstatus_needs_analysis)
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_choice_artifactstatus.add(artifactstatus_3)
# login testuser
self.client.login(username='testuser_artifact_exporter_spreadsheet_xls', password='LTzoNHIdxiJydsaJKf1G')
# get objects
Expand Down Expand Up @@ -215,9 +215,9 @@ def test_artifact_exporter_spreadsheet_xls_complete_spreadsheet(self):
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_worksheet_artifacttype = True
artifact_exporter_spreadsheet_xls_config_model.save()
# get object
artifactstatus_needs_analysis = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis')
artifactstatus_3 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_3')
# add artifactstatus to choice for export
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_choice_artifactstatus.add(artifactstatus_needs_analysis)
artifact_exporter_spreadsheet_xls_config_model.artifactlist_xls_choice_artifactstatus.add(artifactstatus_3)
# login testuser
self.client.login(username='testuser_artifact_exporter_spreadsheet_xls', password='LTzoNHIdxiJydsaJKf1G')
# get objects
Expand Down Expand Up @@ -262,9 +262,9 @@ def test_artifact_exporter_spreadsheet_xls_complete_spreadsheet(self):
# compare number of rows and columns
self.assertEqual(sheet_artifacts.nrows, 6)
self.assertEqual(sheet_artifacts.ncols, 16)
self.assertEqual(sheet_artifactstatus.nrows, 11)
self.assertEqual(sheet_artifactstatus.nrows, 14)
self.assertEqual(sheet_artifactstatus.ncols, 3)
self.assertEqual(sheet_artifacttype.nrows, 6)
self.assertEqual(sheet_artifacttype.nrows, 7)
self.assertEqual(sheet_artifacttype.ncols, 3)
# compare headlines
self.assertEqual(sheet_artifacts.row_values(0), ['Artifact ID', 'Artifact', 'System ID', 'System', 'Artifactstatus', 'Artifacttype', 'Source path', 'Storage path', 'Internal note','External note', 'Analysis result', 'MD5', 'SHA1', 'SHA256', 'Created', 'Modified'])
Expand Down
22 changes: 16 additions & 6 deletions dfirtrack_config/tests/artifact/test_artifact_exporter_spreadsheet_xls_config_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ def setUpTestData(cls):
# create user
User.objects.create_user(username='testuser_artifact_exporter_spreadsheet_xls_config', password='i3jLLnbrAEgel24sGs9i')

# create objects
Artifactstatus.objects.create(
artifactstatus_name = 'artifactstatus_1',
artifactstatus_slug = 'artifactstatus_1',
)
Artifactstatus.objects.create(
artifactstatus_name = 'artifactstatus_2',
artifactstatus_slug = 'artifactstatus_2',
)

def test_artifact_exporter_spreadsheet_xls_config_not_logged_in(self):
""" test exporter view """

Expand Down Expand Up @@ -71,8 +81,8 @@ def test_artifact_exporter_spreadsheet_xls_config_post_redirect(self):
# login testuser
self.client.login(username='testuser_artifact_exporter_spreadsheet_xls_config', password='i3jLLnbrAEgel24sGs9i')
# get objects
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'Requested from customer').artifactstatus_id
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_1').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_2').artifactstatus_id
# create post data
data_dict = {
'artifactlist_xls_choice_artifactstatus': [str(artifactstatus_1), str(artifactstatus_2)],
Expand All @@ -88,8 +98,8 @@ def test_artifact_exporter_spreadsheet_xls_config_post_artifact_id_false(self):
# login testuser
self.client.login(username='testuser_artifact_exporter_spreadsheet_xls_config', password='i3jLLnbrAEgel24sGs9i')
# get objects
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'Requested from customer').artifactstatus_id
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_1').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_2').artifactstatus_id
# create post data
data_dict = {
'artifactlist_xls_choice_artifactstatus': [str(artifactstatus_1), str(artifactstatus_2)],
Expand All @@ -107,8 +117,8 @@ def test_artifact_exporter_spreadsheet_xls_config_post_artifact_id_true(self):
# login testuser
self.client.login(username='testuser_artifact_exporter_spreadsheet_xls_config', password='i3jLLnbrAEgel24sGs9i')
# get objects
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'Needs analysis').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'Requested from customer').artifactstatus_id
artifactstatus_1 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_1').artifactstatus_id
artifactstatus_2 = Artifactstatus.objects.get(artifactstatus_name = 'artifactstatus_2').artifactstatus_id
# create post data
data_dict = {
'artifactlist_xls_choice_artifactstatus': [str(artifactstatus_1), str(artifactstatus_2)],
Expand Down

0 comments on commit 35759c7

Please sign in to comment.