Merge branch '6.1' into 6.2

* 6.1:
  [Security/Http] Check tokens before loading users from providers

Author: nicolas-grekas

Signature/SignatureHasher.php

@@ -45,24 +45,48 @@ public function __construct(PropertyAccessorInterface $propertyAccessor, array $
     }
 
     /**
-     * Verifies the hash using the provided user and expire time.
+     * Verifies the hash using the provided user identifier and expire time.
+     *
+     * This method must be called before the user object is loaded from a provider.
      *
      * @param int    $expires The expiry time as a unix timestamp
      * @param string $hash    The plaintext hash provided by the request
      *
      * @throws InvalidSignatureException If the signature does not match the provided parameters
      * @throws ExpiredSignatureException If the signature is no longer valid
      */
-    public function verifySignatureHash(UserInterface $user, int $expires, string $hash): void
+    public function acceptSignatureHash(string $userIdentifier, int $expires, string $hash): void
     {
-        if (!hash_equals($hash, $this->computeSignatureHash($user, $expires))) {
+        if ($expires < time()) {
+            throw new ExpiredSignatureException('Signature has expired.');
+        }
+        $hmac = substr($hash, 0, 44);
+        $payload = substr($hash, 44).':'.$expires.':'.$userIdentifier;
+
+        if (!hash_equals($hmac, $this->generateHash($payload))) {
             throw new InvalidSignatureException('Invalid or expired signature.');
         }
+    }
 
+    /**
+     * Verifies the hash using the provided user and expire time.
+     *
+     * @param int    $expires The expiry time as a unix timestamp
+     * @param string $hash    The plaintext hash provided by the request
+     *
+     * @throws InvalidSignatureException If the signature does not match the provided parameters
+     * @throws ExpiredSignatureException If the signature is no longer valid
+     */
+    public function verifySignatureHash(UserInterface $user, int $expires, string $hash): void
+    {
         if ($expires < time()) {
             throw new ExpiredSignatureException('Signature has expired.');
         }
 
+        if (!hash_equals($hash, $this->computeSignatureHash($user, $expires))) {
+            throw new InvalidSignatureException('Invalid or expired signature.');
+        }
+
         if ($this->expiredSignaturesStorage && $this->maxUses) {
             if ($this->expiredSignaturesStorage->countUsages($hash) >= $this->maxUses) {
                 throw new ExpiredSignatureException(sprintf('Signature can only be used "%d" times.', $this->maxUses));
@@ -79,7 +103,8 @@ public function verifySignatureHash(UserInterface $user, int $expires, string $h
      */
     public function computeSignatureHash(UserInterface $user, int $expires): string
     {
-        $signatureFields = [base64_encode($user->getUserIdentifier()), $expires];
+        $userIdentifier = $user->getUserIdentifier();
+        $fieldsHash = hash_init('sha256');
 
         foreach ($this->signatureProperties as $property) {
             $value = $this->propertyAccessor->getValue($user, $property) ?? '';
@@ -90,9 +115,16 @@ public function computeSignatureHash(UserInterface $user, int $expires): string
             if (!\is_scalar($value) && !$value instanceof \Stringable) {
                 throw new \InvalidArgumentException(sprintf('The property path "%s" on the user object "%s" must return a value that can be cast to a string, but "%s" was returned.', $property, $user::class, get_debug_type($value)));
             }
-            $signatureFields[] = base64_encode($value);
+            hash_update($fieldsHash, ':'.base64_encode($value));
         }
 
-        return base64_encode(hash_hmac('sha256', implode(':', $signatureFields), $this->secret));
+        $fieldsHash = strtr(base64_encode(hash_final($fieldsHash, true)), '+/=', '-_~');
+
+        return $this->generateHash($fieldsHash.':'.$expires.':'.$userIdentifier).$fieldsHash;
+    }
+
+    private function generateHash(string $tokenValue): string
+    {
+        return strtr(base64_encode(hash_hmac('sha256', $tokenValue, $this->secret, true)), '+/=', '-_~');
     }
 }