Skip to content

[pull] main from composer:main #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 9, 2026
Merged

[pull] main from composer:main #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions src/Service/FilterListWorker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public function __construct(
private DownloadManager $downloadManager,
private string $mailFromEmail,
private UrlGeneratorInterface $urlGenerator,
private string $packagistHost,
) {
}

Expand Down Expand Up @@ -90,39 +91,41 @@ public function process(Job $job, SignalHandler $signal): array

$this->malwarePackageVersionUpdateListener->flushChangesToPackages();

/** @var array<string, list<FilterListEntry>> $newEntriesByPackage */
$newEntriesByPackage = [];
foreach ($new as $entry) {
$newEntriesByPackage[$entry->getPackageName()][] = $entry;
}

foreach ($newEntriesByPackage as $packageName => $entries) {
$package = $this->doctrine->getRepository(Package::class)->findOneBy(['name' => $packageName]);
$downloads = $package ? $this->downloadManager->getTotalDownloads($package->getId()) : 0;
$packageUrl = $this->urlGenerator->generate('view_package', ['name' => $packageName], UrlGeneratorInterface::ABSOLUTE_URL);

if ($downloads >= 10_000) {
$subject = '[URGENT] Filter list entry added for high-download package '.$packageName.' ('.number_format($downloads).' downloads)';
$body = 'A new filter list entry has been added for '.$packageName.' which has '.number_format($downloads)." total downloads. This requires urgent attention.\n\n";
} else {
$subject = 'Filter list entry added for '.$packageName;
$body = 'A new filter list entry has been added for '.$packageName.".\n\n";
if ($this->packagistHost === 'packagist.org') {
/** @var array<string, list<FilterListEntry>> $newEntriesByPackage */
$newEntriesByPackage = [];
foreach ($new as $entry) {
$newEntriesByPackage[$entry->getPackageName()][] = $entry;
}

$body .= 'Package: '.$packageUrl."\n"
.'List: '.$list->value."\n"
.'Versions: '.implode(', ', array_map(fn (FilterListEntry $e) => $e->getVersion(), $entries))."\n"
.'Reason: '.($entries[0]->getReason() ?? 'N/A')."\n"
.'Link: '.($entries[0]->getLink() ?? 'N/A')."\n";

$message = new Email()
->subject($subject)
->from(new Address($this->mailFromEmail))
->to($this->mailFromEmail)
->text($body)
;
$message->getHeaders()->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply');
$this->mailer->send($message);
foreach ($newEntriesByPackage as $packageName => $entries) {
$package = $this->doctrine->getRepository(Package::class)->findOneBy(['name' => $packageName]);
$downloads = $package ? $this->downloadManager->getTotalDownloads($package->getId()) : 0;
$packageUrl = $this->urlGenerator->generate('view_package', ['name' => $packageName], UrlGeneratorInterface::ABSOLUTE_URL);

if ($downloads >= 10_000) {
$subject = '[URGENT] Filter list entry added for high-download package '.$packageName.' ('.number_format($downloads).' downloads)';
$body = 'A new filter list entry has been added for '.$packageName.' which has '.number_format($downloads)." total downloads. This requires urgent attention.\n\n";
} else {
$subject = 'Filter list entry added for '.$packageName;
$body = 'A new filter list entry has been added for '.$packageName.".\n\n";
}

$body .= 'Package: '.$packageUrl."\n"
.'List: '.$list->value."\n"
.'Versions: '.implode(', ', array_map(fn (FilterListEntry $e) => $e->getVersion(), $entries))."\n"
.'Reason: '.($entries[0]->getReason() ?? 'N/A')."\n"
.'Link: '.($entries[0]->getLink() ?? 'N/A')."\n";

$message = new Email()
->subject($subject)
->from(new Address($this->mailFromEmail))
->to($this->mailFromEmail)
->text($body)
;
$message->getHeaders()->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply');
$this->mailer->send($message);
}
}

$this->locker->unlockFilterList(self::FILTER_LIST_WORKER_RUN);
Expand Down
2 changes: 1 addition & 1 deletion tests/FilterListWorkerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected function setUp(): void
$this->downloadManager = $this->createStub(DownloadManager::class);
$this->urlGenerator = $this->createStub(UrlGeneratorInterface::class);
$doctrine = $this->createStub(ManagerRegistry::class);
$this->worker = new FilterListWorker($this->locker, new NullLogger(), $doctrine, [FilterLists::AIKIDO_MALWARE->value => $this->filterList], new FilterListResolver(), new FilterListEntryUpdateListener($doctrine), $this->mailer, $this->downloadManager, 'test@example.com', $this->urlGenerator);
$this->worker = new FilterListWorker($this->locker, new NullLogger(), $doctrine, [FilterLists::AIKIDO_MALWARE->value => $this->filterList], new FilterListResolver(), new FilterListEntryUpdateListener($doctrine), $this->mailer, $this->downloadManager, 'test@example.com', $this->urlGenerator, 'packagist.org');

$this->em = $this->createMock(EntityManager::class);

Expand Down