Merge pull request #85 from stackkit/bugfix/token-aud

marickvantuil · web-flow · commit a4d3efa8506f · 2022-12-07T21:22:14.000+01:00
Fix bug making it possible to task handler under specific circumstances
diff --git a/src/CloudTasksQueue.php b/src/CloudTasksQueue.php
@@ -163,6 +163,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
 
         $token = new OidcToken;
         $token->setServiceAccountEmail($this->config['service_account_email']);
+        $token->setAudience(hash_hmac('sha256', $this->getHandler(), config('app.key')));
         $httpRequest->setOidcToken($token);
 
         if ($availableAt > time()) {
diff --git a/src/OpenIdVerificatorConcrete.php b/src/OpenIdVerificatorConcrete.php
@@ -18,7 +18,7 @@ public function verify(?string $token, array $config): void
         (new AccessToken())->verify(
             $token,
             [
-                'audience' => app('queue')->getHandler(),
+                'audience' => hash_hmac('sha256', app('queue')->getHandler(), config('app.key')),
                 'throwException' => true,
             ]
         );
diff --git a/src/OpenIdVerificatorFake.php b/src/OpenIdVerificatorFake.php
@@ -17,7 +17,7 @@ public function verify(?string $token, array $config): void
         (new AccessToken())->verify(
             $token,
             [
-                'audience' => app('queue')->getHandler(),
+                'audience' => hash_hmac('sha256', app('queue')->getHandler(), config('app.key')),
                 'throwException' => true,
                 'certsLocation' => __DIR__ . '/../tests/Support/self-signed-public-key-as-jwk.json',
             ]

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function verify(?string $token, array $config): void`
`18`	`18`	`(new AccessToken())->verify(`
`19`	`19`	`$token,`
`20`	`20`	`[`
`21`		`- 'audience' => app('queue')->getHandler(),`
	`21`	`+ 'audience' => hash_hmac('sha256', app('queue')->getHandler(), config('app.key')),`
`22`	`22`	`'throwException' => true,`
`23`	`23`	`]`
`24`	`24`	`);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function verify(?string $token, array $config): void`
`17`	`17`	`(new AccessToken())->verify(`
`18`	`18`	`$token,`
`19`	`19`	`[`
`20`		`- 'audience' => app('queue')->getHandler(),`
	`20`	`+ 'audience' => hash_hmac('sha256', app('queue')->getHandler(), config('app.key')),`
`21`	`21`	`'throwException' => true,`
`22`	`22`	`'certsLocation' => __DIR__ . '/../tests/Support/self-signed-public-key-as-jwk.json',`
`23`	`23`	`]`