txt2stix 1.1.0__tar.gz → 1.1.2__tar.gz

{txt2stix-1.1.0 → txt2stix-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2stix
-Version: 1.1.0
+Version: 1.1.2
 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.1.0 → txt2stix-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txt2stix"
-version = "1.1.0"
+version = "1.1.2"
 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.1.0 → txt2stix-1.1.2}/tests/src/test_bundler.py

@@ -80,15 +80,13 @@ def test_constructor(tlp_level, identity, created, modified):
         BankCard(number="1234567891011"),
     ],
 )
-def test_add_ref(obj):
-    bundler = utils.dummy_bundler()
+def test_add_ref(bundler, obj):
     bundler.add_ref(obj)
     assert obj in bundler.bundle.objects
     assert obj.id in bundler.added_objects
 
 
-def test_add_indicator():
-    bundler = utils.dummy_bundler()
+def test_add_indicator(bundler):
     mocked_extractor = MagicMock()
     bundler.all_extractors = dict(placeholder_extractor=mocked_extractor)
     mocked_related_refs = MagicMock()
@@ -157,17 +155,7 @@ def test_add_indicator_raises_minor_exception():
         bundler.add_indicator(extracted, add_standard_relationship=False)
 
 
-
-def test_flow_objects():
-    bundler = txt2stixBundler(
-        name="FlowTest",
-        identity=None,
-        tlp_level="clear",
-        description="desc",
-        confidence=10,
-        extractors={},
-        labels=[]
-    )
+def test_flow_objects(bundler):
 
     obj = {"id": "indicator--123", "type": "indicator", "name": "x"}
     bundler.flow_objects = [obj, bundler.report]
@@ -177,19 +165,7 @@ def test_flow_objects():
     assert bundler.flow_objects == [obj, bundler.report]
 
 
-
-
-def test_add_standard_relationship():
-    bundler = txt2stixBundler(
-        name="Test",
-        identity=None,
-        tlp_level="amber",
-        description="desc",
-        confidence=30,
-        extractors={},
-        labels=[],
-        report_id="d9f3b306-e7fe-4074-b89a-33ce54280718"
-    )
+def test_add_standard_relationship(bundler):
 
     bundler.id_value_map["identity--6493ad42-ec4d-4260-b2e9-3f3a1110193c"] = "valA"
     bundler.id_value_map["phone-number--8764871f-6521-4401-bbf2-a17538435f49"] = "valB"
@@ -200,12 +176,13 @@ def test_add_standard_relationship():
 
     found = [obj for obj in bundler.bundle.objects if obj['id'] == "relationship--290e1319-7a95-5f51-b2c5-463f896cb35a"][0]
     assert found.description == "valA xx related to valB"
-    assert found.relationship_type == "xx-related-to"
+    assert found.relationship_type == "related-to" #renamed cause invalid
     assert found.source_ref == "identity--6493ad42-ec4d-4260-b2e9-3f3a1110193c"
     assert found.target_ref == "phone-number--8764871f-6521-4401-bbf2-a17538435f49"
 
-def test_add_ai_relationship():
-    bundler = txt2stixBundler(
+@pytest.fixture
+def bundler():
+    return txt2stixBundler(
         name="Test",
         identity=None,
         tlp_level="amber",
@@ -215,6 +192,8 @@ def test_add_ai_relationship():
         labels=[],
         report_id="d9f3b306-e7fe-4074-b89a-33ce54280718"
     )
+
+def test_add_ai_relationship(bundler):
     bundler.id_map['ex1'] = ["phone-number--8764871f-6521-4401-bbf2-a17538435f49", "indicator--401855b2-bd7a-444f-95b1-723efbdba33b"]
     bundler.id_map['ex2'] = ["identity--6493ad42-ec4d-4260-b2e9-3f3a1110193c"]
     bundler.id_value_map["identity--6493ad42-ec4d-4260-b2e9-3f3a1110193c"] = "valA"
@@ -226,25 +205,13 @@ def test_add_ai_relationship():
         mock_add_standard_relationship.assert_any_call("indicator--401855b2-bd7a-444f-95b1-723efbdba33b", "identity--6493ad42-ec4d-4260-b2e9-3f3a1110193c", "in-use-by")
 
 
-
-def test_add_summary():
-    bundler = txt2stixBundler(
-        name="Test",
-        identity=None,
-        tlp_level="amber",
-        description="desc",
-        confidence=30,
-        extractors={},
-        labels=['report-label1'],
-        report_id="d9f3b306-e7fe-4074-b89a-33ce54280718"
-    )
+def test_add_summary(bundler):
     summary = "This is a summary"
     bundler.add_summary(summary, "some-random-ai-provider")
     assert bundler.summary == summary
     assert dict(external_id="some-random-ai-provider", source_name='txt2stix_ai_summary', description=summary) in bundler.report.external_references
 
-    
-    
+
 def test_process_observables_and_process_relationships():
     extractor = MagicMock()
     extractor.stix_mapping = "domain-name"
@@ -311,3 +278,22 @@ def test_tlp_level_get_by_string():
     assert TLP_LEVEL.get("amber_strict") == TLP_LEVEL.AMBER_STRICT
     assert TLP_LEVEL.get("amber+strict") == TLP_LEVEL.AMBER_STRICT
     assert TLP_LEVEL.get("amber-strict") == TLP_LEVEL.AMBER_STRICT
+
+
+def test_relationship_types(bundler):
+    relationship = bundler.new_relationship(
+        "email-addr--b2e7528e-0693-57c1-8f2c-5cc679fb61fc",
+        "domain-name--8f17bb97-632c-57ca-8856-879a3fd651ce",
+        "sent-from",
+    )
+    assert (
+        relationship["relationship_type"] == "related-to"
+    ), "unsupported relationship type must be fallback to `related-to`"
+    relationship = bundler.new_relationship(
+        "domain-name--8f17bb97-632c-57ca-8856-879a3fd651ce",
+        "ipv4-addr--b2e7528e-0693-57c1-8f2c-5cc679fb61fc",
+        "resolves-to",
+    )
+    assert (
+        relationship["relationship_type"] == "resolves-to"
+    ), "relationship type is supported"

{txt2stix-1.1.0 → txt2stix-1.1.2}/txt2stix/bundler.py

@@ -384,11 +384,10 @@ class txt2stixBundler:
                 }
             ],
         )
-        try:
-            relationships_strict(relationship)
-        except Exception as e:
+        error = relationships_strict(relationship)
+        if error:
             relationship['relationship_type'] = 'related-to'
-            logger.debug(e)
+            logger.debug(error)
         return parse_stix(relationship, allow_custom=True)
 
     def to_json(self):