[feature/OPT-684] to dev (#304)

* [OPT-684] OTM 0.2.0 - Multiple tz with type field * [OPT-684] Fixed indentation issue * [OPT-684] Fix tests after wrong merge. * [OPT-684] Fixed attack surface trust zone creation issue on tfplan --------- Co-authored-by: Daniel Font <dfont@iriusrisk.com> Co-authored-by: PacoCid <117292868+PacoCid@users.noreply.github.com>
iriusrisk · Sep 28, 2023 · 5cec4d7 · 5cec4d7
1 parent b7590cc
commit 5cec4d7
Show file tree

Hide file tree

Showing 94 changed files with 1,033 additions and 1,323 deletions.
diff --git a/otm/otm/entity/otm.py b/otm/otm/entity/otm.py
@@ -1,9 +1,9 @@
 from typing import List
 
-from otm.otm.entity.component import Component
-from otm.otm.entity.dataflow import Dataflow
-from otm.otm.entity.representation import Representation, DiagramRepresentation, RepresentationType
-from otm.otm.entity.trustzone import Trustzone
+from .component import Component
+from .dataflow import Dataflow
+from .representation import Representation, DiagramRepresentation, RepresentationType
+from .trustzone import Trustzone
 
 REPRESENTATIONS_SIZE_DEFAULT_HEIGHT = 1000
 REPRESENTATIONS_SIZE_DEFAULT_WIDTH = 1000
@@ -19,7 +19,7 @@ def __init__(self, project_name, project_id, provider):
         self.dataflows: List[Dataflow] = []
         self.threats = []
         self.mitigations = []
-        self.version = "0.1.0"
+        self.version = "0.2.0"
         self.__provider = provider
 
         self.add_default_representation()
@@ -71,13 +71,13 @@ def add_component(self, id, name, type, parent, parent_type, source=None,
                       attributes=None, tags=None):
         self.components.append(
             Component(component_id=id, name=name, component_type=type, parent=parent, parent_type=parent_type,
-                         source=source, attributes=attributes, tags=tags))
+                      source=source, attributes=attributes, tags=tags))
 
     def add_dataflow(self, id, name, source_node, destination_node, bidirectional=None,
                      source=None, attributes=None, tags=None):
         self.dataflows.append(Dataflow(dataflow_id=id, name=name, bidirectional=bidirectional, source_node=source_node,
-                                          destination_node=destination_node, source=source, attributes=attributes,
-                                          tags=tags))
+                                       destination_node=destination_node, source=source, attributes=attributes,
+                                       tags=tags))
 
     def add_representation(self, id_=None, name=None, type_=None):
         self.representations.append(Representation(id_=id_, name=name, type_=type_))
@@ -86,7 +86,7 @@ def add_diagram_representation(self, id_=None, name=None, type_=None, size=None)
         self.representations.append(DiagramRepresentation(id_=id_, name=name, type_=type_, size=size))
 
     def add_default_representation(self):
-        if not self.__provider.provider_type == RepresentationType.DIAGRAM:
+        if self.__provider.provider_type != RepresentationType.DIAGRAM:
             self.add_representation(id_=self.__provider.provider_name,
                                     name=self.__provider.provider_name,
                                     type_=self.__provider.provider_type)

diff --git a/otm/otm/entity/trustzone.py b/otm/otm/entity/trustzone.py
@@ -28,6 +28,7 @@ def json(self):
         json = {
             "id": self.id,
             "name": self.name,
+            "type": self.type,
             "risk": {
                 "trustRating": self.trustrating
             }

diff --git a/slp_base/slp_base/otm_processor.py b/slp_base/slp_base/otm_processor.py
@@ -4,7 +4,6 @@
 from otm.otm.otm_pruner import OTMPruner
 from slp_base.slp_base.mapping import MappingLoader, MappingValidator
 from slp_base.slp_base.otm_representations_pruner import OTMRepresentationsPruner
-from slp_base.slp_base.otm_trustzone_unifier import OTMTrustZoneUnifier
 from slp_base.slp_base.otm_validator import OTMValidator
 from slp_base.slp_base.provider_loader import ProviderLoader
 from slp_base.slp_base.provider_parser import ProviderParser
@@ -43,7 +42,6 @@ def process(self) -> OTM:
             self._clean_resources()
 
         OTMRepresentationsPruner(otm).prune()
-        OTMTrustZoneUnifier(otm).unify()
         OTMValidator().validate(otm.json())
 
         return otm

diff --git a/slp_base/slp_base/otm_trustzone_unifier.py b/slp_base/slp_base/otm_trustzone_unifier.py
diff --git a/slp_cft/tests/resources/otm/cft_components_with_trustzones_of_same_type.otm b/slp_cft/tests/resources/otm/cft_components_with_trustzones_of_same_type.otm
@@ -4,7 +4,7 @@
       "id": "public-cloud-01.customvpc",
       "name": "CustomVPC",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "public-cloud-01"
       },
       "tags": [
         "AWS::EC2::VPC"
@@ -15,7 +15,7 @@
       "id": "public-cloud-02.rdscluster",
       "name": "RDSCluster",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "public-cloud-02"
       },
       "tags": [
         "AWS::RDS::DBCluster"
@@ -24,7 +24,7 @@
     }
   ],
   "dataflows": [],
