public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Move bearer auth to be first to make sure it does not get shadowed by github/gitlab/.. configs

pull/8671/head
Jordi Boggiano 2020-03-10 13:26:53 +01:00 committed by GitHub
parent cbec8ceb53
commit 479414d8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Util/RemoteFilesystem.php
View File

@ -817,7 +817,9 @@ class RemoteFilesystem
if ($this->io->hasAuthentication($originUrl)) { if ($this->io->hasAuthentication($originUrl)) {
$authenticationDisplayMessage = null; $authenticationDisplayMessage = null;
$auth = $this->io->getAuthentication($originUrl); $auth = $this->io->getAuthentication($originUrl);
if ('github.com' === $originUrl && 'x-oauth-basic' === $auth['password']) { if ($auth['password'] === 'bearer') {
$headers[] = 'Authorization: Bearer '.$auth['username'];
} elseif ('github.com' === $originUrl && 'x-oauth-basic' === $auth['password']) {
$options['github-token'] = $auth['username']; $options['github-token'] = $auth['username'];
$authenticationDisplayMessage = 'Using GitHub token authentication'; $authenticationDisplayMessage = 'Using GitHub token authentication';
} elseif ($this->config && in_array($originUrl, $this->config->get('gitlab-domains'), true)) { } elseif ($this->config && in_array($originUrl, $this->config->get('gitlab-domains'), true)) {
@ -835,8 +837,6 @@ class RemoteFilesystem
$headers[] = 'Authorization: Bearer ' . $auth['password']; $headers[] = 'Authorization: Bearer ' . $auth['password'];
$authenticationDisplayMessage = 'Using Bitbucket OAuth token authentication'; $authenticationDisplayMessage = 'Using Bitbucket OAuth token authentication';
} }
} elseif ($auth['password'] === 'bearer' ) {
$headers[] = 'Authorization: Bearer '.$auth['username'];
} else { } else {
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$headers[] = 'Authorization: Basic '.$authStr; $headers[] = 'Authorization: Basic '.$authStr;