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

Change authentication for bitbucket to oauth.

pull/5363/head
Stefan Grootscholten 2016-05-16 21:57:50 +02:00
parent 0e500d4c91
commit 6c8b0cc2c1
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,6 +569,25 @@ class RemoteFilesystem
) { ) {
throw new TransportException('Could not authenticate against '.$this->originUrl, 401); throw new TransportException('Could not authenticate against '.$this->originUrl, 401);
} }
} elseif ($this->config && $this->originUrl === 'bitbucket.org') {
if (! $this->io->hasAuthentication($this->originUrl)) {
$message = "\n".'Could not fetch ' . $this->fileUrl . ', please create a bitbucket OAuth token to access private repos';
$bitBucketUtil = new Bitbucket($this->io, $this->config);
if (! $bitBucketUtil->authorizeOAuth($this->originUrl)
&& (! $this->io->isInteractive() || !$bitBucketUtil->authorizeOAuthInteractively($this->originUrl, $message))
) {
throw new TransportException('Could not authenticate against ' . $this->originUrl, 401);
}
} else {
$auth = $this->io->getAuthentication($this->originUrl);
if ($auth['username'] !== 'x-token-auth') {
$bitbucketUtil = new Bitbucket($this->io, $this->config);
$token = $bitbucketUtil->requestToken($this->originUrl, $auth['username'], $auth['password']);
$this->io->setAuthentication($this->originUrl, 'x-token-auth', $token['access_token']);
} else {
throw new TransportException('Could not authenticate against ' . $this->originUrl, 401);
}
}
} else { } else {
// 404s are only handled for github // 404s are only handled for github
if ($httpStatus === 404) { if ($httpStatus === 404) {
@ -671,6 +690,10 @@ class RemoteFilesystem
if ($auth['password'] === 'oauth2') { if ($auth['password'] === 'oauth2') {
$headers[] = 'Authorization: Bearer '.$auth['username']; $headers[] = 'Authorization: Bearer '.$auth['username'];
} }
} elseif ('bitbucket.org' === $originUrl && $this->fileUrl !== Bitbucket::OAUTH2_ACCESS_TOKEN_URL) {
if ('x-token-auth' === $auth['username']) {
$headers[] = 'Authorization: Bearer ' . $auth['password'];
}
} else { } else {
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$headers[] = 'Authorization: Basic '.$authStr; $headers[] = 'Authorization: Basic '.$authStr;