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

fix: [taxii push]

pull/9140/head
iglocska 2023-06-06 11:12:38 +02:00
parent 73fe63bb0e
commit c2ca52e83b
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Command/ServerShell.php
View File

@ -807,7 +807,7 @@ class ServerShell extends AppShell
}
$this->Job->read(null, $jobId);
$result = $this->TaxiiServer->push($serverId, $technique, $jobId, $HttpSocket, $user);
$result = $this->TaxiiServer->push($serverId, $user, $jobId);
if ($result !== true && !is_array($result)) {
$message = 'Job failed. Reason: ' . $result;

9
app/Model/TaxiiServer.php
View File

@ -17,6 +17,10 @@ class TaxiiServer extends AppModel
'Containable'
];
private $Job = null;
private $Event = null;
private $Allowedlist = null;
public function beforeValidate($options = array())
{
parent::beforeValidate();
@ -53,12 +57,13 @@ class TaxiiServer extends AppModel
public function push($id, $user, $jobId = null)
{
$this->Event = ClassRegistry::init('Event');
$this->Job = ClassRegistry::init('Job');
$taxii_server = $this->find('first', [
'recursive' => -1,
'conditions' => ['TaxiiServer.id' => $id]
]);
$filters = $this->__setPushFilters($taxii_server);
$elementCounter = 0;
$eventid = $this->Event->filterEventIds($user, $filters, $elementCounter);
$eventCount = count($eventid);
@ -93,6 +98,7 @@ class TaxiiServer extends AppModel
$result = $this->Allowedlist->removeAllowedlistedFromArray($result, false);
$temporaryFolder = $this->temporaryFolder();
$temporaryFolderPath = $temporaryFolder['dir']->path;
$this->Job->id = $jobId;
foreach ($result as $event) {
$temporaryFile = $this->temporaryFile($temporaryFolderPath);
$temporaryFile->write(json_encode($event));
@ -153,6 +159,7 @@ class TaxiiServer extends AppModel
if (!empty($options['TaxiiServer']['api_key'])) {
$request['header']['Authorization'] = 'basic ' . $options['TaxiiServer']['api_key'];
}
file_put_contents('/var/www/MISP2/app/tmp/fuck.txt', $request['header']['Authorization']);
try {
if (!empty($options['type']) && $options['type'] === 'post') {
$response = $HttpSocket->post($url, json_encode($options['body']), $request);