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

fix: [internal] Invalid export format detection now throws an exception instead of dying ungracefully

pull/3626/head
iglocska 2018-09-03 17:47:56 +02:00
parent 6850d7dff3
commit d335196a34
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controller/AttributesController.php
View File

@ -2129,6 +2129,10 @@ class AttributesController extends AppController
$params['conditions']['AND'][] = array('Object.deleted' => 1);
}
}
if (!isset($validFormats[$returnFormat])) {
// this is where the new code path for the export modules will go
throw new MethodNotFoundException('Invalid export format.');
}
App::uses($validFormats[$returnFormat][1], 'Export');
$exportTool = new $validFormats[$returnFormat][1]();
$exportToolParams = array(
@ -2140,8 +2144,7 @@ class AttributesController extends AppController
if (!empty($exportTool->additional_params)) {
$params = array_merge($params, $exportTool->additional_params);
}
$final = '';
$final .= $exportTool->header($exportToolParams);
$final = $exportTool->header($exportToolParams);
$continue = false;
if (empty($params['limit'])) {
$params['limit'] = 10000;