Harden module runtime: audited listener failures and DI-first resolver
This commit is contained in:
@@ -15,12 +15,17 @@ class AccessPolicyFactory
|
||||
private ?TenantAuthorizationPolicy $tenantAuthorizationPolicy = null;
|
||||
private ?DepartmentAuthorizationPolicy $departmentAuthorizationPolicy = null;
|
||||
private ?AuthorizationService $authorizationService = null;
|
||||
private \Closure $moduleClassResolver;
|
||||
|
||||
public function __construct(
|
||||
private readonly PermissionService $permissionService,
|
||||
private readonly TenantScopeService $tenantScopeService,
|
||||
private readonly ?ModuleRegistry $moduleRegistry = null
|
||||
private readonly ?ModuleRegistry $moduleRegistry = null,
|
||||
?callable $moduleClassResolver = null
|
||||
) {
|
||||
$this->moduleClassResolver = $moduleClassResolver !== null
|
||||
? \Closure::fromCallable($moduleClassResolver)
|
||||
: static fn (string $class): ?object => null;
|
||||
}
|
||||
|
||||
public function createUserAuthorizationPolicy(): UserAuthorizationPolicy
|
||||
@@ -108,26 +113,11 @@ class AccessPolicyFactory
|
||||
|
||||
private function instantiateModulePolicy(string $policyClass): ?AuthorizationPolicyInterface
|
||||
{
|
||||
if (!class_exists($policyClass)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
$reflection = new \ReflectionClass($policyClass);
|
||||
$constructor = $reflection->getConstructor();
|
||||
if ($constructor === null || $constructor->getNumberOfRequiredParameters() === 0) {
|
||||
$instance = $reflection->newInstance();
|
||||
return $instance instanceof AuthorizationPolicyInterface ? $instance : null;
|
||||
}
|
||||
|
||||
if ($constructor->getNumberOfRequiredParameters() === 1) {
|
||||
$instance = $reflection->newInstance($this->permissionService);
|
||||
return $instance instanceof AuthorizationPolicyInterface ? $instance : null;
|
||||
}
|
||||
$instance = ($this->moduleClassResolver)($policyClass);
|
||||
return $instance instanceof AuthorizationPolicyInterface ? $instance : null;
|
||||
} catch (\Throwable) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user