-  "otmVersion": "0.1.0",
+  "otmVersion": "0.2.0",
   "project": {
     "id": "id",
     "name": "name"
@@ -38,7 +38,16 @@
   ],
   "trustZones": [
     {
-      "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "id": "public-cloud-01",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "name": "Public Cloud",
+      "risk": {
+        "trustRating": 10
+      }
+    },
+    {
+      "id": "public-cloud-02",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
       "name": "Public Cloud",
       "risk": {
         "trustRating": 10

diff --git a/slp_cft/tests/resources/otm/cloudformation_minimal_content.otm b/slp_cft/tests/resources/otm/cloudformation_minimal_content.otm
@@ -1,5 +1,5 @@
 {
-  "otmVersion": "0.1.0",
+  "otmVersion": "0.2.0",
   "project": {
     "name": "name",
     "id": "id"
@@ -13,11 +13,20 @@
   ],
   "trustZones": [
     {
-      "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "id": "public-cloud-01",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
       "name": "Public Cloud 01",
       "risk": {
         "trustRating": 10
       }
+    },
+    {
+      "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "name": "Public Cloud 02",
+      "risk": {
+        "trustRating": 10
+      }
     }
   ],
   "components": [],

diff --git a/slp_cft/tests/resources/otm/expected_altsource_components.otm b/slp_cft/tests/resources/otm/expected_altsource_components.otm
@@ -1,5 +1,5 @@
 {
-  "otmVersion": "0.1.0",
+  "otmVersion": "0.2.0",
   "project": {
     "name": "name",
     "id": "id"
@@ -14,6 +14,7 @@
   "trustZones": [
     {
       "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
       "name": "Public Cloud",
       "risk": {
         "trustRating": 10

diff --git a/slp_cft/tests/resources/otm/expected_orphan_component_is_not_mapped.otm b/slp_cft/tests/resources/otm/expected_orphan_component_is_not_mapped.otm
@@ -1,5 +1,5 @@
 {
-  "otmVersion": "0.1.0",
+  "otmVersion": "0.2.0",
   "project": {
     "name": "name",
     "id": "id"
@@ -14,6 +14,7 @@
   "trustZones": [
     {
       "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
       "name": "Public Cloud",
       "risk": {
         "trustRating": 10

diff --git a/slp_cft/tests/resources/otm/minimal_otm_expected_result.otm b/slp_cft/tests/resources/otm/minimal_otm_expected_result.otm
@@ -1,5 +1,5 @@
 {
-    "otmVersion": "0.1.0",
+    "otmVersion": "0.2.0",
     "project": {
         "name": "name",
         "id": "id"

diff --git a/slp_cft/tests/resources/otm/otm_expected_result.otm b/slp_cft/tests/resources/otm/otm_expected_result.otm
@@ -1,5 +1,5 @@
 {
-    "otmVersion": "0.1.0",
+    "otmVersion": "0.2.0",
     "project": {
         "name": "multiple-files",
         "id": "multiple-files"
@@ -14,13 +14,15 @@
     "trustZones": [
         {
             "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+            "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
             "name": "Public Cloud",
             "risk": {
                 "trustRating": 10
             }
         },
         {
             "id": "f0ba7722-39b6-4c81-8290-a30a248bb8d9",
+            "type": "f0ba7722-39b6-4c81-8290-a30a248bb8d9",
             "name": "Internet",
             "risk": {
                 "trustRating": 10

diff --git a/slp_cft/tests/resources/otm/otm_with_only_default_trustzone_expected_result.otm b/slp_cft/tests/resources/otm/otm_with_only_default_trustzone_expected_result.otm
@@ -1,5 +1,5 @@
 {
-    "otmVersion": "0.1.0",
+    "otmVersion": "0.2.0",
     "project": {
         "name": "name",
         "id": "id"
@@ -14,6 +14,7 @@
     "trustZones": [
         {
             "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+            "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
             "name": "Public Cloud",
             "risk": {
                 "trustRating": 10

diff --git a/slp_mtmt/tests/resources/mtmt/MTMT_example_coordinates.otm b/slp_mtmt/tests/resources/mtmt/MTMT_example_coordinates.otm
@@ -1,5 +1,5 @@
 {
-  "otmVersion": "0.1.0",
+  "otmVersion": "0.2.0",
   "project": {
     "name": "Example Project",
     "id": "example-project"
@@ -22,7 +22,8 @@
   ],
   "trustZones": [
     {
-      "id": "6376d53e-6461-412b-8e04-7b3fe2b397de",
+      "id": "13ffd9d9-53ea-4b63-afab-07b730697ddd",
+      "type": "6376d53e-6461-412b-8e04-7b3fe2b397de",
       "name": "Internet",
       "risk": {
         "trustRating": 10
@@ -48,7 +49,8 @@
       ]
     },
     {
-      "id": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
+      "id": "acafa4b0-f94d-4077-8a42-74b959bd0796",
+      "type": "b61d6911-338d-46a8-9f39-8dcd24abfe91",
       "name": "Cloud",
       "risk": {
         "trustRating": 10
@@ -80,7 +82,7 @@
       "name": "Accounting PostgreSQL",
       "type": "CD-MICROSOFT-AZURE-DB-POSTGRESQL",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "acafa4b0-f94d-4077-8a42-74b959bd0796"
       },
       "attributes": {
         "Name": "Accounting PostgreSQL",
@@ -141,7 +143,7 @@
       "name": "Android",
       "type": "android-device-client",
       "parent": {
-        "trustZone": "6376d53e-6461-412b-8e04-7b3fe2b397de"
+        "trustZone": "13ffd9d9-53ea-4b63-afab-07b730697ddd"
       },
       "attributes": {
         "Name": "Android",
@@ -191,7 +193,7 @@
       "name": "Public API v2",
       "type": "web-service",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "acafa4b0-f94d-4077-8a42-74b959bd0796"
       },
       "attributes": {
         "Name": "Public API v2",
@@ -883,7 +885,7 @@
       "name": "Azure File Storage",
       "type": "azure-storage",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "acafa4b0-f94d-4077-8a42-74b959bd0796"
       },
       "attributes": {
         "Name": "Azure File Storage",
@@ -986,7 +988,7 @@
       "name": "iOS",
       "type": "ios-device-client",
       "parent": {
-        "trustZone": "6376d53e-6461-412b-8e04-7b3fe2b397de"
+        "trustZone": "13ffd9d9-53ea-4b63-afab-07b730697ddd"
       },
       "attributes": {
         "Name": "iOS",
@@ -1036,7 +1038,7 @@
       "name": "Browser",
       "type": "web-ui",
       "parent": {
-        "trustZone": "6376d53e-6461-412b-8e04-7b3fe2b397de"
+        "trustZone": "13ffd9d9-53ea-4b63-afab-07b730697ddd"
       },
       "attributes": {
         "Name": "Browser",
@@ -1085,7 +1087,7 @@
       "name": "Web API",
       "type": "web-service",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "acafa4b0-f94d-4077-8a42-74b959bd0796"
       },
       "attributes": {
         "Name": "Web API",
@@ -1277,7 +1279,7 @@
       "name": "Azure Storage",
       "type": "azure-storage",
       "parent": {
-        "trustZone": "b61d6911-338d-46a8-9f39-8dcd24abfe91"
+        "trustZone": "acafa4b0-f94d-4077-8a42-74b959bd0796"
       },
       "attributes": {
         "Name": "Azure Storage",