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

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

pull/8568/head
iglocska 2022-08-22 16:24:26 +02:00
parent 446835a000 e991d0c8da
commit 0d6d3cb980
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/Event.php
View File

@ -3343,16 +3343,16 @@ class Event extends AppModel
if (empty($this->eventBlockRule)) {
return true;
}
if (!empty($rules['tags'])) {
if (!is_array($rules['tags'])) {
$rules['tags'] = [$rules['tags']];
if (!empty($this->eventBlockRule['tags'])) {
if (!is_array($this->eventBlockRule['tags'])) {
$this->eventBlockRule['tags'] = [$this->eventBlockRule['tags']];
}
$eventTags = Hash::extract($event, 'Event.Tag.{n}.name');
if (empty($eventTags)) {
$eventTags = Hash::extract($event, 'Event.EventTag.{n}.Tag.name');
}
if (!empty($eventTags)) {
foreach ($rules['tags'] as $blockTag) {
foreach ($this->eventBlockRule['tags'] as $blockTag) {
if (in_array($blockTag, $eventTags)) {
return false;
}

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit bfda561f5f29a8cca573e22789fb58252ad36c93
Subproject commit cf4e5c8cf0f49074193f5103a833168aeb5e2ed7

2
app/files/warninglists

@ -1 +1 @@
Subproject commit fc5599114f92926838b519f322b81a061039fe0e
Subproject commit faee7c9dff59b61942f53aebee44ee0c59d8ca4f