diff --git a/pymisp/__init__.py b/pymisp/__init__.py index 11c4916..09582f7 100644 --- a/pymisp/__init__.py +++ b/pymisp/__init__.py @@ -38,7 +38,6 @@ try: from .mispevent import MISPEvent, MISPAttribute, MISPObjectReference, MISPObjectAttribute, MISPObject, MISPUser, MISPOrganisation, MISPSighting, MISPLog, MISPShadowAttribute, MISPWarninglist, MISPTaxonomy, MISPNoticelist, MISPObjectTemplate, MISPSharingGroup, MISPRole, MISPServer, MISPFeed, MISPEventDelegation, MISPUserSetting, MISPInbox, MISPEventBlocklist, MISPOrganisationBlocklist, MISPEventReport # noqa from .tools import AbstractMISPObjectGenerator # noqa from .tools import Neo4j # noqa - from .tools import stix # noqa from .tools import openioc # noqa from .tools import ext_lookups # noqa from .tools import update_objects # noqa diff --git a/pymisp/tools/stix.py b/pymisp/tools/stix.py deleted file mode 100644 index 0c0f605..0000000 --- a/pymisp/tools/stix.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- - -try: - from misp_stix_converter.converters.buildMISPAttribute import buildEvent # type: ignore - from misp_stix_converter.converters import convert # type: ignore - from misp_stix_converter.converters.convert import MISPtoSTIX # type: ignore - has_misp_stix_converter = True -except ImportError: - has_misp_stix_converter = False - - -def load_stix(stix, distribution: int = 3, threat_level_id: int = 2, analysis: int = 0): - '''Returns a MISPEvent object from a STIX package''' - if not has_misp_stix_converter: - raise Exception('You need to install misp_stix_converter: pip install git+https://github.com/MISP/MISP-STIX-Converter.git') - stix = convert.load_stix(stix) - return buildEvent(stix, distribution=distribution, - threat_level_id=threat_level_id, analysis=analysis) - - -def make_stix_package(misp_event, to_json: bool = False, to_xml: bool = False): - '''Returns a STIXPackage from a MISPEvent. - - Optionally can return the package in json or xml. - - ''' - if not has_misp_stix_converter: - raise Exception('You need to install misp_stix_converter: pip install git+https://github.com/MISP/MISP-STIX-Converter.git') - package = MISPtoSTIX(misp_event) - if to_json: - return package.to_json() - elif to_xml: - return package.to_xml() - else: - return package