From 0eac0e567bab6320b51709c9ef8b58d8302d5687 Mon Sep 17 00:00:00 2001
From: MaKyOtOx <nicolas.mattiocco@patrowl.io>
Date: Tue, 9 Nov 2021 16:01:36 +0100
Subject: [PATCH] 1.7.2

---
 Dockerfile                           |  2 +-
 VERSION                              |  2 +-
 app/assets_detection_rules.py.sample |  1 +
 engines/utils.py                     |  6 ++++++
 findings/models.py                   | 14 ++++++++++----
 scans/models.py                      |  8 --------
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c1d0a9d..f3cf45c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.7-slim
 MAINTAINER Patrowl.io "getsupport@patrowl.io"
-LABEL Name="PatrowlManager" Version="1.7.1"
+LABEL Name="PatrowlManager" Version="1.7.2"
 
 ENV PYTHONUNBUFFERED 1
 ARG arg_http_proxy
diff --git a/VERSION b/VERSION
index 700d6b3..982644b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.1 // Community Edition
+1.7.2 // Community Edition
diff --git a/app/assets_detection_rules.py.sample b/app/assets_detection_rules.py.sample
index 40a96af..faf8493 100644
--- a/app/assets_detection_rules.py.sample
+++ b/app/assets_detection_rules.py.sample
@@ -1 +1,2 @@
 # -*- coding: utf-8 -*-
+ASSET_DETECTION_RULES = {}
diff --git a/engines/utils.py b/engines/utils.py
index f7ddad6..0b7a95a 100644
--- a/engines/utils.py
+++ b/engines/utils.py
@@ -675,6 +675,12 @@ def _create_asset_on_import(asset_value, scan, asset_type='unknown', parent=None
     }
     asset = Asset(**asset_args)
     asset.save()
+
+    # Add teams related to scan
+    for team in scan.scan_definition.teams.all():
+        asset.teams.add(team)
+
+    # Add the asset to the scan
     scan.assets.add(asset)
 
     # Then add the asset to every related asset groups
diff --git a/findings/models.py b/findings/models.py
index c784fe5..7c48e66 100644
--- a/findings/models.py
+++ b/findings/models.py
@@ -190,11 +190,9 @@ def save(self, apply_overrides=False, *args, **kwargs):
 def rawfinding_create_update_log(sender, **kwargs):
     from events.models import Event
     if kwargs['created']:
-        Event.objects.create(message="[RawFinding] New raw finding created (id={}): {}".format(kwargs['instance'].id, kwargs['instance']),
-                             type="CREATE", severity="DEBUG")
+        Event.objects.create(message="[RawFinding] New raw finding created (id={}): {}".format(kwargs['instance'].id, kwargs['instance']), type="CREATE", severity="DEBUG")
     else:
-        Event.objects.create(message="[RawFinding] Raw finding '{}' modified (id={})".format(kwargs['instance'], kwargs['instance'].id),
-                             type="UPDATE", severity="DEBUG")
+        Event.objects.create(message="[RawFinding] Raw finding '{}' modified (id={})".format(kwargs['instance'], kwargs['instance'].id), type="UPDATE", severity="DEBUG")
 
 
 @receiver(post_delete, sender=RawFinding)
@@ -275,6 +273,14 @@ def save(self, apply_overrides=False, *args, **kwargs):
             self.updated_at = timezone.now()
         return super(Finding, self).save(*args, **kwargs)
 
+    def evaluate_assets(self):
+        """Create assets by analysing results."""
+        # print("evaluate_assets", settings.ASSET_DETECTION_RULES)
+        new_assets = []
+        rules = settings.ASSET_DETECTION_RULES
+        for rule in rules:
+            print(rule)
+        return new_assets
 
     def evaluate_alert_rules(self, trigger='all'):
         if trigger == "all":
diff --git a/scans/models.py b/scans/models.py
index 9c0a106..ac5a2da 100644
--- a/scans/models.py
+++ b/scans/models.py
@@ -29,14 +29,6 @@
     ('periodic', 'periodic'),
     ('scheduled', 'scheduled'),
 )
-#
-# SCAN_STATUS = (
-#     ('created', 'Created'),
-#     ('enqueued', 'Enqueued'),
-#     ('started', 'Started'),
-#     ('finished', 'Finished'),
-#     ('error', 'Error'),
-# )
 
 SCAN_JOB_STATUS = (
     ('started', 'Started'),