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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3725/head
iglocska 2018-09-19 07:26:14 +02:00
parent d43570932a b5463c167e
commit 32a171deb3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/files/feed-metadata/defaults.json
View File

@ -1295,7 +1295,7 @@
"id": "64",
"name": "This list contains all domains - A list for administrators to prevent mining in networks",
"provider": "CoinBlockerLists",
"url": "https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/list.txt",
"url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list.txt?inline=false",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": true,
"distribution": "3",
@ -1320,7 +1320,7 @@
"id": "65",
"name": "This list contains all optional domains - An additional list for administrators",
"provider": "CoinBlockerLists",
"url": "https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/list_optional.txt",
"url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list_optional.txt?inline=false",
"rules": "",
"enabled": true,
"distribution": "3",
@ -1345,7 +1345,7 @@
"id": "66",
"name": "This list contains all browser mining domains - A list to prevent browser mining only",
"provider": "CoinBlockerLists",
"url": "https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/list_browser.txt",
"url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list_browser.txt?inline=false",
"rules": "",
"enabled": true,
"distribution": "3",
@ -1370,7 +1370,7 @@
"id": "68",
"name": "This list contains all IPs - A additional list for administrators to prevent mining in networks",
"provider": "CoinBlockerLists",
"url": "https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/MiningServerIPList.txt",
"url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/MiningServerIPList.txt?inline=false",
"rules": "",
"enabled": true,
"distribution": "3",

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit ad445cb233ad73169dde6af696747aa7d398ce3a
Subproject commit 6105522453dec9a86adce2c1ba08530aca9b9f09

6
app/files/scripts/stix2/misp2stix2.py
View File

@ -245,7 +245,7 @@ class StixBuilder():
self.objects_to_parse[misp_object.name][misp_object.uuid] = to_ids, misp_object
def resolve_objects2parse(self):
for uuid, misp_object in self.objects2parse['file'].items():
for uuid, misp_object in self.objects_to_parse['file'].items():
to_ids_file, file_object = misp_object
file_id = "file--{}".format(file_object.uuid)
to_ids_list = [to_ids_file]
@ -254,12 +254,12 @@ class StixBuilder():
if reference.relationship_type == "included-in" and reference.Object['name'] == "pe":
pe_uuid = reference.referenced_uuid
break
to_ids_pe, pe_object = self.objects2parse['pe'][pe_uuid]
to_ids_pe, pe_object = self.objects_to_parse['pe'][pe_uuid]
to_ids_list.append(to_ids_pe)
sections = []
for reference in pe_object.references:
if reference.Object['name'] == "pe-section":
to_ids_section, section_object = self.objects2parse['pe-section'][reference.referenced_uuid]
to_ids_section, section_object = self.objects_to_parse['pe-section'][reference.referenced_uuid]
to_ids_list.append(to_ids_section)
sections.append(section_object)
if True in to_ids_list: