bug #38248 [HttpClient] Allow bearer token with colon (stephanvierkant)

nicolas-grekas · nicolas-grekas · commit caab0f1b4f39 · 2020-09-24T15:25:52.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [HttpClient] Allow bearer token with colon | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a The JetBrains Hub (YouTrack API) creates tokens with a `perm:` prefix. This doesn't work right now, because HttpClient doesn't allow a colon in the bearer token. As far as I can see, there is no reason to disallow the use of the semicolon in the bearer token, so this PR fixes it. Example of a token: `perm:c3RlcGhhbg==.NTUtMw==.NiZw16agafhsQAShTvclhb78hyJh2H` Commits ------- 82ed1ec [HttpClient] Allow bearer token with colon
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -110,7 +110,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, '.(\is_string($options['auth_bearer']) ? 'invalid string given.' : '"%s" given.'), \gettype($options['auth_bearer'])));
         }
 

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