[misp] Align all connectors

hnhdev · Sep 15, 2024 · 9d26a16 · 9d26a16
1 parent a4c5214
commit 9d26a16
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 24 deletions.
diff --git a/external-import/flashpoint/src/mispfeed.py b/external-import/flashpoint/src/mispfeed.py
@@ -908,7 +908,15 @@ def _process_attribute(
             observable_resolver = resolved_attribute["resolver"]
             observable_type = resolved_attribute["type"]
             observable_value = resolved_attribute["value"]
-            name = resolved_attribute["value"]
+            name = (
+                resolved_attribute["value"]
+                if len(resolved_attribute["value"]) > 2
+                else (
+                    attribute["comment"]
+                    if len(attribute["comment"]) > 2
+                    else observable_type
+                )
+            )
             pattern_type = "stix"
             pattern = None
             # observable type is yara or sigma for instance
@@ -918,11 +926,7 @@ def _process_attribute(
                 name = (
                     attribute["comment"]
                     if len(attribute["comment"]) > 2
-                    else (
-                        observable_value
-                        if len(observable_value) > 2
-                        else observable_type
-                    )
+                    else observable_type
                 )
             # observable type is not in stix 2
             elif observable_resolver not in OPENCTISTIX2:

diff --git a/external-import/misp-feed/src/misp-feed.py b/external-import/misp-feed/src/misp-feed.py
@@ -1033,7 +1033,15 @@ def _process_attribute(
             observable_resolver = resolved_attribute["resolver"]
             observable_type = resolved_attribute["type"]
             observable_value = resolved_attribute["value"]
-            name = resolved_attribute["value"]
+            name = (
+                resolved_attribute["value"]
+                if len(resolved_attribute["value"]) > 2
+                else (
+                    attribute["comment"]
+                    if len(attribute["comment"]) > 2
+                    else observable_type
+                )
+            )
             pattern_type = "stix"
             pattern = None
             # observable type is yara or sigma for instance
@@ -1043,11 +1051,7 @@ def _process_attribute(
                 name = (
                     attribute["comment"]
                     if len(attribute["comment"]) > 2
-                    else (
-                        observable_value
-                        if len(observable_value) > 2
-                        else observable_type
-                    )
+                    else observable_type
                 )
             # observable type is not in stix 2
             elif observable_resolver not in OPENCTISTIX2:

diff --git a/external-import/misp/src/misp.py b/external-import/misp/src/misp.py
@@ -1088,7 +1088,15 @@ def process_attribute(
             observable_resolver = resolved_attribute["resolver"]
             observable_type = resolved_attribute["type"]
             observable_value = resolved_attribute["value"]
-            name = resolved_attribute["value"]
+            name = (
+                resolved_attribute["value"]
+                if len(resolved_attribute["value"]) > 2
+                else (
+                    attribute["comment"]
+                    if len(attribute["comment"]) > 2
+                    else observable_type
+                )
+            )
             pattern_type = "stix"
             pattern = None
             # observable type is yara or sigma for instance
@@ -1098,11 +1106,7 @@ def process_attribute(
                 name = (
                     attribute["comment"]
                     if len(attribute["comment"]) > 2
-                    else (
-                        observable_value
-                        if len(observable_value) > 2
-                        else observable_type
-                    )
+                    else observable_type
                 )
             # observable type is not in stix 2
             elif observable_resolver not in OPENCTISTIX2:

diff --git a/internal-import-file/import-file-misp/src/import-file-misp.py b/internal-import-file/import-file-misp/src/import-file-misp.py
@@ -963,7 +963,15 @@ def _process_attribute(
             observable_resolver = resolved_attribute["resolver"]
             observable_type = resolved_attribute["type"]
             observable_value = resolved_attribute["value"]
-            name = resolved_attribute["value"]
+            name = (
+                resolved_attribute["value"]
+                if len(resolved_attribute["value"]) > 2
+                else (
+                    attribute["comment"]
+                    if len(attribute["comment"]) > 2
+                    else observable_type
+                )
+            )
             pattern_type = "stix"
             pattern = None
             # observable type is yara or sigma for instance
@@ -973,11 +981,7 @@ def _process_attribute(
                 name = (
                     attribute["comment"]
                     if len(attribute["comment"]) > 2
-                    else (
-                        observable_value
-                        if len(observable_value) > 2
-                        else observable_type
-                    )
+                    else observable_type
                 )
             # observable type is not in stix 2
             elif observable_resolver not in OPENCTISTIX2: