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/2962/head
iglocska 2018-02-15 16:38:52 +01:00
parent e463f41671 305650296b
commit dc4e30f3db
5 changed files with 276 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL/MYSQL.sql
View File

@ -380,7 +380,7 @@ CREATE TABLE IF NOT EXISTS `logs` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`title` text CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`created` datetime NOT NULL,
`model` varchar(20) COLLATE utf8_bin NOT NULL,
`model` varchar(80) COLLATE utf8_bin NOT NULL,
`model_id` int(11) NOT NULL,
`action` varchar(20) COLLATE utf8_bin NOT NULL,
`user_id` int(11) NOT NULL,

2
PyMISP

@ -1 +1 @@
Subproject commit 45d5f44e242ffdedaf3e1ac02711133911a20592
Subproject commit 9f453e98facfe4335fe64f14345cc3fe67f3dd30

7
app/Controller/ServersController.php
View File

@ -909,7 +909,6 @@ class ServersController extends AppController {
$validTypes = array('default', 'email', 'scheduler', 'cache', 'prio');
if (!in_array($type, $validTypes)) throw new MethodNotAllowedException('Invalid worker type.');
$prepend = '';
if (Configure::read('MISP.rh_shell_fix')) $prepend = 'export PATH=$PATH:"/opt/rh/rh-php56/root/usr/bin:/opt/rh/rh-php56/root/usr/sbin"; ';
if ($type != 'scheduler') shell_exec($prepend . APP . 'Console' . DS . 'cake CakeResque.CakeResque start --interval 5 --queue ' . $type .' > /dev/null 2>&1 &');
else shell_exec($prepend . APP . 'Console' . DS . 'cake CakeResque.CakeResque startscheduler -i 5 > /dev/null 2>&1 &');
$this->redirect('/servers/serverSettings/workers');
@ -1125,12 +1124,6 @@ class ServersController extends AppController {
if (!$this->_isSiteAdmin() || !$this->request->is('post')) throw new MethodNotAllowedException();
$this->Server->workerRemoveDead($this->Auth->user());
$prepend = '';
if (Configure::read('MISP.rh_shell_fix')) {
$prepend = 'export PATH=$PATH:"/opt/rh/rh-php56/root/usr/bin:/opt/rh/rh-php56/root/usr/sbin"; ';
if (Configure::read('MISP.rh_shell_fix_path')) {
if ($this->Server->testForPath(Configure::read('MISP.rh_shell_fix_path'))) $prepend = Configure::read('MISP.rh_shell_fix_path');
}
}
shell_exec($prepend . APP . 'Console' . DS . 'worker' . DS . 'start.sh > /dev/null 2>&1 &');
$this->redirect(array('controller' => 'servers', 'action' => 'serverSettings', 'workers'));
}

18
app/Model/Server.php
View File

@ -703,24 +703,6 @@ class Server extends AppModel {
'type' => 'numeric',
'null' => false,
),
'rh_shell_fix' => array(
'level' => 1,
'description' => 'If you are running CentOS or RHEL using SCL and are having issues with the Background workers not responding to start/stop/restarts via the worker interface, enable this setting. This will pre-pend the shell execution commands with the default path to rh-php56 (/opt/rh/rh-php56/root/usr/bin:/opt/rh/rh-php56/root/usr/sbin).',
'value' => false,
'errorMessage' => '',
'test' => 'testBool',
'type' => 'boolean',
'null' => true,
),
'rh_shell_fix_path' => array(
'level' => 1,
'description' => 'If you have rh_shell_fix enabled, the default PATH for rh-php56 is added (/opt/rh/rh-php56/root/usr/bin:/opt/rh/rh-php56/root/usr/sbin). If you prefer to use a different path, you can set it here.',
'value' => '/opt/rh/rh-php56/root/usr/bin:/opt/rh/rh-php56/root/usr/sbin',
'errorMessage' => '',
'test' => 'testForPath',
'type' => 'string',
'null' => true,
),
'tmpdir' => array(
'level' => 1,
'description' => 'Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process.',

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

@ -1181,179 +1181,279 @@
"lookup_visible": true
}
},
{
"Feed": {
"id": "55",
"name": "abuse.ch SSL IPBL",
"provider": "abuse.ch",
"url": "https:\/\/sslbl.abuse.ch\/blacklist\/sslipblacklist.csv",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750886"
}
},
{
"Feed": {
"id": "56",
"name": "abuse.ch Dyre SSL IPBL",
"provider": "abuse.ch",
"url": "https:\/\/sslbl.abuse.ch\/blacklist\/dyre_sslipblacklist.csv",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "57",
"name": "http:\/\/cybercrime-tracker.net",
"provider": "http:\/\/cybercrime-tracker.net hashlist",
"url": "http:\/\/cybercrime-tracker.net\/ccamlist.php",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "58",
"name": "http:\/\/cybercrime-tracker.net",
"provider": "http:\/\/cybercrime-tracker.net gatelist",
"url": "http:\/\/cybercrime-tracker.net\/ccamgate.php",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "59",
"name": "hpHosts - GRM only",
"provider": "hpHosts",
"url": "https:\/\/hosts-file.net\/grm.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750888"
}
},
{
"Feed": {
"id": "60",
"name": "blocklist.greensnow.co",
"provider": "greensnow.co",
"url": "https:\/\/blocklist.greensnow.co\/greensnow.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750889"
}
},
{
"Feed": {
"id": "61",
"name": "conficker all domains generated",
"provider": "cert.at",
"url": "http:\/\/www.cert.at\/static\/downloads\/data\/conficker\/all_domains.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750904"
}
{
"Feed": {
"id": "55",
"name": "abuse.ch SSL IPBL",
"provider": "abuse.ch",
"url": "https://sslbl.abuse.ch/blacklist/sslipblacklist.csv",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750886"
}
},
{
"Feed": {
"id": "56",
"name": "abuse.ch Dyre SSL IPBL",
"provider": "abuse.ch",
"url": "https://sslbl.abuse.ch/blacklist/dyre_sslipblacklist.csv",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "57",
"name": "http://cybercrime-tracker.net",
"provider": "http://cybercrime-tracker.net hashlist",
"url": "http://cybercrime-tracker.net/ccamlist.php",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "58",
"name": "http://cybercrime-tracker.net",
"provider": "http://cybercrime-tracker.net gatelist",
"url": "http://cybercrime-tracker.net/ccamgate.php",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750887"
}
},
{
"Feed": {
"id": "59",
"name": "hpHosts - GRM only",
"provider": "hpHosts",
"url": "https://hosts-file.net/grm.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750888"
}
},
{
"Feed": {
"id": "60",
"name": "blocklist.greensnow.co",
"provider": "greensnow.co",
"url": "https://blocklist.greensnow.co/greensnow.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750889"
}
},
{
"Feed": {
"id": "61",
"name": "conficker all domains generated",
"provider": "cert.at",
"url": "http://www.cert.at/static/downloads/data/conficker/all_domains.txt",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"cache_timestamp": "1514750904"
}
},
{
"Feed": {
"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",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"headers": ""
}
},
{
"Feed": {
"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",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"headers": ""
}
},
{
"Feed": {
"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",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"headers": ""
}
},
{
"Feed": {
"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",
"rules": "",
"enabled": true,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "freetext",
"fixed_event": false,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"headers": ""
}
}
]