tweaks

weaverryan · weaverryan · commit 88ce8e86db0d · 2020-09-30T08:56:25.000-04:00
diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php
@@ -82,7 +82,7 @@ public function consumeLoginLink(Request $request): UserInterface
         $hash = $request->get('hash');
         $expires = $request->get('expires');
         if (false === hash_equals($hash, $this->computeSignatureHash($user, $expires))) {
-            throw new InvalidLoginLinkException('User has changed since link was sent.');
+            throw new InvalidLoginLinkException('Invalid or expired signature.');
         }
 
         if ($expires < time()) {
@@ -107,6 +107,9 @@ private function computeSignatureHash(UserInterface $user, int $expires): string
 
         foreach ($this->signatureProperties as $property) {
             $value = $this->propertyAccessor->getValue($user, $property);
+            if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
+                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, get_class($user), get_debug_type($value)));
+            }
             $signatureFields[] = base64_encode($value);
         }
 
