Replace manual headers check with HeaderRequestMatcher

welcoMattic · welcoMattic · commit 9d8357b59bcc · 2024-04-17T14:30:21.000+02:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Resend/Webhook/ResendRequestParser.php b/src/Symfony/Component/Mailer/Bridge/Resend/Webhook/ResendRequestParser.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpFoundation\ChainRequestMatcher;
 use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher\HeaderRequestMatcher;
 use Symfony\Component\HttpFoundation\RequestMatcher\IsJsonRequestMatcher;
 use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
@@ -36,6 +37,11 @@ protected function getRequestMatcher(): RequestMatcherInterface
         return new ChainRequestMatcher([
             new MethodRequestMatcher('POST'),
             new IsJsonRequestMatcher(),
+            new HeaderRequestMatcher([
+                'svix-id',
+                'svix-timestamp',
+                'svix-signature',
+            ]),
         ]);
     }
 
@@ -72,14 +78,9 @@ protected function doParse(Request $request, #[\SensitiveParameter] string $secr
     private function validateSignature(string $payload, HeaderBag $headers, string $secret): void
     {
         $secret = $this->decodeSecret($secret);
-
-        if ($headers->has('svix-id') && $headers->has('svix-timestamp') && $headers->has('svix-signature')) {
-            $messageId = $headers->get('svix-id');
-            $messageTimestamp = (int) $headers->get('svix-timestamp');
-            $messageSignature = $headers->get('svix-signature');
-        } else {
-            throw new RejectWebhookException(406, 'Missing required headers.');
-        }
+        $messageId = $headers->get('svix-id');
+        $messageTimestamp = (int) $headers->get('svix-timestamp');
+        $messageSignature = $headers->get('svix-signature');
 
         $signature = $this->sign($secret, $messageId, $messageTimestamp, $payload);
         $expectedSignature = explode(',', $signature, 2)[1];
