Run-all buttons (per target and per investigation) queue every applicable, not-already-in-flight source via a new FindingDispatcher, re-attempting prior failures automatically. RunFinding now applies a per-source RateLimited queue middleware so a bulk run can't hammer the free public APIs (ip-api, crt.sh, whois, sherlock, theharvester) it depends on; $tries raised to 30 to survive rate-limiter releases, with a failed() handler so exhausted retries still resolve the Finding instead of leaving it stuck pending. Also fixes CrtShRunner treating crt.sh's intermittent 404/502 (a known flaky free service) as fatal on the first try — added a bounded retry. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
81 lines
2.3 KiB
PHP
81 lines
2.3 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Models\Finding;
|
|
use App\Osint\RunnerRegistry;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Queue\Queueable;
|
|
use Illuminate\Queue\Middleware\RateLimited;
|
|
|
|
class RunFinding implements ShouldQueue
|
|
{
|
|
use Queueable;
|
|
|
|
/**
|
|
* Business-logic failures (a runner throwing) are caught in handle()
|
|
* below and never bubble up to the queue, so this only needs to cover
|
|
* genuine retries: rate-limiter releases (see middleware()) and worker
|
|
* crashes. A bulk run against a busy investigation can easily queue
|
|
* dozens of same-source lookups behind one rate limit, so this is set
|
|
* high enough to ride that out rather than give up mid-queue.
|
|
*/
|
|
public int $tries = 30;
|
|
|
|
public function __construct(
|
|
public readonly int $findingId,
|
|
) {
|
|
}
|
|
|
|
/**
|
|
* @return array<int, object>
|
|
*/
|
|
public function middleware(): array
|
|
{
|
|
$sourceKey = Finding::find($this->findingId)?->source?->key;
|
|
|
|
if ($sourceKey === null) {
|
|
return [];
|
|
}
|
|
|
|
return [new RateLimited('osint-runner:'.$sourceKey)];
|
|
}
|
|
|
|
public function handle(RunnerRegistry $registry): void
|
|
{
|
|
$finding = Finding::with(['target', 'source'])->findOrFail($this->findingId);
|
|
|
|
$finding->update(['status' => 'running']);
|
|
|
|
try {
|
|
$result = $registry->resolve($finding->source->key)->run($finding->target);
|
|
|
|
$finding->update([
|
|
'status' => 'completed',
|
|
'raw_payload' => $result->raw,
|
|
'summary' => $result->summary,
|
|
'ran_at' => now(),
|
|
]);
|
|
} catch (\Throwable $e) {
|
|
$finding->update([
|
|
'status' => 'failed',
|
|
'error' => $e->getMessage(),
|
|
'ran_at' => now(),
|
|
]);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Only reached if the job itself fails outside handle()'s own
|
|
* try/catch — e.g. retries exhausted while rate-limited.
|
|
*/
|
|
public function failed(\Throwable $exception): void
|
|
{
|
|
Finding::where('id', $this->findingId)->update([
|
|
'status' => 'failed',
|
|
'error' => 'Gave up after retries: '.$exception->getMessage(),
|
|
'ran_at' => now(),
|
|
]);
|
|
}
|
|
}
|