feat: make event state constructor-only and immutable
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
@@ -254,8 +254,13 @@ final class FirewallRuleManager
|
||||
$origin
|
||||
);
|
||||
|
||||
$event = new SecurityEvent(SecurityEvent::DEVICE_BLOCKED, ['device' => $fingerprint, 'reason' => $reason]);
|
||||
$event->setDeviceFingerprint($fingerprint)->setReason($reason)->setTenantId($scope->tenantId);
|
||||
$event = new SecurityEvent(
|
||||
SecurityEvent::DEVICE_BLOCKED,
|
||||
['device' => $fingerprint, 'reason' => $reason],
|
||||
tenantId: $scope->tenantId,
|
||||
deviceFingerprint: $fingerprint,
|
||||
reason: $reason,
|
||||
);
|
||||
$this->events->dispatch($event);
|
||||
|
||||
return $rule;
|
||||
@@ -499,8 +504,13 @@ final class FirewallRuleManager
|
||||
string $ipAddress,
|
||||
?string $reason
|
||||
): void {
|
||||
$event = new SecurityEvent($name, ['ip' => $ipAddress, 'reason' => $reason]);
|
||||
$event->setIpAddress($ipAddress)->setReason($reason)->setTenantId($scope->tenantId);
|
||||
$event = new SecurityEvent(
|
||||
$name,
|
||||
['ip' => $ipAddress, 'reason' => $reason],
|
||||
tenantId: $scope->tenantId,
|
||||
ipAddress: $ipAddress,
|
||||
reason: $reason,
|
||||
);
|
||||
$this->events->dispatch($event);
|
||||
}
|
||||
|
||||
@@ -511,20 +521,23 @@ final class FirewallRuleManager
|
||||
array $change = []
|
||||
): void
|
||||
{
|
||||
$event = new SecurityEvent($name, [
|
||||
'ruleId' => $rule->getId(),
|
||||
'ruleScope' => $rule->getScope(),
|
||||
'ruleType' => $rule->getType(),
|
||||
'ruleAction' => $rule->getAction(),
|
||||
'ruleValue' => $rule->getValue(),
|
||||
'reason' => $rule->getReason(),
|
||||
'origin' => $rule->getMetadata()['origin'] ?? self::ORIGIN_MANUAL,
|
||||
'expiresAt' => $rule->getExpiresAt()?->format(\DateTimeInterface::ATOM),
|
||||
...($rule->getMetadata() ?? []),
|
||||
...$change,
|
||||
]);
|
||||
$event->setTenantId($rule->getTenantId())
|
||||
->setIdentityId($actorId ?? $rule->getCreatedBy());
|
||||
$event = new SecurityEvent(
|
||||
$name,
|
||||
[
|
||||
'ruleId' => $rule->getId(),
|
||||
'ruleScope' => $rule->getScope(),
|
||||
'ruleType' => $rule->getType(),
|
||||
'ruleAction' => $rule->getAction(),
|
||||
'ruleValue' => $rule->getValue(),
|
||||
'reason' => $rule->getReason(),
|
||||
'origin' => $rule->getMetadata()['origin'] ?? self::ORIGIN_MANUAL,
|
||||
'expiresAt' => $rule->getExpiresAt()?->format(\DateTimeInterface::ATOM),
|
||||
...($rule->getMetadata() ?? []),
|
||||
...$change,
|
||||
],
|
||||
tenantId: $rule->getTenantId(),
|
||||
identityId: $actorId ?? $rule->getCreatedBy(),
|
||||
);
|
||||
$this->events->dispatch($event);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,7 +139,6 @@ class FirewallService
|
||||
return;
|
||||
}
|
||||
|
||||
$event->setTenantId($tenantId);
|
||||
$log = $this->securityLog($event);
|
||||
if ($log === null || !$this->store->createLogOnce($log)) {
|
||||
return;
|
||||
@@ -195,8 +194,12 @@ class FirewallService
|
||||
int $blockDuration
|
||||
): void {
|
||||
// Publish brute force event
|
||||
$event = SecurityEvent::bruteForceDetected($ipAddress, $failureCount, $windowSeconds);
|
||||
$event->setTenantId($tenantId);
|
||||
$event = SecurityEvent::bruteForceDetected(
|
||||
$ipAddress,
|
||||
$failureCount,
|
||||
$windowSeconds,
|
||||
$tenantId,
|
||||
);
|
||||
$this->events->dispatch($event);
|
||||
|
||||
$this->rules->blockIp(
|
||||
@@ -308,9 +311,9 @@ class FirewallService
|
||||
$deviceFingerprint,
|
||||
$rule->getId(),
|
||||
$rule->getScope(),
|
||||
$rule->getReason()
|
||||
$rule->getReason(),
|
||||
$this->tenantContext->identifier(),
|
||||
);
|
||||
$event->setTenantId($this->tenantContext->identifier());
|
||||
$this->events->dispatch($event);
|
||||
}
|
||||
|
||||
|
||||
@@ -52,13 +52,17 @@ 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->setTenantId($tenantId)->setIdentityId($actorId);
|
||||
$event = new SecurityEvent(
|
||||
SecurityEvent::FIREWALL_SETTINGS_UPDATED,
|
||||
[
|
||||
'changeReason' => $reason,
|
||||
'changeOrigin' => FirewallRuleManager::ORIGIN_MANUAL,
|
||||
'previous' => $previous,
|
||||
'current' => $current,
|
||||
],
|
||||
tenantId: $tenantId,
|
||||
identityId: $actorId,
|
||||
);
|
||||
$this->events->dispatch($event);
|
||||
|
||||
return $current;
|
||||
|
||||
Reference in New Issue
Block a user