Nodarx/server
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Projects Releases Activity

refactor(security): replace generic event with severity enum

Browse Source 
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
Sebastian Krupinski
2026-08-05 23:59:49 -04:00
parent 3f9c2500d9
commit 84eb0e2c21
27 changed files with 80 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/lib/Module/Module.php
-1
View File
@@ -23,7 +23,6 @@ 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;
use KTXF\Event\DeliveryMode;
use KTXF\Event\EventListenerRegistrarInterface;
use KTXF\Module\ModuleBrowserInterface;
core/lib/Security/Event/AccessDeniedEvent.php
+2 -2
View File
@@ -81,8 +81,8 @@ final class AccessDeniedEvent extends Event implements SecurityRequestEventInter
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_WARNING;
return SecurityEventSeverity::WARNING;
}
}
core/lib/Security/Event/AuthenticationFailedEvent.php
+2 -2
View File
@@ -32,8 +32,8 @@ final class AuthenticationFailedEvent extends Event implements SecurityEventInte
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_WARNING;
return SecurityEventSeverity::WARNING;
}
}
core/lib/Security/Event/AuthenticationSucceededEvent.php
+2 -2
View File
@@ -63,8 +63,8 @@ final class AuthenticationSucceededEvent extends Event implements SecurityReques
return null;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_INFO;
return SecurityEventSeverity::INFO;
}
}
core/lib/Security/Event/BruteForceDetectedEvent.php
+2 -2
View File
@@ -84,8 +84,8 @@ final class BruteForceDetectedEvent extends Event implements SecurityRequestEven
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_CRITICAL;
return SecurityEventSeverity::CRITICAL;
}
}
core/lib/Security/Event/DeviceBlockedEvent.php
+2 -2
View File
@@ -59,8 +59,8 @@ final class DeviceBlockedEvent extends Event implements SecurityRequestEventInte
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_CRITICAL;
return SecurityEventSeverity::CRITICAL;
}
}
core/lib/Security/Event/FirewallIpEvent.php
+2 -2
View File
@@ -8,7 +8,7 @@ use KTXF\Event\Event;
abstract class FirewallIpEvent extends Event implements SecurityRequestEventInterface
{
protected const SEVERITY = SecurityEvent::SEVERITY_INFO;
protected const SecurityEventSeverity SEVERITY = SecurityEventSeverity::INFO;
final public function __construct(
private readonly string $ipAddress,
@@ -61,7 +61,7 @@ abstract class FirewallIpEvent extends Event implements SecurityRequestEventInte
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return static::SEVERITY;
}
core/lib/Security/Event/FirewallRuleEvent.php
+2 -2
View File
@@ -151,8 +151,8 @@ abstract class FirewallRuleEvent extends Event implements SecurityEventInterface
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_INFO;
return SecurityEventSeverity::INFO;
}
}
core/lib/Security/Event/FirewallSettingsUpdatedEvent.php
+2 -2
View File
@@ -69,8 +69,8 @@ final class FirewallSettingsUpdatedEvent extends Event implements SecurityEventI
return $this->changeReason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_INFO;
return SecurityEventSeverity::INFO;
}
}
core/lib/Security/Event/IpBlockedEvent.php
+1 -1
View File
@@ -6,5 +6,5 @@ namespace KTXC\Security\Event;
final class IpBlockedEvent extends FirewallIpEvent
{
protected const SEVERITY = SecurityEvent::SEVERITY_CRITICAL;
protected const SecurityEventSeverity SEVERITY = SecurityEventSeverity::CRITICAL;
}
core/lib/Security/Event/RateLimitExceededEvent.php
+2 -2
View File
@@ -97,8 +97,8 @@ final class RateLimitExceededEvent extends Event implements SecurityRequestEvent
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_ERROR;
return SecurityEventSeverity::ERROR;
}
}
core/lib/Security/Event/SecurityEvent.php
-141
View File
@@ -1,141 +0,0 @@
<?php
declare(strict_types=1);
namespace KTXC\Security\Event;
use KTXF\Event\Event;
/**
* Security-specific event for authentication and access control events
*/
final class SecurityEvent extends Event implements SecurityRequestEventInterface
{
// Event names
public const AUTH_LOGOUT = 'security.auth.logout';
public const TOKEN_REFRESH = 'security.token.refresh';
public const TOKEN_REVOKED = 'security.token.revoked';
public const ACCESS_GRANTED = 'security.access.granted';
// Severity levels
public const SEVERITY_DEBUG = 0;
public const SEVERITY_INFO = 1;
public const SEVERITY_WARNING = 2;
public const SEVERITY_ERROR = 3;
public const SEVERITY_CRITICAL = 4;
private readonly int $severity;
public function __construct(
string $name,
array $data = [],
?string $tenantId = null,
?string $identityId = null,
private readonly ?string $ipAddress = null,
private readonly ?string $deviceFingerprint = null,
private readonly ?string $userAgent = null,
private readonly ?string $requestPath = null,
private readonly ?string $requestMethod = null,
private readonly ?string $userId = null,
private readonly ?string $reason = null,
?int $severity = null,
) {
parent::__construct($name, $data, $tenantId, $identityId);
$this->severity = $severity ?? self::getSeverityForEvent($name);
}
/**
* Create a security event with common parameters
*/
public static function create(
string $name,
?string $ipAddress = null,
?string $deviceFingerprint = null,
array $data = [],
?string $tenantId = null,
?string $identityId = null,
?string $userAgent = null,
?string $requestPath = null,
?string $requestMethod = null,
?string $userId = null,
?string $reason = null,
?int $severity = null,
): self {
return new self(
$name,
$data,
$tenantId,
$identityId,
$ipAddress,
$deviceFingerprint,
$userAgent,
$requestPath,
$requestMethod,
$userId,
$reason,
$severity,
);
}
/**
* Get default severity for event types
*/
private static function getSeverityForEvent(string $eventName): int
{
return match ($eventName) {
self::ACCESS_GRANTED,
self::TOKEN_REFRESH => self::SEVERITY_INFO,
self::AUTH_LOGOUT,
self::TOKEN_REVOKED => self::SEVERITY_WARNING,
default => self::SEVERITY_INFO,
};
}
// Getters and setters
public function getIpAddress(): ?string
{
return $this->ipAddress;
}
public function getDeviceFingerprint(): ?string
{
return $this->deviceFingerprint;
}
public function getUserAgent(): ?string
{
return $this->userAgent;
}
public function getRequestPath(): ?string
{
return $this->requestPath;
}
public function getRequestMethod(): ?string
{
return $this->requestMethod;
}
public function getUserId(): ?string
{
return $this->userId;
}
public function getReason(): ?string
{
return $this->reason;
}
public function getSeverity(): int
{
return $this->severity;
}
}
core/lib/Security/Event/SecurityEventInterface.php
+1 -1
View File
@@ -22,5 +22,5 @@ interface SecurityEventInterface
public function getReason(): ?string;
public function getSeverity(): int;
public function getSeverity(): SecurityEventSeverity;
}
core/lib/Security/Event/SecurityEventSeverity.php
+14
View File
@@ -0,0 +1,14 @@
<?php
declare(strict_types=1);
namespace KTXC\Security\Event;
enum SecurityEventSeverity: int
{
case DEBUG = 0;
case INFO = 1;
case WARNING = 2;
case ERROR = 3;
case CRITICAL = 4;
}
core/lib/Security/Event/SuspiciousActivityEvent.php
+2 -2
View File
@@ -93,8 +93,8 @@ final class SuspiciousActivityEvent extends Event implements SecurityRequestEven
return $this->reason;
}
public function getSeverity(): int
public function getSeverity(): SecurityEventSeverity
{
return SecurityEvent::SEVERITY_ERROR;
return SecurityEventSeverity::ERROR;
}
}
core/lib/Service/FirewallService.php
+1 -3
View File
@@ -22,7 +22,6 @@ 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;
use KTXC\Security\Event\SecurityEventInterface;
use KTXC\Security\Event\SecurityRequestEventInterface;
use KTXF\Event\EventDispatcherInterface;
@@ -311,8 +310,7 @@ class FirewallService
private function mapEventToResult(SecurityEventInterface $event): string
{
return match ($event->getName()) {
AuthenticationSucceededEvent::class,
SecurityEvent::ACCESS_GRANTED => FirewallLogObject::RESULT_ALLOWED,
AuthenticationSucceededEvent::class => FirewallLogObject::RESULT_ALLOWED,
FirewallRuleCreatedEvent::class,
FirewallRuleExtendedEvent::class,
FirewallRuleEnabledEvent::class,