Changeset 14331

Timestamp:

01/03/2025 01:58:57 PM (15 months ago)

Author:

aidvu

Message:

api: upgrade adhocore-php-jwt from github

​https://github.com/adhocore/php-jwt/tree/main/src

Location:

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/adhocore-php-jwt

Files:

• JWT.php (modified) (3 diffs)
• ValidatesJWT.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/adhocore-php-jwt/JWT.php

@@ -144 +144 @@
      *
      * @param string $token
+     * @param bool   $verify
      *
      * @throws JWTException
@@ -149 +150 @@
      * @return array
      */
-    public function decode(string $token): array
+    public function decode(string $token, bool $verify = true): array
     {
         if (\substr_count($token, '.') < 2) {
@@ -156 +157 @@
 
         $token = \explode('.', $token, 3);
+        if (!$verify) {
+            return (array) $this->urlSafeDecode($token[1]);
+        }
+
         $this->validateHeader((array) $this->urlSafeDecode($token[0]));
 

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/adhocore-php-jwt/ValidatesJWT.php

@@ -87 +87 @@
             ['exp', $this->leeway /*          */ , static::ERROR_TOKEN_EXPIRED, 'Expired'],
             ['iat', $this->maxAge - $this->leeway, static::ERROR_TOKEN_EXPIRED, 'Expired'],
-            ['nbf', $this->maxAge - $this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
+            ['nbf', -$this->leeway, static::ERROR_TOKEN_NOT_NOW, 'Not now'],
         ];
 
@@ -115 +115 @@
         }
 
-        if ($this->key===false) {
+        if (\PHP_VERSION_ID < 80000 && !\is_resource($this->key)) {
+            throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
+        }
+
+        if (\PHP_VERSION_ID > 80000 && !(
+            $this->key instanceof \OpenSSLAsymmetricKey
+            || $this->key instanceof \OpenSSLCertificate
+            || $this->key instanceof \OpenSSLCertificateSigningRequest
+        )) {
             throw new JWTException('Invalid key: Should be resource of private key', static::ERROR_KEY_INVALID);
         }