Harden module runtime: audited listener failures and DI-first resolver
This commit is contained in:
@@ -20,10 +20,15 @@ class SearchConfig
|
||||
|
||||
/** @var (callable(): ModuleRegistry)|null */
|
||||
private static $moduleRegistryResolver = null;
|
||||
/** @var (callable(string): ?object)|null */
|
||||
private static $moduleClassResolver = null;
|
||||
|
||||
public static function configure(callable $moduleRegistryResolver): void
|
||||
public static function configure(callable $moduleRegistryResolver, ?callable $moduleClassResolver = null): void
|
||||
{
|
||||
self::$moduleRegistryResolver = $moduleRegistryResolver;
|
||||
self::$moduleClassResolver = $moduleClassResolver !== null
|
||||
? \Closure::fromCallable($moduleClassResolver)
|
||||
: null;
|
||||
self::resetModuleProviders();
|
||||
}
|
||||
|
||||
@@ -155,10 +160,7 @@ class SearchConfig
|
||||
return self::$moduleProviders;
|
||||
}
|
||||
foreach ($registry->getSearchResources() as $providerClass) {
|
||||
if (!class_exists($providerClass)) {
|
||||
continue;
|
||||
}
|
||||
$provider = new $providerClass();
|
||||
$provider = self::resolveModuleProvider($providerClass);
|
||||
if ($provider instanceof SearchResourceProvider) {
|
||||
self::$moduleProviders[] = $provider;
|
||||
foreach ($provider->resources() as $key => $resource) {
|
||||
@@ -182,6 +184,31 @@ class SearchConfig
|
||||
self::$moduleProviderByKey = [];
|
||||
}
|
||||
|
||||
private static function resolveModuleProvider(string $providerClass): ?SearchResourceProvider
|
||||
{
|
||||
try {
|
||||
if (is_callable(self::$moduleClassResolver)) {
|
||||
$resolved = (self::$moduleClassResolver)($providerClass);
|
||||
return $resolved instanceof SearchResourceProvider ? $resolved : null;
|
||||
}
|
||||
|
||||
if (!class_exists($providerClass)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$reflection = new \ReflectionClass($providerClass);
|
||||
$constructor = $reflection->getConstructor();
|
||||
if ($constructor !== null && $constructor->getNumberOfRequiredParameters() > 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$instance = $reflection->newInstance();
|
||||
return $instance instanceof SearchResourceProvider ? $instance : null;
|
||||
} catch (\Throwable) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static function hotkeyPreviewResource(string $query): ?array
|
||||
{
|
||||
return SearchSpecialResourceProvider::hotkeyPreviewResource($query);
|
||||
|
||||
Reference in New Issue
Block a user