doVerify

kbond · kbond · commit 9a617d0abb59 · 2025-04-09T08:36:27.000-04:00
diff --git a/src/Symfony/Component/HttpFoundation/UriSigner.php b/src/Symfony/Component/HttpFoundation/UriSigner.php
@@ -22,6 +22,11 @@
  */
 class UriSigner
 {
+    private const STATUS_VALID = 1;
+    private const STATUS_INVALID = 2;
+    private const STATUS_MISSING = 3;
+    private const STATUS_EXPIRED = 4;
+
     /**
      * @param string $hashParameter       Query string parameter to use
      * @param string $expirationParameter Query string parameter to use for expiration
@@ -93,24 +98,12 @@ public function sign(string $uri/* , \DateTimeInterface|\DateInterval|int|null $
      */
     public function check(string $uri): bool
     {
-        try {
-            $this->verify($uri);
-        } catch (SignedUriException) {
-            return false;
-        }
-
-        return true;
+        return self::STATUS_VALID === $this->doVerify($uri);
     }
 
     public function checkRequest(Request $request): bool
     {
-        try {
-            $this->verify($request);
-        } catch (SignedUriException) {
-            return false;
-        }
-
-        return true;
+        return self::STATUS_VALID === $this->doVerify(self::normalize($request));
     }
 
     /**
@@ -123,37 +116,24 @@ public function checkRequest(Request $request): bool
      */
     public function verify(Request|string $uri): void
     {
-        if ($uri instanceof Request) {
-            $qs = ($qs = $uri->server->get('QUERY_STRING')) ? '?'.$qs : '';
-            $uri = $uri->getSchemeAndHttpHost().$uri->getBaseUrl().$uri->getPathInfo().$qs;
-        }
+        $uri = self::normalize($uri);
+        $status = $this->doVerify($uri);
 
-        $url = parse_url($uri);
-        $params = [];
-
-        if (isset($url['query'])) {
-            parse_str($url['query'], $params);
+        if (self::STATUS_VALID === $status) {
+            return;
         }
 
-        if (empty($params[$this->hashParameter])) {
+        if (self::STATUS_MISSING === $status) {
             throw new UnsignedUriException($uri);
         }
 
-        $hash = $params[$this->hashParameter];
-        unset($params[$this->hashParameter]);
-
-        // In 8.0, remove support for non-url-safe tokens
-        if (!hash_equals($this->computeHash($this->buildUrl($url, $params)), strtr(rtrim($hash, '='), ['/' => '_', '+' => '-']))) {
+        if (self::STATUS_INVALID === $status) {
             throw new UnverifiedSignedUriException($uri);
         }
 
-        if (!$expiration = $params[$this->expirationParameter] ?? false) {
-            return;
-        }
-
-        if (time() < $expiration) {
-            return;
-        }
+        $url = parse_url($uri);
+        parse_str($url['query'], $params);
+        $expiration = $params[$this->expirationParameter];
 
         throw new ExpiredSignedUriException(\DateTimeImmutable::createFromFormat('U', $expiration), $uri);
     }
@@ -193,4 +173,49 @@ private function getExpirationTime(\DateTimeInterface|\DateInterval|int $expirat
 
         return (string) $expiration;
     }
+
+    /**
+     * @return self::STATUS_*
+     */
+    private function doVerify(string $uri): int
+    {
+        $url = parse_url($uri);
+        $params = [];
+
+        if (isset($url['query'])) {
+            parse_str($url['query'], $params);
+        }
+
+        if (empty($params[$this->hashParameter])) {
+            return self::STATUS_MISSING;
+        }
+
+        $hash = $params[$this->hashParameter];
+        unset($params[$this->hashParameter]);
+
+        // In 8.0, remove support for non-url-safe tokens
+        if (!hash_equals($this->computeHash($this->buildUrl($url, $params)), strtr(rtrim($hash, '='), ['/' => '_', '+' => '-']))) {
+            return self::STATUS_INVALID;
+        }
+
+        if (!$expiration = $params[$this->expirationParameter] ?? false) {
+            return self::STATUS_VALID;
+        }
+
+        if (time() < $expiration) {
+            return self::STATUS_VALID;
+        }
+
+        return self::STATUS_EXPIRED;
+    }
+
+    private static function normalize(Request|string $uri): string
+    {
+        if ($uri instanceof Request) {
+            $qs = ($qs = $uri->server->get('QUERY_STRING')) ? '?'.$qs : '';
+            $uri = $uri->getSchemeAndHttpHost().$uri->getBaseUrl().$uri->getPathInfo().$qs;
+        }
+
+        return $uri;
+    }
 }
