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

Merge branch '2.4' into develop

pull/8205/head
Alexandre Dulaunoy 2022-05-30 07:51:08 +02:00
parent 573c1cdfa6 8a34032478
commit 21b4348f3b
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,8 +970,8 @@
{
"Feed": {
"name": "URLHaus Malware URLs",
"provider": "Abuse.ch",
"url": "https://urlhaus.abuse.ch/downloads/csv/",
"provider": "abuse.ch",
"url": "https://urlhaus.abuse.ch/downloads/csv_recent/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": true,
"distribution": "3",
@ -1471,7 +1471,7 @@
"Feed": {
"name": "Malware Bazaar",
"provider": "abuse.ch",
"url": "https://bazaar.abuse.ch/export/txt/md5/full/",
"url": "https://bazaar.abuse.ch/export/txt/md5/recent/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]},\"url_params\":\"\"}",
"enabled": false,
"distribution": "0",
@ -1522,7 +1522,7 @@
{
"Feed": {
"name": "Threatfox",
"provider": "Abuse.ch",
"provider": "abuse.ch",
"url": "https://threatfox.abuse.ch/downloads/misp/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]},\"url_params\":\"\"}",
"enabled": true,
@ -1551,7 +1551,7 @@
{
"Feed": {
"name": "MalwareBazaar",
"provider": "Abuse.ch",
"provider": "abuse.ch",
"url": "https://bazaar.abuse.ch/downloads/misp/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": false,
@ -1571,7 +1571,7 @@
{
"Feed": {
"name": "URLhaus",
"provider": "Abuse.ch",
"provider": "abuse.ch",
"url": "https://urlhaus.abuse.ch/downloads/misp/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": false,
@ -1674,5 +1674,34 @@
"exportable": true,
"hide_tag": false
}
}
},
{
"Feed": {
"name": "threatfox indicators of compromise",
"provider": "abuse.ch",
"url": "https://threatfox.abuse.ch/export/csv/recent/",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": false,
"distribution": "0",
"sharing_group_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": true,
"delta_merge": false,
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"caching_enabled": true,
"force_to_ids": false
},
"Tag": {
"name": "osint:source-type=\"block-or-filter-list\"",
"colour": "#004f89",
"exportable": true,
"hide_tag": false
}
}
]

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit a922f29b46f975c076cb06428734bc5b33d07544
Subproject commit db9d79b093d77e09ba1dcec36cfefc00379bf73c