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

Merge remote-tracking branch 'origin/2.4' into enforce-iso-datetime

pull/5564/head
mokaddem 2020-01-28 15:13:58 +01:00
parent b03d86221b f4a767c821
commit 81fb5be93a
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/User.php
View File

@ -1373,7 +1373,7 @@ class User extends AppModel
$updatedUser['User']['id'],
$updatedUser['User']['email']
),
$fieldsResult = 'authkey(' . $oldKey . ') => (' . $newkey . ')',
$fieldsResult = ['authkey' => [$oldKey, $newkey]],
$updatedUser
);
if ($alert) {

4
app/View/Helper/UserNameHelper.php
View File

@ -17,6 +17,10 @@ App::uses('AppHelper', 'View/Helper');
return '<i class="fas fa-smile-beam white"></i>&nbsp;';
} else if (strpos($lower_email, 'rand') !== false && (strpos($lower_email, 'ecrime') !== false)) {
return '<i class="fas fa-camera white"></i>&nbsp;';
} else if ($lower_email === 'christian.studer@circl.lu') {
return '<span class="bold white">Mr STIX</span> ';
} else if ($lower_email === 'sami.mokaddem@circl.lu') {
return '<span class="bold white">Graphman</span> ';
}
return '';
}

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

@ -1395,6 +1395,32 @@
"caching_enabled": true
}
},
{
"Feed": {
"id": "79",
"name": "malsilo.domain",
"provider": "MalSilo",
"url": "https://malsilo.gitlab.io/feeds/dumps/domain_list.txt",
"rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
"enabled": false,
"distribution": "3",
"sharing_group_id": "0",
"tag_id": "0",
"default": false,
"source_format": "csv",
"fixed_event": true,
"delta_merge": false,
"event_id": "0",
"publish": false,
"override_ids": false,
"settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
"input_source": "network",
"delete_local_file": false,
"lookup_visible": true,
"headers": "",
"caching_enabled": true
}
},
{
"Feed": {
"id": "87",