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 chrisr3d_patch

pull/3725/head
chrisr3d 2018-09-11 15:24:23 +02:00
parent 02fe24b8fd 60110a597c
commit d7d1002279
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/Module.php
View File

@ -215,7 +215,6 @@ class Module extends AppModel
);
if ($moduleFamily == 'Cortex') {
if (!empty(Configure::read('Plugin.' . $moduleFamily . '_authkey'))) {
unset($request['header']['Content-Type']);
$request['header']['Authorization'] = 'Bearer ' . Configure::read('Plugin.' . $moduleFamily . '_authkey');
}
}
@ -223,7 +222,10 @@ class Module extends AppModel
if ($post) {
$response = $httpSocket->post($url . $uri, $post, $request);
} else {
$response = $httpSocket->get($url . $uri, false, $request);
if ($moduleFamily == 'Cortex') {
unset($request['header']['Content-Type']);
}
$response = $httpSocket->get($url . $uri, false, $request);
}
return json_decode($response->body, true);
} catch (Exception $e) {