Merge branch 'develop' of github.com:MISP/MISP into develop

pull/8568/head
Sami Mokaddem 2022-08-05 14:49:21 +02:00
commit ca02bf1c4e
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 3 additions and 1 deletions

View File

@ -4320,7 +4320,6 @@ class Event extends AppModel
$jobId
);
}
return $this->publish($id, $passAlong);
}
@ -4365,6 +4364,7 @@ class Event extends AppModel
'recursive' => -1,
'conditions' => array('Event.id' => $id)
));
if (empty($event)) {
return false;
}
@ -4413,6 +4413,7 @@ class Event extends AppModel
$success = $this->executeTrigger('event-publish', $fullEvent[0], $workflowErrors, $logging);
if (empty($success)) {
$errorMessage = implode(', ', $workflowErrors);
return $errorMessage;
}
}

View File

@ -1253,6 +1253,7 @@ class TestSecurity(unittest.TestCase):
# Publish
self.assertSuccessfulResponse(self.admin_misp_connector.publish(created_event))
sleep(6);
# Event is published, so normal user should see that event
self.assertTrue(logged_in.event_exists(created_event.uuid))