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

Determine auth URLs more intelligently

pull/3119/head
Gareth Evans 2014-07-11 12:31:51 +01:00
parent e77435cd0c
commit cfc632b019
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Composer/Util/Git.php
View File

@ -106,13 +106,26 @@ class Git
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 (strpos($match[2], '@')) {
list($authParts, $match[2]) = explode('@', $match[2], 2);
}
// TODO this should use an auth manager class that prompts and stores in the config // TODO this should use an auth manager class that prompts and stores in the config
if ($this->io->hasAuthentication($match[2])) { if ($this->io->hasAuthentication($match[2])) {
$auth = $this->io->getAuthentication($match[2]); $auth = $this->io->getAuthentication($match[2]);
} else { } else {
$defaultUsername = null;
if (isset($authParts) && $authParts) {
if (strpos($authParts, ':')) {
list($defaultUsername,) = explode(':', $authParts);
} else {
$defaultUsername = $authParts;
}
}
$this->io->write($url.' requires Authentication'); $this->io->write($url.' requires Authentication');
$auth = array( $auth = array(
'username' => $this->io->ask('Username: '), 'username' => $this->io->ask('Username: ', $defaultUsername),
'password' => $this->io->askAndHideAnswer('Password: '), 'password' => $this->io->askAndHideAnswer('Password: '),
); );
} }