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

Capture user/pass from 'git remote' when updating non github repo

pull/1162/head
Mark Achee 2012-10-01 12:56:41 -05:00
parent 6f689f8926
commit 5ed5f1314b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Downloader/GitDownloader.php
View File

@ -49,12 +49,14 @@ class GitDownloader extends VcsDownloader
$this->io->write(" Checking out ".$ref); $this->io->write(" Checking out ".$ref);
$command = 'cd %s && git remote set-url composer %s && git fetch composer && git fetch --tags composer'; $command = 'cd %s && git remote set-url composer %s && git fetch composer && git fetch --tags composer';
// capture username/password from github URL if there is one // capture username/password from URL if there is one
$this->process->execute(sprintf('cd %s && git remote -v', escapeshellarg($path)), $output); $this->process->execute(sprintf('cd %s && git remote -v', escapeshellarg($path)), $output);
if (preg_match('{^composer\s+https://(.+):(.+)@github.com/}im', $output, $match)) { if (preg_match('{^(?:composer|origin)\s+https?://(.+):(.+)@([^/]+)/}im', $output, $match)) {
$this->io->setAuthorization('github.com', $match[1], $match[2]); $this->io->setAuthorization($match[3], urldecode($match[1]), urldecode($match[2]));
} }
// added in git 1.7.1, prevents prompting the user
putenv('GIT_ASKPASS=echo');
$commandCallable = function($url) use ($ref, $path, $command) { $commandCallable = function($url) use ($ref, $path, $command) {
return sprintf($command, escapeshellarg($path), escapeshellarg($url), escapeshellarg($ref)); return sprintf($command, escapeshellarg($path), escapeshellarg($url), escapeshellarg($ref));
}; };
@ -201,7 +203,7 @@ class GitDownloader extends VcsDownloader
} while (--$retries); } while (--$retries);
} elseif ( } elseif (
$this->io->isInteractive() && $this->io->isInteractive() &&
preg_match('{(https?://)([^/]+/)(.*)$}i', $url, $match) && preg_match('{(https?://)([^/]+)(.*)$}i', $url, $match) &&
strpos($this->process->getErrorOutput(), 'fatal: Authentication failed') !== false strpos($this->process->getErrorOutput(), 'fatal: Authentication failed') !== false
) { ) {
if ($saved = $this->io->hasAuthorization($match[2])) { if ($saved = $this->io->hasAuthorization($match[2])) {