MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Simplification for code complexity reqs.

pull/5835/head
kscheetz 2020-04-28 10:09:25 -04:00
parent 9fcc9f91bb
commit 631800b80e
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 0faa75824f4dbac2b14919bb17e9d0fef79026d7
Subproject commit 64d7c9a24ad9d3a7ccc1b96fb643c235d2b9e02e

2
app/Lib/cakephp

@ -1 +1 @@
Subproject commit 5ccb12354dfc08ca1b3e0a430e8668bf1610b5d3
Subproject commit d2e1681eb8ec75e6c2819fa113834843fed6995a

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit c7104e8819d6b789b24a45655aa28625a8c4c346
Subproject commit e37f320df5a6ba4d9c67662a3670b160e9941bcf

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 3b5451c32518da3e29c575e868d245f27c18dcf4
Subproject commit 7ef9a2ba56efc6553a720d6df27c9ee547e24242

8
app/files/scripts/stix2/stix2misp.py
View File

@ -128,6 +128,10 @@ class StixParser():
except PyMISPInvalidFormat:
continue
@property
def basename(self):
return os.path.basename(self.filename)
def build_from_STIX_with_report(self):
report_attributes = defaultdict(set)
report_attributes['name'] = None
@ -162,9 +166,7 @@ class StixParser():
self.misp_event.publish_timestamp = self.getTimestampfromDate(report_attributes['published'].pop())
if report_attributes['name'] is None:
self.misp_event.info = "Imported with MISP import script for {} from {}.".format(self.stix_version,
os.path.basename(
self.filename))
self.misp_event.info = "Imported with MISP import script for {} from {}.".format(self.stix_version, self.basename)
else:
self.misp_event.info = report_attributes['name']

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit 8c4e2a8e8b4d3ec287c43dcae129123fcde8cb2f
Subproject commit 0edcb08fa618f15b51a2bbf0eae6b89c5f603ded

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 28687d90d575332776480cd5d683361e7485033c
Subproject commit 192d112728f3cab83570a0ad4f6f296e073cf738

2
cti-python-stix2

@ -1 +1 @@
Subproject commit e4f08557ec93c589a71a6e4060134661f1c4b2c0
Subproject commit 77ca5ae2f9742652cd90a53f1b83308a8343f2cc