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

Merge branch '2.4' into fix/import_empty_feed

pull/5253/head
Andras Iklody 2019-10-02 22:55:14 +02:00 committed by GitHub
parent 8415cea5db 20d5af2e30
commit 6bcd8b200c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/FeedsController.php
View File

@ -508,6 +508,9 @@ class FeedsController extends AppController
}
}
}
if (!isset($message)) {
$message = __('No feed enabled.');
}
if ($this->_isRest()) {
return $this->RestResponse->viewData(array('result' => $message), $this->response->type());
} else {

23
app/Model/Taxonomy.php
View File

@ -38,21 +38,24 @@ class Taxonomy extends AppModel
public function update()
{
$directories = glob(APP . 'files' . DS . 'taxonomies' . DS . '*', GLOB_ONLYDIR);
foreach ($directories as $k => $dir) {
$dir = str_replace(APP . 'files' . DS . 'taxonomies' . DS, '', $dir);
if ($dir === 'tools') {
unset($directories[$k]);
} else {
$directories[$k] = $dir;
}
}
$updated = array();
foreach ($directories as $dir) {
if (!file_exists(APP . 'files' . DS . 'taxonomies' . DS . $dir . DS . 'machinetag.json')) {
$dir = basename($dir);
if ($dir === 'tools') {
continue;
}
$file = new File(APP . 'files' . DS . 'taxonomies' . DS . $dir . DS . 'machinetag.json');
if (!$file->exists()) {
continue;
}
$vocab = json_decode($file->read(), true);
$file->close();
if ($vocab === null) {
$updated['fails'][] = array('namespace' => $dir, 'fail' => "File machinetag.json is not valid JSON.");
continue;
}
if (isset($vocab['type'])) {
if (is_array($vocab['type'])) {
if (!in_array('event', $vocab['type'])) {
@ -64,7 +67,7 @@ class Taxonomy extends AppModel
}
}
}
$file->close();
if (!isset($vocab['version'])) {
$vocab['version'] = 1;
}