Merge branch '3.1'
* 3.1: [Console] SymfonyStyle: Align multi-line/very-long-line blocks [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut Fix js comment in profiler [Ldap] Fixed issue with Entry password attribute containing array of values and made password attribute configurable [Serializer][#18837] adding a test [Cache] Drop counting hit/miss in ProxyAdapter [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called [Serializer] ObjectNormalizer: add missing parameters
This commit is contained in:
commit
5f328e0915
@ -35,6 +35,7 @@ class LdapFactory implements UserProviderFactoryInterface
|
|||||||
->replaceArgument(4, $config['default_roles'])
|
->replaceArgument(4, $config['default_roles'])
|
||||||
->replaceArgument(5, $config['uid_key'])
|
->replaceArgument(5, $config['uid_key'])
|
||||||
->replaceArgument(6, $config['filter'])
|
->replaceArgument(6, $config['filter'])
|
||||||
|
->replaceArgument(7, $config['password_attribute'])
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,6 +59,7 @@ class LdapFactory implements UserProviderFactoryInterface
|
|||||||
->end()
|
->end()
|
||||||
->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()
|
->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()
|
||||||
->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()
|
->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()
|
||||||
|
->scalarNode('password_attribute')->defaultNull()->end()
|
||||||
->end()
|
->end()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
@ -83,8 +83,8 @@
|
|||||||
requestStack = [],
|
requestStack = [],
|
||||||
|
|
||||||
extractHeaders = function(xhr, stackElement) {
|
extractHeaders = function(xhr, stackElement) {
|
||||||
// Here we avoid to call xhr.getResponseHeader in order to
|
/* Here we avoid to call xhr.getResponseHeader in order to */
|
||||||
// prevent polluting the console with CORS security errors
|
/* prevent polluting the console with CORS security errors */
|
||||||
var allHeaders = xhr.getAllResponseHeaders();
|
var allHeaders = xhr.getAllResponseHeaders();
|
||||||
var ret;
|
var ret;
|
||||||
|
|
||||||
|
@ -24,8 +24,6 @@ class ProxyAdapter implements AdapterInterface
|
|||||||
private $namespace;
|
private $namespace;
|
||||||
private $namespaceLen;
|
private $namespaceLen;
|
||||||
private $createCacheItem;
|
private $createCacheItem;
|
||||||
private $hits = 0;
|
|
||||||
private $misses = 0;
|
|
||||||
|
|
||||||
public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
|
public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
|
||||||
{
|
{
|
||||||
@ -54,13 +52,8 @@ class ProxyAdapter implements AdapterInterface
|
|||||||
{
|
{
|
||||||
$f = $this->createCacheItem;
|
$f = $this->createCacheItem;
|
||||||
$item = $this->pool->getItem($this->getId($key));
|
$item = $this->pool->getItem($this->getId($key));
|
||||||
if ($isHit = $item->isHit()) {
|
|
||||||
++$this->hits;
|
|
||||||
} else {
|
|
||||||
++$this->misses;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $f($key, $item->get(), $isHit);
|
return $f($key, $item->get(), $item->isHit());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -158,39 +151,14 @@ class ProxyAdapter implements AdapterInterface
|
|||||||
$f = $this->createCacheItem;
|
$f = $this->createCacheItem;
|
||||||
|
|
||||||
foreach ($items as $key => $item) {
|
foreach ($items as $key => $item) {
|
||||||
if ($isHit = $item->isHit()) {
|
|
||||||
++$this->hits;
|
|
||||||
} else {
|
|
||||||
++$this->misses;
|
|
||||||
}
|
|
||||||
if ($this->namespaceLen) {
|
if ($this->namespaceLen) {
|
||||||
$key = substr($key, $this->namespaceLen);
|
$key = substr($key, $this->namespaceLen);
|
||||||
}
|
}
|
||||||
|
|
||||||
yield $key => $f($key, $item->get(), $isHit);
|
yield $key => $f($key, $item->get(), $item->isHit());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the number of cache read hits.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function getHits()
|
|
||||||
{
|
|
||||||
return $this->hits;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the number of cache read misses.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function getMisses()
|
|
||||||
{
|
|
||||||
return $this->misses;
|
|
||||||
}
|
|
||||||
|
|
||||||
private function getId($key)
|
private function getId($key)
|
||||||
{
|
{
|
||||||
CacheItem::validateKey($key);
|
CacheItem::validateKey($key);
|
||||||
|
@ -29,21 +29,4 @@ class ProxyAdapterTest extends CachePoolTest
|
|||||||
{
|
{
|
||||||
return new ProxyAdapter(new ArrayAdapter());
|
return new ProxyAdapter(new ArrayAdapter());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetHitsMisses()
|
|
||||||
{
|
|
||||||
$pool = $this->createCachePool();
|
|
||||||
|
|
||||||
$this->assertSame(0, $pool->getHits());
|
|
||||||
$this->assertSame(0, $pool->getMisses());
|
|
||||||
|
|
||||||
$bar = $pool->getItem('bar');
|
|
||||||
$this->assertSame(0, $pool->getHits());
|
|
||||||
$this->assertSame(1, $pool->getMisses());
|
|
||||||
|
|
||||||
$pool->save($bar->set('baz'));
|
|
||||||
$bar = $pool->getItem('bar');
|
|
||||||
$this->assertSame(1, $pool->getHits());
|
|
||||||
$this->assertSame(1, $pool->getMisses());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -300,14 +300,14 @@ class Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
||||||
|
|
||||||
if ($mergeArgs) {
|
if ($mergeArgs) {
|
||||||
$currentArguments = $this->definition->getArguments();
|
$currentArguments = $this->definition->getArguments();
|
||||||
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
$this->definition->setArguments($this->application->getDefinition()->getArguments());
|
||||||
$this->definition->addArguments($currentArguments);
|
$this->definition->addArguments($currentArguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->definition->addOptions($this->application->getDefinition()->getOptions());
|
|
||||||
|
|
||||||
$this->applicationDefinitionMerged = true;
|
$this->applicationDefinitionMerged = true;
|
||||||
if ($mergeArgs) {
|
if ($mergeArgs) {
|
||||||
$this->applicationDefinitionMergedWithArgs = true;
|
$this->applicationDefinitionMergedWithArgs = true;
|
||||||
|
@ -68,23 +68,36 @@ class SymfonyStyle extends OutputStyle
|
|||||||
{
|
{
|
||||||
$this->autoPrependBlock();
|
$this->autoPrependBlock();
|
||||||
$messages = is_array($messages) ? array_values($messages) : array($messages);
|
$messages = is_array($messages) ? array_values($messages) : array($messages);
|
||||||
|
$indentLength = 0;
|
||||||
$lines = array();
|
$lines = array();
|
||||||
|
|
||||||
// add type
|
|
||||||
if (null !== $type) {
|
if (null !== $type) {
|
||||||
$messages[0] = sprintf('[%s] %s', $type, $messages[0]);
|
$typePrefix = sprintf('[%s] ', $type);
|
||||||
|
$indentLength = strlen($typePrefix);
|
||||||
|
$lineIndentation = str_repeat(' ', $indentLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
// wrap and add newlines for each element
|
// wrap and add newlines for each element
|
||||||
foreach ($messages as $key => $message) {
|
foreach ($messages as $key => $message) {
|
||||||
$message = OutputFormatter::escape($message);
|
$message = OutputFormatter::escape($message);
|
||||||
$lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
|
$lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix) - $indentLength, PHP_EOL, true)));
|
||||||
|
|
||||||
|
// prefix each line with a number of spaces equivalent to the type length
|
||||||
|
if (null !== $type) {
|
||||||
|
foreach ($lines as &$line) {
|
||||||
|
$line = $lineIndentation === substr($line, 0, $indentLength) ? $line : $lineIndentation.$line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (count($messages) > 1 && $key < count($messages) - 1) {
|
if (count($messages) > 1 && $key < count($messages) - 1) {
|
||||||
$lines[] = '';
|
$lines[] = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (null !== $type) {
|
||||||
|
$lines[0] = substr_replace($lines[0], $typePrefix, 0, $indentLength);
|
||||||
|
}
|
||||||
|
|
||||||
if ($padding && $this->isDecorated()) {
|
if ($padding && $this->isDecorated()) {
|
||||||
array_unshift($lines, '');
|
array_unshift($lines, '');
|
||||||
$lines[] = '';
|
$lines[] = '';
|
||||||
|
@ -733,6 +733,33 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
|
$this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \LogicException
|
||||||
|
* @expectedExceptionMessage An option with shortcut "e" already exists.
|
||||||
|
*/
|
||||||
|
public function testAddingOptionWithDuplicateShortcut()
|
||||||
|
{
|
||||||
|
$dispatcher = new EventDispatcher();
|
||||||
|
$application = new Application();
|
||||||
|
$application->setAutoExit(false);
|
||||||
|
$application->setCatchExceptions(false);
|
||||||
|
$application->setDispatcher($dispatcher);
|
||||||
|
|
||||||
|
$application->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'Environment'));
|
||||||
|
|
||||||
|
$application
|
||||||
|
->register('foo')
|
||||||
|
->setAliases(['f'])
|
||||||
|
->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
|
||||||
|
->setCode(function (InputInterface $input, OutputInterface $output) {})
|
||||||
|
;
|
||||||
|
|
||||||
|
$input = new ArrayInput(array('command' => 'foo'));
|
||||||
|
$output = new NullOutput();
|
||||||
|
|
||||||
|
$application->run($input, $output);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException \LogicException
|
* @expectedException \LogicException
|
||||||
* @dataProvider getAddingAlreadySetDefinitionElementData
|
* @dataProvider getAddingAlreadySetDefinitionElementData
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
|
||||||
|
|
||||||
|
//Ensure that all lines are aligned to the begin of the first line in a very long line block
|
||||||
|
return function (InputInterface $input, OutputInterface $output) {
|
||||||
|
$output = new SymfonyStyleWithForcedLineLength($input, $output);
|
||||||
|
$output->block(
|
||||||
|
'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum',
|
||||||
|
'CUSTOM',
|
||||||
|
'fg=white;bg=green',
|
||||||
|
'X ',
|
||||||
|
true
|
||||||
|
);
|
||||||
|
};
|
@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Tests\Style\SymfonyStyleWithForcedLineLength;
|
||||||
|
|
||||||
|
//Ensure that all lines are aligned to the begin of the first line in a multi-line block
|
||||||
|
return function (InputInterface $input, OutputInterface $output) {
|
||||||
|
$output = new SymfonyStyleWithForcedLineLength($input, $output);
|
||||||
|
$output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
|
||||||
|
};
|
@ -0,0 +1,7 @@
|
|||||||
|
|
||||||
|
X [CUSTOM] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
|
||||||
|
X dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
|
||||||
|
X commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
|
||||||
|
X nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
|
||||||
|
X anim id est laborum
|
||||||
|
|
@ -0,0 +1,5 @@
|
|||||||
|
|
||||||
|
X [CUSTOM] Custom block
|
||||||
|
X
|
||||||
|
X Second custom block line
|
||||||
|
|
@ -57,7 +57,7 @@ class SymfonyStyleTest extends PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function testLongWordsBlockWrapping()
|
public function testLongWordsBlockWrapping()
|
||||||
{
|
{
|
||||||
$word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
|
$word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygovgollhjvhvljfezefeqifzeiqgiqzhrsdgihqzridghqridghqirshdghdghieridgheirhsdgehrsdvhqrsidhqshdgihrsidvqhneriqsdvjzergetsrfhgrstsfhsetsfhesrhdgtesfhbzrtfbrztvetbsdfbrsdfbrn';
|
||||||
$wordLength = strlen($word);
|
$wordLength = strlen($word);
|
||||||
$maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
|
$maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
|
||||||
|
|
||||||
|
@ -105,7 +105,10 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||||||
$provider->loadUserByUsername('foo');
|
$provider->loadUserByUsername('foo');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSuccessfulLoadUserByUsername()
|
/**
|
||||||
|
* @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
|
||||||
{
|
{
|
||||||
$result = $this->getMock(CollectionInterface::class);
|
$result = $this->getMock(CollectionInterface::class);
|
||||||
$query = $this->getMock(QueryInterface::class);
|
$query = $this->getMock(QueryInterface::class);
|
||||||
@ -120,8 +123,95 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||||||
->method('offsetGet')
|
->method('offsetGet')
|
||||||
->with(0)
|
->with(0)
|
||||||
->will($this->returnValue(new Entry('foo', array(
|
->will($this->returnValue(new Entry('foo', array(
|
||||||
'sAMAccountName' => 'foo',
|
'sAMAccountName' => array('foo'),
|
||||||
'userpassword' => 'bar',
|
'userpassword' => array('bar', 'baz'),
|
||||||
|
)
|
||||||
|
)))
|
||||||
|
;
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('count')
|
||||||
|
->will($this->returnValue(1))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('escape')
|
||||||
|
->will($this->returnValue('foo'))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('query')
|
||||||
|
->will($this->returnValue($query))
|
||||||
|
;
|
||||||
|
|
||||||
|
$provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
|
||||||
|
$this->assertInstanceOf(
|
||||||
|
'Symfony\Component\Security\Core\User\User',
|
||||||
|
$provider->loadUserByUsername('foo')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
|
||||||
|
{
|
||||||
|
$result = $this->getMock(CollectionInterface::class);
|
||||||
|
$query = $this->getMock(QueryInterface::class);
|
||||||
|
$query
|
||||||
|
->expects($this->once())
|
||||||
|
->method('execute')
|
||||||
|
->will($this->returnValue($result))
|
||||||
|
;
|
||||||
|
$ldap = $this->getMock(LdapInterface::class);
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('offsetGet')
|
||||||
|
->with(0)
|
||||||
|
->will($this->returnValue(new Entry('foo', array(
|
||||||
|
'sAMAccountName' => array('foo'),
|
||||||
|
)
|
||||||
|
)))
|
||||||
|
;
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('count')
|
||||||
|
->will($this->returnValue(1))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('escape')
|
||||||
|
->will($this->returnValue('foo'))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('query')
|
||||||
|
->will($this->returnValue($query))
|
||||||
|
;
|
||||||
|
|
||||||
|
$provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
|
||||||
|
$this->assertInstanceOf(
|
||||||
|
'Symfony\Component\Security\Core\User\User',
|
||||||
|
$provider->loadUserByUsername('foo')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
|
||||||
|
{
|
||||||
|
$result = $this->getMock(CollectionInterface::class);
|
||||||
|
$query = $this->getMock(QueryInterface::class);
|
||||||
|
$query
|
||||||
|
->expects($this->once())
|
||||||
|
->method('execute')
|
||||||
|
->will($this->returnValue($result))
|
||||||
|
;
|
||||||
|
$ldap = $this->getMock(LdapInterface::class);
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('offsetGet')
|
||||||
|
->with(0)
|
||||||
|
->will($this->returnValue(new Entry('foo', array(
|
||||||
|
'sAMAccountName' => array('foo'),
|
||||||
)
|
)
|
||||||
)))
|
)))
|
||||||
;
|
;
|
||||||
@ -147,4 +237,47 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||||||
$provider->loadUserByUsername('foo')
|
$provider->loadUserByUsername('foo')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
|
||||||
|
{
|
||||||
|
$result = $this->getMock(CollectionInterface::class);
|
||||||
|
$query = $this->getMock(QueryInterface::class);
|
||||||
|
$query
|
||||||
|
->expects($this->once())
|
||||||
|
->method('execute')
|
||||||
|
->will($this->returnValue($result))
|
||||||
|
;
|
||||||
|
$ldap = $this->getMock(LdapInterface::class);
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('offsetGet')
|
||||||
|
->with(0)
|
||||||
|
->will($this->returnValue(new Entry('foo', array(
|
||||||
|
'sAMAccountName' => array('foo'),
|
||||||
|
'userpassword' => array('bar'),
|
||||||
|
)
|
||||||
|
)))
|
||||||
|
;
|
||||||
|
$result
|
||||||
|
->expects($this->once())
|
||||||
|
->method('count')
|
||||||
|
->will($this->returnValue(1))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('escape')
|
||||||
|
->will($this->returnValue('foo'))
|
||||||
|
;
|
||||||
|
$ldap
|
||||||
|
->expects($this->once())
|
||||||
|
->method('query')
|
||||||
|
->will($this->returnValue($query))
|
||||||
|
;
|
||||||
|
|
||||||
|
$provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})', 'userpassword');
|
||||||
|
$this->assertInstanceOf(
|
||||||
|
'Symfony\Component\Security\Core\User\User',
|
||||||
|
$provider->loadUserByUsername('foo')
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
namespace Symfony\Component\Security\Core\User;
|
namespace Symfony\Component\Security\Core\User;
|
||||||
|
|
||||||
use Symfony\Component\Ldap\Entry;
|
use Symfony\Component\Ldap\Entry;
|
||||||
|
use Symfony\Component\Security\Core\Exception\InvalidArgumentException;
|
||||||
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
|
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
|
||||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
||||||
use Symfony\Component\Ldap\Exception\ConnectionException;
|
use Symfony\Component\Ldap\Exception\ConnectionException;
|
||||||
@ -31,6 +32,7 @@ class LdapUserProvider implements UserProviderInterface
|
|||||||
private $searchPassword;
|
private $searchPassword;
|
||||||
private $defaultRoles;
|
private $defaultRoles;
|
||||||
private $defaultSearch;
|
private $defaultSearch;
|
||||||
|
private $passwordAttribute;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param LdapInterface $ldap
|
* @param LdapInterface $ldap
|
||||||
@ -41,7 +43,7 @@ class LdapUserProvider implements UserProviderInterface
|
|||||||
* @param string $uidKey
|
* @param string $uidKey
|
||||||
* @param string $filter
|
* @param string $filter
|
||||||
*/
|
*/
|
||||||
public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})')
|
public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})', $passwordAttribute = null)
|
||||||
{
|
{
|
||||||
$this->ldap = $ldap;
|
$this->ldap = $ldap;
|
||||||
$this->baseDn = $baseDn;
|
$this->baseDn = $baseDn;
|
||||||
@ -49,6 +51,7 @@ class LdapUserProvider implements UserProviderInterface
|
|||||||
$this->searchPassword = $searchPassword;
|
$this->searchPassword = $searchPassword;
|
||||||
$this->defaultRoles = $defaultRoles;
|
$this->defaultRoles = $defaultRoles;
|
||||||
$this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter);
|
$this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter);
|
||||||
|
$this->passwordAttribute = $passwordAttribute;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -99,8 +102,42 @@ class LdapUserProvider implements UserProviderInterface
|
|||||||
return $class === 'Symfony\Component\Security\Core\User\User';
|
return $class === 'Symfony\Component\Security\Core\User\User';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads a user from an LDAP entry.
|
||||||
|
*
|
||||||
|
* @param string $username
|
||||||
|
* @param Entry $entry
|
||||||
|
*
|
||||||
|
* @return User
|
||||||
|
*/
|
||||||
private function loadUser($username, Entry $entry)
|
private function loadUser($username, Entry $entry)
|
||||||
{
|
{
|
||||||
return new User($username, $entry->getAttribute('userpassword'), $this->defaultRoles);
|
$password = $this->getPassword($entry);
|
||||||
|
|
||||||
|
return new User($username, $password, $this->defaultRoles);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetches the password from an LDAP entry.
|
||||||
|
*
|
||||||
|
* @param null|Entry $entry
|
||||||
|
*/
|
||||||
|
private function getPassword(Entry $entry)
|
||||||
|
{
|
||||||
|
if (null === $this->passwordAttribute) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$entry->hasAttribute($this->passwordAttribute)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Missing attribute "%s" for user "%s".', $this->passwordAttribute, $entry->getDn()));
|
||||||
|
}
|
||||||
|
|
||||||
|
$values = $entry->getAttribute($this->passwordAttribute);
|
||||||
|
|
||||||
|
if (1 !== count($values)) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $this->passwordAttribute));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $values[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -182,10 +182,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
|
|||||||
$attribute = $this->nameConverter->denormalize($attribute);
|
$attribute = $this->nameConverter->denormalize($attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
$allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
|
if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
|
||||||
$ignored = in_array($attribute, $this->ignoredAttributes);
|
|
||||||
|
|
||||||
if (!$allowed || $ignored) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,14 +68,14 @@ class ObjectNormalizer extends AbstractObjectNormalizer
|
|||||||
$attributeName = lcfirst(substr($name, 2));
|
$attributeName = lcfirst(substr($name, 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName)) {
|
if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName, $format, $context)) {
|
||||||
$attributes[$attributeName] = true;
|
$attributes[$attributeName] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// properties
|
// properties
|
||||||
foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
|
foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
|
||||||
if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name)) {
|
if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,55 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Serializer\Tests\Normalizer;
|
||||||
|
|
||||||
|
use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
|
||||||
|
|
||||||
|
class AbstractObjectNormalizerTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
public function testDenormalize()
|
||||||
|
{
|
||||||
|
$normalizer = new AbstractObjectNormalizerDummy();
|
||||||
|
$normalizedData = $normalizer->denormalize(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), __NAMESPACE__.'\Dummy');
|
||||||
|
|
||||||
|
$this->assertSame('foo', $normalizedData->foo);
|
||||||
|
$this->assertNull($normalizedData->bar);
|
||||||
|
$this->assertSame('baz', $normalizedData->baz);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
|
||||||
|
{
|
||||||
|
protected function extractAttributes($object, $format = null, array $context = array())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array())
|
||||||
|
{
|
||||||
|
$object->$attribute = $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function isAllowedAttribute($classOrObject, $attribute, $format = null, array $context = array())
|
||||||
|
{
|
||||||
|
return in_array($attribute, array('foo', 'baz'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Dummy
|
||||||
|
{
|
||||||
|
public $foo;
|
||||||
|
public $bar;
|
||||||
|
public $baz;
|
||||||
|
}
|
Reference in New Issue
Block a user