Skip to content

Commit ad3a427

Browse files
committed
Merge branch 'main' of github.com:MISP/misp-stix into dev
2 parents dfd7b70 + 411b815 commit ad3a427

File tree

4 files changed

+433
-350
lines changed

4 files changed

+433
-350
lines changed

misp_stix_converter/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '2025.8.13'
1+
__version__ = '2025.10.21'
22

33
import argparse
44
from .misp_stix_mapping import Mapping # noqa
@@ -10,7 +10,7 @@
1010
from .misp2stix import stix20_framing, stix21_framing # noqa
1111
# Helpers
1212
from .misp_stix_converter import ( # noqa
13-
_is_stix1_from_misp, _is_stix2_from_misp,
13+
_get_stix2_parser, _is_stix1_from_misp, _is_stix2_from_misp,
1414
misp_attribute_collection_to_stix1, misp_collection_to_stix2,
1515
misp_event_collection_to_stix1, misp_to_stix1, misp_to_stix2,
1616
stix_1_to_misp, stix_2_to_misp, stix2_to_misp_instance)

misp_stix_converter/stix2misp/converters/stix2_indicator_converter.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -928,19 +928,8 @@ def _parse_sigma_pattern(self, indicator: _INDICATOR_TYPING):
928928
)
929929
else:
930930
misp_object = self._create_misp_object('sigma', indicator)
931-
if hasattr(indicator, 'object_marking_refs'):
932-
tags = tuple(
933-
self.main_parser._handle_tags_from_stix_fields(
934-
indicator
935-
)
936-
)
937-
for attribute in attributes:
938-
misp_attribute = misp_object.add_attribute(**attribute)
939-
for tag in tags:
940-
misp_attribute.add_tag(tag)
941-
else:
942-
for attribute in attributes:
943-
misp_object.add_attribute(**attribute)
931+
for attribute in attributes:
932+
misp_object.add_attribute(**attribute)
944933
self.main_parser._add_misp_object(misp_object, indicator)
945934
else:
946935
self.main_parser._add_misp_attribute(

0 commit comments

Comments
 (0)