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

Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0

pull/6120/head
mokaddem 2020-11-16 16:11:17 +01:00
parent 334b7cabe1 5a29fcc370
commit 9db29821b4
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 0d67babea2ba967f924978023159067aa88de2eb
Subproject commit c5f8c653c4300a616e472d11509e69f3cd0105be

2
app/Controller/AppController.php
View File

@ -587,7 +587,7 @@ class AppController extends Controller
public function afterFilter()
{
if ($this->isApiAuthed && $this->_isRest()) {
if ($this->isApiAuthed && $this->_isRest() && $this->Session->started()) {
$this->Session->destroy();
}
}

6
app/Controller/EventsController.php
View File

@ -109,8 +109,12 @@ class EventsController extends AppController
*/
private function __filterOnAttributeValue($value)
{
if (!is_array($value)) {
$pieces = explode('|', strtolower($value));
} else {
$pieces = $value;
}
// dissect the value
$pieces = explode('|', strtolower($value));
$include = array();
$exclude = array();

2
app/files/warninglists

@ -1 +1 @@
Subproject commit aa499f4059bd1c14205176a3434550e7fba75a8a
Subproject commit a80da878b911e3633d88e576323e8cfec7f83e13