From ee196c1349fcbae46919060c1364b443a474f892 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 26 Apr 2024 08:32:39 +0200 Subject: [PATCH 1/2] fix: [user registration] pgp key not saved from the registration --- app/Controller/UsersController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php index 4baa2378e..be7e6495c 100644 --- a/app/Controller/UsersController.php +++ b/app/Controller/UsersController.php @@ -2603,6 +2603,7 @@ class UsersController extends AppController 'org_name', 'org_uuid', 'message', + 'pgp', 'custom_perms', 'perm_sync', 'perm_publish', From 14106b811ae3eeb0ffc794c4bf6758ded5664b34 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 26 Apr 2024 08:43:00 +0200 Subject: [PATCH 2/2] fix: [freetext] ip-src/ip-dst meta-type didn't have a valid category list --- app/Controller/EventsController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index 4e695ac67..aa0420dfc 100644 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -4160,7 +4160,13 @@ class EventsController extends AppController } } $this->Event->Attribute->fetchRelated($this->Auth->user(), $resultArray); - $typeCategoryMapping = array(); + $typeCategoryMapping = [ + 'ip-src/ip-dst' => [ + 'Network activity' => 'Network activity', + 'Payload delivery' => 'Payload delivery', + 'External analysis' => 'External analysis' + ], + ]; foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) { foreach ($cat['types'] as $type) { $typeCategoryMapping[$type][$k] = $k;