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

Store http auth creds by domain only

pull/1162/head
Mark Achee 2012-10-01 10:11:34 -05:00
parent 9d03dc5a89
commit ac2fed29a4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,10 +204,10 @@ class GitDownloader extends VcsDownloader
preg_match('{(https?://)([^/]+/)(.*)$}i', $url, $match) && preg_match('{(https?://)([^/]+/)(.*)$}i', $url, $match) &&
strpos($this->process->getErrorOutput(), 'fatal: Authentication failed') === 0 strpos($this->process->getErrorOutput(), 'fatal: Authentication failed') === 0
) { ) {
if ($saved = $this->io->hasAuthorization($match[1].$match[2])) { if ($saved = $this->io->hasAuthorization($match[2])) {
$auth = $this->io->getAuthorization($match[1].$match[2]); $auth = $this->io->getAuthorization($match[2]);
} else { } else {
$this->io->write($match[1].$match[2].' ('.$match[3].') requires Authentication'); $this->io->write($match[1].$match[2].$match[3].' requires Authentication');
$auth = array( $auth = array(
'username' => $this->io->ask('Username: '), 'username' => $this->io->ask('Username: '),
'password' => $this->io->askAndHideAnswer('Password: '), 'password' => $this->io->askAndHideAnswer('Password: '),
@ -221,9 +221,9 @@ class GitDownloader extends VcsDownloader
if (0 === $this->process->execute($command, $handler)) { if (0 === $this->process->execute($command, $handler)) {
if (!$saved) { if (!$saved) {
$saved = $this->io->ask('Save user/pass for other requests to '. $saved = $this->io->ask('Save user/pass for other requests to '.
$match[1].$match[2].' ? [y]/n: '); $match[2].' ? [y]/n: ');
if (in_array($saved, array('y', 'Y', null), true)) { if (in_array($saved, array('y', 'Y', null), true)) {
$this->io->setAuthorization($match[1].$match[2], $auth['username'], $auth['password']); $this->io->setAuthorization($match[2], $auth['username'], $auth['password']);
$this->io->write('saved...'); $this->io->write('saved...');
} }
} }