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

Remove password prompt for github tokens and require the user creates a token themselves

pull/4010/head
Jordi Boggiano 2015-05-07 00:29:20 +01:00
parent 8825ed9a59
commit e16d53893e
2 changed files with 36 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/Composer/Util/GitHub.php
View File

@ -80,124 +80,49 @@ class GitHub
$this->io->writeError($message);
}
$this->io->writeError(sprintf('A token will be created and stored in "%s", your password will never be stored', $this->config->getAuthConfigSource()->getName()));
$this->io->writeError('To revoke access to this token you can visit https://github.com/settings/applications');
$note = 'Composer';
if ($this->config->get('github-expose-hostname') === true && 0 === $this->process->execute('hostname', $output)) {
$note .= ' on ' . trim($output);
}
$note .= ' ' . date('Y-m-d Hi');
$otp = null;
$attemptCounter = 0;
$url = 'https://'.$originUrl.'/settings/tokens/new?scopes=repo&description=' . str_replace('%20', '+', rawurlencode($note));
$this->io->writeError(sprintf('Head to %s', $url));
$this->io->writeError(sprintf('to retrieve a token. It will be stored in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName()));
$token = $this->io->askAndHideAnswer('Token (hidden): ');
if (!$token) {
$this->io->writeError('<warning>No token given, aborting.</warning>');
$this->io->writeError('You can also add it manually later by using "composer config github-oauth.github.com <token>"');
return false;
}
$this->io->setAuthentication($originUrl, $token, 'x-oauth-basic');
while ($attemptCounter++ < 5) {
try {
$response = $this->createToken($originUrl, $otp);
$apiUrl = ('github.com' === $originUrl) ? 'api.github.com' : $originUrl . '/api/v3';
$this->remoteFilesystem->getContents($originUrl, 'https://'. $apiUrl . '/rate_limit', false, array(
'retry-auth-failure' => false,
));
} catch (TransportException $e) {
// https://developer.github.com/v3/#authentication && https://developer.github.com/v3/auth/#working-with-two-factor-authentication
// 401 is bad credentials, or missing otp code
// 403 is max login attempts exceeded
if (in_array($e->getCode(), array(403, 401))) {
// in case of a 401, and authentication was previously provided
if (401 === $e->getCode() && $this->io->hasAuthentication($originUrl)) {
// check for the presence of otp headers and get otp code from user
$otp = $this->checkTwoFactorAuthentication($e->getHeaders());
// if given, retry creating a token using the user provided code
if (null !== $otp) {
continue;
}
}
$this->io->writeError('<error>Invalid token provided.</error>');
$this->io->writeError('You can also add it manually later by using "composer config github-oauth.github.com <token>"');
if (401 === $e->getCode()) {
$this->io->writeError('Bad credentials.');
} else {
$this->io->writeError('Maximum number of login attempts exceeded. Please try again later.');
}
$this->io->writeError('You can also manually create a personal token at https://github.com/settings/applications');
$this->io->writeError('Add it using "composer config github-oauth.github.com <token>"');
continue;
return false;
}
throw $e;
}
$this->io->setAuthentication($originUrl, $response['token'], 'x-oauth-basic');
$this->config->getConfigSource()->removeConfigSetting('github-oauth.'.$originUrl);
// store value in user config
$this->config->getAuthConfigSource()->addConfigSetting('github-oauth.'.$originUrl, $response['token']);
$this->config->getConfigSource()->removeConfigSetting('github-oauth.'.$originUrl);
$this->config->getAuthConfigSource()->addConfigSetting('github-oauth.'.$originUrl, $token);
$this->io->writeError('<info>Token stored successfully.</info>');
return true;
}
throw new \RuntimeException("Invalid GitHub credentials 5 times in a row, aborting.");
}
private function createToken($originUrl, $otp = null)
{
if (null === $otp || !$this->io->hasAuthentication($originUrl)) {
$username = $this->io->ask('Username: ');
$password = $this->io->askAndHideAnswer('Password: ');
$this->io->setAuthentication($originUrl, $username, $password);
}
$headers = array('Content-Type: application/json');
if ($otp) {
$headers[] = 'X-GitHub-OTP: ' . $otp;
}
$note = 'Composer';
if ($this->config->get('github-expose-hostname') === true && 0 === $this->process->execute('hostname', $output)) {
$note .= ' on ' . trim($output);
}
$note .= ' [' . date('YmdHis') . ']';
$apiUrl = ('github.com' === $originUrl) ? 'api.github.com' : $originUrl . '/api/v3';
$json = $this->remoteFilesystem->getContents($originUrl, 'https://'. $apiUrl . '/authorizations', false, array(
'retry-auth-failure' => false,
'http' => array(
'method' => 'POST',
'follow_location' => false,
'header' => $headers,
'content' => json_encode(array(
'scopes' => array('repo'),
'note' => $note,
'note_url' => 'https://getcomposer.org/',
)),
)
));
$this->io->writeError('Token successfully created');
return JsonFile::parseJson($json);
}
private function checkTwoFactorAuthentication(array $headers)
{
$headerNames = array_map(
function ($header) {
return strtolower(strstr($header, ':', true));
},
$headers
);
if (false !== ($key = array_search('x-github-otp', $headerNames))) {
list($required, $method) = array_map('trim', explode(';', substr(strstr($headers[$key], ':'), 1)));
if ('required' === $required) {
$this->io->writeError('Two-factor Authentication');
if ('app' === $method) {
$this->io->writeError('Open the two-factor authentication app on your device to view your authentication code and verify your identity.');
}
if ('sms' === $method) {
$this->io->writeError('You have been sent an SMS message with an authentication code to verify your identity.');
}
return $this->io->ask('Authentication Code: ');
}
}
return null;
}
}

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

@ -342,7 +342,7 @@ class RemoteFilesystem
protected function promptAuthAndRetry($httpStatus, $reason = null)
{
if ($this->config && in_array($this->originUrl, $this->config->get('github-domains'), true)) {
$message = "\n".'Could not fetch '.$this->fileUrl.', enter your GitHub credentials '.($httpStatus === 404 ? 'to access private repos' : 'to go over the API rate limit');
$message = "\n".'Could not fetch '.$this->fileUrl.', please create a GitHub OAuth token '.($httpStatus === 404 ? 'to access private repos' : 'to go over the API rate limit');
$gitHubUtil = new GitHub($this->io, $this->config, null);
if (!$gitHubUtil->authorizeOAuth($this->originUrl)
&& (!$this->io->isInteractive() || !$gitHubUtil->authorizeOAuthInteractively($this->originUrl, $message))