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

Merge pull request #377 from till/svn-auth 

Svn auth
pull/408/head
Jordi Boggiano 2012-03-08 01:59:51 -08:00
parent ecaf20b790 adfac9e34b
commit ae6de4be60
3 changed files with 157 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/composer.phar
/vendor
/nbproject
phpunit.xml

115
src/Composer/Repository/Vcs/SvnDriver.php
View File

@ -16,6 +16,21 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
protected $branches;
protected $infoCache = array();
/**
* @var boolean $useAuth Contains credentials, or not?
*/
protected $useAuth = false;
/**
* @var string $svnUsername
*/
protected $svnUsername = '';
/**
* @var string $svnPassword
*/
protected $svnPassword = '';
public function __construct($url, IOInterface $io, ProcessExecutor $process = null)
{
parent::__construct($this->baseUrl = rtrim($url, '/'), $io, $process);
@ -23,6 +38,8 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
if (false !== ($pos = strrpos($url, '/trunk'))) {
$this->baseUrl = substr($url, 0, $pos);
}
$this->detectSvnAuth();
}
/**
@ -81,7 +98,14 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
$rev = '';
}
$this->process->execute(sprintf('svn cat --non-interactive %s', escapeshellarg($this->baseUrl.$identifier.'composer.json'.$rev)), $composer);
$this->process->execute(
sprintf(
'svn cat --non-interactive %s %s',
$this->getSvnCredentialString(),
escapeshellarg($this->baseUrl.$identifier.'composer.json'.$rev)
),
$composer
);
if (!trim($composer)) {
throw new \UnexpectedValueException('Failed to retrieve composer information for identifier '.$identifier.' in '.$this->getUrl());
@ -90,7 +114,14 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
$composer = JsonFile::parseJson($composer);
if (!isset($composer['time'])) {
$this->process->execute(sprintf('svn info %s', escapeshellarg($this->baseUrl.$identifier.$rev)), $output);
$this->process->execute(
sprintf(
'svn info %s %s',
$this->getSvnCredentialString(),
escapeshellarg($this->baseUrl.$identifier.$rev)
),
$output
);
foreach ($this->process->splitLines($output) as $line) {
if ($line && preg_match('{^Last Changed Date: ([^(]+)}', $line, $match)) {
$date = new \DateTime($match[1]);
@ -111,7 +142,14 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
public function getTags()
{
if (null === $this->tags) {
$this->process->execute(sprintf('svn ls --non-interactive %s', escapeshellarg($this->baseUrl.'/tags')), $output);
$this->process->execute(
sprintf(
'svn ls --non-interactive %s %s',
$this->getSvnCredentialString(),
escapeshellarg($this->baseUrl.'/tags')
),
$output
);
$this->tags = array();
foreach ($this->process->splitLines($output) as $tag) {
if ($tag) {
@ -129,7 +167,14 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
public function getBranches()
{
if (null === $this->branches) {
$this->process->execute(sprintf('svn ls --verbose --non-interactive %s', escapeshellarg($this->baseUrl.'/')), $output);
$this->process->execute(
sprintf(
'svn ls --verbose --non-interactive %s %s',
$this->getSvnCredentialString(),
escapeshellarg($this->baseUrl.'/')
),
$output
);
$this->branches = array();
foreach ($this->process->splitLines($output) as $line) {
@ -141,7 +186,14 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
}
unset($output);
$this->process->execute(sprintf('svn ls --verbose --non-interactive %s', escapeshellarg($this->baseUrl.'/branches')), $output);
$this->process->execute(
sprintf(
'svn ls --verbose --non-interactive %s',
$this->getSvnCredentialString(),
escapeshellarg($this->baseUrl.'/branches')
),
$output
);
foreach ($this->process->splitLines(trim($output)) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match);
if ($match[2] === './') {
@ -154,6 +206,26 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
return $this->branches;
}
/**
* Return the credential string for the svn command.
*
* --no-auth-cache when credentials are present
*
* @return string
*/
public function getSvnCredentialString()
{
if ($this->useAuth !== true) {
return '';
}
$str = ' --no-auth-cache --username %s --password %s ';
return sprintf(
$str,
escapeshellarg($this->svnUsername),
escapeshellarg($this->svnPassword)
);
}
/**
* {@inheritDoc}
*/
@ -183,7 +255,38 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
$processExecutor = new ProcessExecutor();
$exit = $processExecutor->execute(sprintf('svn info --non-interactive %s 2>/dev/null', escapeshellarg($url)), $ignored);
$exit = $processExecutor->execute(
sprintf(
'svn info --non-interactive %s %s 2>/dev/null',
$this->getSvnCredentialString(),
escapeshellarg($url)
),
$ignored
);
return $exit === 0;
}
/**
* This is quick and dirty - thoughts?
*
* @return void
* @uses parent::$baseUrl
* @uses self::$useAuth, self::$svnUsername, self::$svnPassword
* @see self::__construct()
*/
protected function detectSvnAuth()
{
$uri = parse_url($this->baseUrl);
if (empty($uri['user'])) {
return;
}
$this->svnUsername = $uri['user'];
if (!empty($uri['pass'])) {
$this->svnPassword = $uri['pass'];
}
$this->useAuth = true;
}
}

47
tests/Composer/Test/Repository/Vcs/SvnDriverTest.php Normal file
View File

@ -0,0 +1,47 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Repository\Vcs;
use Composer\Repository\Vcs\SvnDriver;
use Composer\IO\NullIO;
/**
* @author Till Klampaeckel <till@php.net>
*/
class SvnDriverTest extends \PHPUnit_Framework_TestCase
{
/**
* Provide some examples for {@self::testCredentials()}.
*
* @return array
*/
public static function urlProvider()
{
return array(
array('http://till:test@svn.example.org/', " --no-auth-cache --username 'till' --password 'test' "),
array('http://svn.apache.org/', ''),
array('svn://johndoe@example.org', " --no-auth-cache --username 'johndoe' --password '' "),
);
}
/**
* @dataProvider urlProvider
*/
public function testCredentials($url, $expect)
{
$io = new \Composer\IO\NullIO;
$svn = new SvnDriver($url, $io);
$this->assertEquals($expect, $svn->getSvnCredentialString());
}
}