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

Update the way github authorization is handled, fixes #1632 

Since api.github.com redirects to s3 for downloads and s3 does not like Authorization
headers, we have to rely on the access_token query param. Otherwise php follows redirects
but still sends the Authorization header to all following requests.
pull/1625/head
Jordi Boggiano 2013-02-27 12:34:18 +01:00
parent 15e9c3d101
commit 5b1f3145c2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,10 @@ class RemoteFilesystem
$this->lastProgress = null; $this->lastProgress = null;
$options = $this->getOptionsForUrl($originUrl, $additionalOptions); $options = $this->getOptionsForUrl($originUrl, $additionalOptions);
if (isset($options['github-token'])) {
$fileUrl .= (false === strpos($fileUrl, '?') ? '?' : '&') . 'access_token='.$options['github-token'];
unset($options['github-token']);
}
$ctx = StreamContextFactory::getContext($options, array('notification' => array($this, 'callbackGet'))); $ctx = StreamContextFactory::getContext($options, array('notification' => array($this, 'callbackGet')));
if ($this->progress) { if ($this->progress) {
@ -281,8 +285,12 @@ class RemoteFilesystem
if ($this->io->hasAuthentication($originUrl)) { if ($this->io->hasAuthentication($originUrl)) {
$auth = $this->io->getAuthentication($originUrl); $auth = $this->io->getAuthentication($originUrl);
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); if ('github.com' === $originUrl && 'x-oauth-basic' === $auth['password']) {
$headers[] = 'Authorization: Basic '.$authStr; $options['github-token'] = $auth['username'];
} else {
$authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$headers[] = 'Authorization: Basic '.$authStr;
}
} }
$options = array_replace_recursive($this->options, $additionalOptions); $options = array_replace_recursive($this->options, $additionalOptions);