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

chg: [module] Allow module settings to be dict with setting description

pull/6483/head
Jakub Onderka 2020-10-22 13:03:53 +02:00
parent 150600e4af
commit 0ff3e0602c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Model/Module.php
View File

@ -264,6 +264,10 @@ class Module extends AppModel
}
}
/**
* @param string $moduleFamily
* @return array
*/
public function getModuleSettings($moduleFamily = 'Enrichment')
{
$modules = $this->getModules($moduleFamily);
@ -271,13 +275,20 @@ class Module extends AppModel
if (!empty($modules['modules'])) {
foreach ($modules['modules'] as $module) {
if (array_intersect($this->__validTypes[$moduleFamily], $module['meta']['module-type'])) {
$result[$module['name']][0] = array('name' => 'enabled', 'type' => 'boolean');
$result[$module['name']][1] = array('name' => 'restrict', 'type' => 'orgs');
$moduleSettings = [
array('name' => 'enabled', 'type' => 'boolean'),
array('name' => 'restrict', 'type' => 'orgs')
];
if (isset($module['meta']['config'])) {
foreach ($module['meta']['config'] as $conf) {
$result[$module['name']][] = array('name' => $conf, 'type' => 'string');
foreach ($module['meta']['config'] as $key => $value) {
if (is_string($key)) {
$moduleSettings[] = array('name' => $key, 'type' => 'string', 'description' => $value);
} else {
$moduleSettings[] = array('name' => $value, 'type' => 'string');
}
}
}
$result[$module['name']] = $moduleSettings;
}
}
}

2
app/Model/Server.php
View File

@ -3256,7 +3256,7 @@ class Server extends AppModel
} else {
$setting['test'] = 'testForEmpty';
$setting['type'] = 'string';
$setting['description'] = __('Set this required module specific setting.');
$setting['description'] = isset($result['description']) ? $result['description'] : __('Set this required module specific setting.');
$setting['value'] = '';
}
$serverSettings['Plugin'][$moduleType . '_' . $module . '_' . $result['name']] = $setting;