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

Bearer support.

pull/8671/head
Ethan Clevenger 2020-03-04 15:01:35 -08:00
parent 98af0fdf85
commit cbec8ceb53
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/IO/BaseIO.php
View File

@ -116,6 +116,7 @@ abstract class BaseIO implements IOInterface, LoggerInterface
$gitlabOauth = $config->get('gitlab-oauth') ?: array();
$gitlabToken = $config->get('gitlab-token') ?: array();
$httpBasic = $config->get('http-basic') ?: array();
$bearerToken = $config->get('bearer') ?: array();
// reload oauth tokens from config if available
@ -143,6 +144,10 @@ abstract class BaseIO implements IOInterface, LoggerInterface
$this->checkAndSetAuthentication($domain, $cred['username'], $cred['password']);
}
foreach ($bearerToken as $domain => $token) {
$this->checkAndSetAuthentication($domain, $token, 'bearer');
}
// setup process timeout
ProcessExecutor::setTimeout((int) $config->get('process-timeout'));
}

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

@ -835,6 +835,8 @@ class RemoteFilesystem
$headers[] = 'Authorization: Bearer ' . $auth['password'];
$authenticationDisplayMessage = 'Using Bitbucket OAuth token authentication';
}
} elseif ($auth['password'] === 'bearer' ) {
$headers[] = 'Authorization: Bearer '.$auth['username'];
} else {
$authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$headers[] = 'Authorization: Basic '.$authStr;