txt2stix 1.0.7__tar.gz → 1.0.8__tar.gz

{txt2stix-1.0.7 → txt2stix-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2stix
-Version: 1.0.7
+Version: 1.0.8
 Summary: txt2stix is a Python script that is designed to identify and extract IoCs and TTPs from text files, identify the relationships between them, convert them to STIX 2.1 objects, and output as a STIX 2.1 bundle.
 Project-URL: Homepage, https://github.com/muchdogesec/txt2stix
 Project-URL: Issues, https://github.com/muchdogesec/txt2stix/issues

{txt2stix-1.0.7 → txt2stix-1.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txt2stix"
-version = "1.0.7"
+version = "1.0.8"
 authors = [{ name = "dogesec" }]
 maintainers = [{ name = "dogesec" }]
 description = "txt2stix is a Python script that is designed to identify and extract IoCs and TTPs from text files, identify the relationships between them, convert them to STIX 2.1 objects, and output as a STIX 2.1 bundle."

{txt2stix-1.0.7 → txt2stix-1.0.8}/tests/src/test_attack_flow.py

@@ -142,7 +142,7 @@ def test_extract_attack_flow_and_navigator(dummy_objects, dummy_report):
         mock_extract_flow.assert_called_once_with(text, techniques)
 
         mock_create_navigator_layer.assert_called_once_with(
-            bundler.report, bundler.summary, mock_extract_flow.return_value, techniques
+            bundler.report, bundler.summary, mock_extract_flow.return_value, techniques, tactics
         )
 
         ### reset mocks
@@ -181,7 +181,7 @@ def test_extract_attack_flow_and_navigator(dummy_objects, dummy_report):
         mock_parse_flow.assert_not_called()
 
         mock_create_navigator_layer.assert_called_once_with(
-            bundler.report, bundler.summary, mock_extract_flow.return_value, techniques
+            bundler.report, bundler.summary, mock_extract_flow.return_value, techniques, tactics
         )
 
         ### reset mocks
@@ -265,11 +265,25 @@ def test_create_navigator_layer(dummy_report):
         "T2003": dict(id="T2003", domain="mobile-attack", possible_tactics=tactics_2),
     }
 
-    retval = create_navigator_layer(dummy_report, summary, flow, techniques)
+    retval = create_navigator_layer(
+        dummy_report,
+        summary,
+        flow,
+        techniques,
+        tactics={
+            "mobile-attack": {"version": "13.1"},
+            "ics-attack": {"version": "17.0"},
+            "enterprise-attack": {"version": "16.1"},
+        },
+    )
     assert len(retval) == 3
     assert retval == [
         {
-            "version": "4.5",
+            "versions": {
+                "layer": "4.5",
+                "attack": '16.1',
+                "navigator": "5.1.0",
+            },
             "name": "some markdown document",
             "domain": "enterprise-attack",
             "description": "this is a summary",
@@ -295,7 +309,11 @@ def test_create_navigator_layer(dummy_report):
             "layout": {"layout": "side"},
         },
         {
-            "version": "4.5",
+            "versions": {
+                "layer": "4.5",
+                "attack": '17.0',
+                "navigator": "5.1.0",
+            },
             "name": "some markdown document",
             "domain": "ics-attack",
             "description": "this is a summary",
@@ -321,7 +339,11 @@ def test_create_navigator_layer(dummy_report):
             "layout": {"layout": "side"},
         },
         {
-            "version": "4.5",
+            "versions": {
+                "layer": "4.5",
+                "attack": '13.1',
+                "navigator": "5.1.0",
+            },
             "name": "some markdown document",
             "domain": "mobile-attack",
             "description": "this is a summary",
@@ -352,12 +374,17 @@ def test_create_navigator_layer(dummy_report):
 def test_create_navigator_layer__real_flow(dummy_report, dummy_flow, dummy_objects):
     tactics = get_all_tactics()
     techniques = get_techniques_from_extracted_objects(dummy_objects, tactics)
-    retval = create_navigator_layer(dummy_report, "a summary", dummy_flow, techniques)
+    retval = create_navigator_layer(
+        dummy_report, "a summary", dummy_flow, techniques, tactics
+    )
     assert len(retval) == 2
-    print(retval)
     assert retval == [
         {
-            "version": "4.5",
+            "versions": {
+                "layer": "4.5",
+                "attack": tactics["ics-attack"]["version"],
+                "navigator": "5.1.0",
+            },
             "name": "some markdown document",
             "domain": "ics-attack",
             "description": "a summary",
@@ -398,7 +425,11 @@ def test_create_navigator_layer__real_flow(dummy_report, dummy_flow, dummy_objec
             "layout": {"layout": "side"},
         },
         {
-            "version": "4.5",
+            "versions": {
+                "layer": "4.5",
+                "attack": tactics["enterprise-attack"]["version"],
+                "navigator": "5.1.0",
+            },
             "name": "some markdown document",
             "domain": "enterprise-attack",
             "description": "a summary",

{txt2stix-1.0.7 → txt2stix-1.0.8}/txt2stix/attack_flow.py

@@ -147,7 +147,7 @@ def get_techniques_from_extracted_objects(objects: dict, tactics: dict):
     return techniques
 
 
-def create_navigator_layer(report, summary, flow: AttackFlowList, techniques):
+def create_navigator_layer(report, summary, flow: AttackFlowList, techniques, tactics):
     domains = {}
     comments = {item.attack_technique_id: item.description for item in flow.items}
     for technique in techniques.values():
@@ -170,7 +170,11 @@ def create_navigator_layer(report, summary, flow: AttackFlowList, techniques):
     for domain, domain_techniques in domains.items():
         retval.append(
             {
-                "version": "4.5",
+                "versions": {
+                    "layer": "4.5",
+                    "attack": tactics[domain]['version'],
+                    "navigator": "5.1.0"
+                },
                 "name": report.name,
                 "domain": domain,
                 "description": summary,
@@ -220,6 +224,6 @@ def extract_attack_flow_and_navigator(
 
     if ai_create_attack_navigator_layer:
         navigator = create_navigator_layer(
-            bundler.report, bundler.summary, flow, techniques
+            bundler.report, bundler.summary, flow, techniques, tactics
         )
     return flow, navigator

{txt2stix-1.0.7 → txt2stix-1.0.8}/txt2stix/retriever.py

@@ -28,8 +28,9 @@ class STIXObjectRetriever:
     
     def get_attack_tactics(self, matrix):
         endpoint = urljoin(self.api_root, f"v1/attack-{matrix}/objects/?attack_type=Tactic")
+        version_url = urljoin(self.api_root, f'v1/attack-{matrix}/versions/installed/')
         tactics = self._retrieve_objects(endpoint)
-        retval = {}
+        retval = dict(version=self.session.get(version_url).json()['latest'])
         for tac in tactics:
             retval[tac['x_mitre_shortname']] = tac
             retval[tac['external_references'][0]['external_id']] = tac