refactor(security): type firewall policy events

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

core/lib/Service/FirewallRuleManager.php

@@ -11,9 +11,11 @@ use KTXC\Security\Event\FirewallRuleEnabledEvent;
 use KTXC\Security\Event\FirewallRuleEvent;
 use KTXC\Security\Event\FirewallRuleExtendedEvent;
 use KTXC\Security\Event\FirewallRuleRemovedEvent;
+use KTXC\Security\Event\DeviceBlockedEvent;
+use KTXC\Security\Event\IpAllowedEvent;
+use KTXC\Security\Event\IpBlockedEvent;
 use KTXC\Stores\FirewallStore;
 use KTXF\Event\EventDispatcherInterface;
-use KTXC\Security\Event\SecurityEvent;
 use KTXF\IpUtils;
 
 final class FirewallRuleManager
@@ -192,7 +194,7 @@ final class FirewallRuleManager
             $origin,
             $metadata
         );
-        $this->publishIpEvent(SecurityEvent::IP_BLOCKED, $scope, $ipAddress, $reason);
+        $this->events->dispatch(new IpBlockedEvent($ipAddress, $reason, $scope->tenantId));
 
         return $rule;
     }
@@ -215,7 +217,7 @@ final class FirewallRuleManager
             null,
             $origin
         );
-        $this->publishIpEvent(SecurityEvent::IP_ALLOWED, $scope, $ipAddress, $reason);
+        $this->events->dispatch(new IpAllowedEvent($ipAddress, $reason, $scope->tenantId));
 
         return $rule;
     }
@@ -260,13 +262,7 @@ final class FirewallRuleManager
             $origin
         );
 
-        $event = new SecurityEvent(
-            SecurityEvent::DEVICE_BLOCKED,
-            ['device' => $fingerprint, 'reason' => $reason],
-            tenantId: $scope->tenantId,
-            deviceFingerprint: $fingerprint,
-            reason: $reason,
-        );
+        $event = new DeviceBlockedEvent($fingerprint, $reason, $scope->tenantId);
         $this->events->dispatch($event);
 
         return $rule;
@@ -505,22 +501,6 @@ final class FirewallRuleManager
         return $rule && $scope->owns($rule) ? $rule : null;
     }
 
-    private function publishIpEvent(
-        string $name,
-        FirewallRuleScope $scope,
-        string $ipAddress,
-        ?string $reason
-    ): void {
-        $event = new SecurityEvent(
-            $name,
-            ['ip' => $ipAddress, 'reason' => $reason],
-            tenantId: $scope->tenantId,
-            ipAddress: $ipAddress,
-            reason: $reason,
-        );
-        $this->events->dispatch($event);
-    }
-
     /**
      * @param class-string<FirewallRuleEvent> $eventClass
      */

core/lib/Service/FirewallService.php

@@ -19,6 +19,7 @@ use KTXC\Security\Event\FirewallRuleDisabledEvent;
 use KTXC\Security\Event\FirewallRuleEnabledEvent;
 use KTXC\Security\Event\FirewallRuleExtendedEvent;
 use KTXC\Security\Event\FirewallRuleRemovedEvent;
+use KTXC\Security\Event\FirewallSettingsUpdatedEvent;
 use KTXC\Security\Event\RateLimitExceededEvent;
 use KTXC\Security\Event\SuspiciousActivityEvent;
 use KTXC\Security\Event\SecurityEvent;
@@ -299,7 +300,7 @@ class FirewallService
             FirewallRuleEnabledEvent::class => FirewallLogObject::EVENT_RULE_ENABLED,
             FirewallRuleDisabledEvent::class => FirewallLogObject::EVENT_RULE_DISABLED,
             FirewallRuleRemovedEvent::class => FirewallLogObject::EVENT_RULE_REMOVED,
-            SecurityEvent::FIREWALL_SETTINGS_UPDATED => FirewallLogObject::EVENT_SETTINGS_UPDATED,
+            FirewallSettingsUpdatedEvent::class => FirewallLogObject::EVENT_SETTINGS_UPDATED,
             default => FirewallLogObject::EVENT_ACCESS_CHECK,
         };
     }
@@ -317,7 +318,7 @@ class FirewallService
             FirewallRuleEnabledEvent::class,
             FirewallRuleDisabledEvent::class,
             FirewallRuleRemovedEvent::class,
-            SecurityEvent::FIREWALL_SETTINGS_UPDATED => FirewallLogObject::RESULT_RECORDED,
+            FirewallSettingsUpdatedEvent::class => FirewallLogObject::RESULT_RECORDED,
             default => FirewallLogObject::RESULT_BLOCKED,
         };
     }

core/lib/Service/FirewallSettingsService.php

@@ -6,7 +6,7 @@ namespace KTXC\Service;
 
 use KTXC\Models\Tenant\TenantConfiguration;
 use KTXF\Event\EventDispatcherInterface;
-use KTXC\Security\Event\SecurityEvent;
+use KTXC\Security\Event\FirewallSettingsUpdatedEvent;
 
 final class FirewallSettingsService
 {
@@ -52,16 +52,13 @@ final class FirewallSettingsService
         $tenant->setConfiguration($configuration);
         $this->tenants->deposit($tenant);
 
-        $event = new SecurityEvent(
-            SecurityEvent::FIREWALL_SETTINGS_UPDATED,
-            [
-                'changeReason' => $reason,
-                'changeOrigin' => FirewallRuleManager::ORIGIN_MANUAL,
-                'previous' => $previous,
-                'current' => $current,
-            ],
+        $event = new FirewallSettingsUpdatedEvent(
+            changeReason: $reason,
+            previous: $previous,
+            current: $current,
             tenantId: $tenantId,
-            identityId: $actorId,
+            actorId: $actorId,
+            changeOrigin: FirewallRuleManager::ORIGIN_MANUAL,
         );
         $this->events->dispatch($event);