mirror of https://github.com/MISP/PyMISP
Revert "chg: Remove legacy stix converter."
This reverts commit 94ce4a367b
.
- breaks misp-stix converter, reverting it for now, let's find a way to deprecate this without outright removing it
pull/770/head
parent
b4619780a4
commit
95f20939f2
|
@ -36,6 +36,7 @@ try:
|
||||||
MISPCorrelationExclusion)
|
MISPCorrelationExclusion)
|
||||||
from .tools import AbstractMISPObjectGenerator # noqa
|
from .tools import AbstractMISPObjectGenerator # noqa
|
||||||
from .tools import Neo4j # noqa
|
from .tools import Neo4j # noqa
|
||||||
|
from .tools import stix # noqa
|
||||||
from .tools import openioc # noqa
|
from .tools import openioc # noqa
|
||||||
from .tools import ext_lookups # noqa
|
from .tools import ext_lookups # noqa
|
||||||
from .tools import update_objects # noqa
|
from .tools import update_objects # noqa
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
# -*- 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
|
Loading…
Reference in New Issue