Update usage of the JWT lib

imbo · Jul 11, 2023 · 7d02381 · 7d02381
1 parent 81832c9
commit 7d02381
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/ArrayContainsComparator/Matcher/JWT.php b/src/ArrayContainsComparator/Matcher/JWT.php
@@ -4,6 +4,7 @@
 use Firebase;
 use InvalidArgumentException;
 use Imbo\BehatApiExtension\ArrayContainsComparator as Comparator;
+use UnexpectedValueException;
 
 /**
  * Match a JWT token
@@ -76,10 +77,20 @@ public function __invoke($jwt, $name) {
         }
 
         $token  = $this->jwtTokens[$name];
-        $result = (array) Firebase\JWT\JWT::decode($jwt, $token['secret'], $this->allowedAlgorithms);
 
-        if (!$this->comparator->compare($token['payload'], $result)) {
-            throw new InvalidArgumentException('JWT mismatch.');
+        foreach ($this->allowedAlgorithms as $algorithm) {
+            try {
+                $result = (array) Firebase\JWT\JWT::decode($jwt, new Firebase\JWT\Key($token['secret'], $algorithm));
+            } catch (UnexpectedValueException $e) {
+                // try next algorithm
+                continue;
+            }
+
+            if ($this->comparator->compare($token['payload'], $result)) {
+                return true;
+            }
         }
+
+        throw new InvalidArgumentException('JWT mismatch.');
     }
 }