Skip to content

Commit 391e470

Browse files
committed
Also allow safe api token to be used as a github secret
1 parent bce5e40 commit 391e470

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Controller/ApiController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ public function securityAdvisoryAction(Request $request, ProviderManager $provid
368368
// Do a max of 1000 packages to prevent abuse
369369
$packagesToCheck = array_slice($packageNames, 0, 1000);
370370
$packageExists = $providerManager->packagesExist($packagesToCheck);
371-
371+
372372
foreach ($packagesToCheck as $name) {
373373
if (!isset($response['advisories'][$name]) && ($packageExists[strtolower($name)] ?? false)) {
374374
$response['advisories'][$name] = [];
@@ -437,7 +437,7 @@ protected function receiveUpdateRequest(Request $request, string $url, string $u
437437
[$algo, $sig] = explode('=', $sig);
438438
$expected = hash_hmac($algo, $request->getContent(), $user->getApiToken());
439439
$source = 'manual_github_hook';
440-
if (hash_equals($expected, $sig)) {
440+
if (hash_equals($expected, $sig) || hash_equals(hash_hmac($algo, $request->getContent(), $user->getSafeApiToken()), $sig)) {
441441
$packages = $this->findGitHubPackagesByRepository($match['path'], (string) $remoteId, $source, $user);
442442
$autoUpdated = Package::AUTO_GITHUB_HOOK;
443443
$receiveType = 'github_user_secret';

0 commit comments

Comments
 (0)