bug symfony#35530 [HttpClient] Fix regex bearer (noniagriconomie)

nicolas-grekas · nicolas-grekas · commit e39d66eeeee9 · 2020-01-31T10:08:14.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] Fix regex bearer | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#34919 | License | MIT | Doc PR | none Small fix related to symfony#34919 (comment) Commits ------- cd0db78 [HttpClient] Fix regex bearer
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -86,7 +86,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic'])));
         }
 
-        if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._~+/0-9a-zA-Z]++=*+$}', $options['auth_bearer']))) {
+        if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {
             throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer'])));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`86`	`86`	`throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic'])));`
`87`	`87`	`}`
`88`	`88`
`89`		`- if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) \|\| !preg_match('{^[-._~+/0-9a-zA-Z]++=*+$}', $options['auth_bearer']))) {`
	`89`	`+ if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) \|\| !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {`
`90`	`90`	`throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer'])));`
`91`	`91`	`}`
`92`	`92`