Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap
fix writing to cache when fallback server should be used immediately
This commit is contained in:
commit
31ee463690
|
@ -179,6 +179,16 @@ class Connection extends LDAPUtility {
|
||||||
return $this->ldapConnectionRes;
|
return $this->ldapConnectionRes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* resets the connection resource
|
||||||
|
*/
|
||||||
|
public function resetConnectionResource() {
|
||||||
|
if(!is_null($this->ldapConnectionRes)) {
|
||||||
|
@$this->ldap->unbind($this->ldapConnectionRes);
|
||||||
|
$this->ldapConnectionRes = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string|null $key
|
* @param string|null $key
|
||||||
* @return string
|
* @return string
|
||||||
|
@ -530,7 +540,7 @@ class Connection extends LDAPUtility {
|
||||||
}
|
}
|
||||||
|
|
||||||
$bindStatus = false;
|
$bindStatus = false;
|
||||||
$error = null;
|
$error = -1;
|
||||||
try {
|
try {
|
||||||
if (!$this->configuration->ldapOverrideMainServer
|
if (!$this->configuration->ldapOverrideMainServer
|
||||||
&& !$this->getFromCache('overrideMainServer')
|
&& !$this->getFromCache('overrideMainServer')
|
||||||
|
@ -558,7 +568,7 @@ class Connection extends LDAPUtility {
|
||||||
$this->doConnect($this->configuration->ldapBackupHost,
|
$this->doConnect($this->configuration->ldapBackupHost,
|
||||||
$this->configuration->ldapBackupPort);
|
$this->configuration->ldapBackupPort);
|
||||||
$bindStatus = $this->bind();
|
$bindStatus = $this->bind();
|
||||||
if($bindStatus && $error === -1) {
|
if($bindStatus && $error === -1 && !$this->getFromCache('overrideMainServer')) {
|
||||||
//when bind to backup server succeeded and failed to main server,
|
//when bind to backup server succeeded and failed to main server,
|
||||||
//skip contacting him until next cache refresh
|
//skip contacting him until next cache refresh
|
||||||
$this->writeToCache('overrideMainServer', true);
|
$this->writeToCache('overrideMainServer', true);
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\user_ldap\tests;
|
namespace OCA\user_ldap\tests;
|
||||||
|
use OCA\user_ldap\lib\Connection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Test_Connection
|
* Class Test_Connection
|
||||||
|
@ -32,6 +33,26 @@ namespace OCA\user_ldap\tests;
|
||||||
* @package OCA\user_ldap\tests
|
* @package OCA\user_ldap\tests
|
||||||
*/
|
*/
|
||||||
class Test_Connection extends \Test\TestCase {
|
class Test_Connection extends \Test\TestCase {
|
||||||
|
/** @var \OCA\user_ldap\lib\ILDAPWrapper */
|
||||||
|
protected $ldap;
|
||||||
|
|
||||||
|
/** @var Connection */
|
||||||
|
protected $connection;
|
||||||
|
|
||||||
|
public function setUp() {
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
$this->ldap = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
|
||||||
|
// we use a mock here to replace the cache mechanism, due to missing DI in LDAP backend.
|
||||||
|
$this->connection = $this->getMockBuilder('OCA\user_ldap\lib\Connection')
|
||||||
|
->setMethods(['getFromCache', 'writeToCache'])
|
||||||
|
->setConstructorArgs([$this->ldap, '', null])
|
||||||
|
->getMock();
|
||||||
|
|
||||||
|
$this->ldap->expects($this->any())
|
||||||
|
->method('areLDAPFunctionsAvailable')
|
||||||
|
->will($this->returnValue(true));
|
||||||
|
}
|
||||||
|
|
||||||
public function testOriginalAgentUnchangedOnClone() {
|
public function testOriginalAgentUnchangedOnClone() {
|
||||||
//background: upon login a bind is done with the user credentials
|
//background: upon login a bind is done with the user credentials
|
||||||
|
@ -39,7 +60,7 @@ class Test_Connection extends \Test\TestCase {
|
||||||
//to the agent's credentials
|
//to the agent's credentials
|
||||||
$lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
|
$lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
|
||||||
|
|
||||||
$connection = new \OCA\user_ldap\lib\Connection($lw, '', null);
|
$connection = new Connection($lw, '', null);
|
||||||
$agent = array(
|
$agent = array(
|
||||||
'ldapAgentName' => 'agent',
|
'ldapAgentName' => 'agent',
|
||||||
'ldapAgentPassword' => '123456',
|
'ldapAgentPassword' => '123456',
|
||||||
|
@ -60,4 +81,59 @@ class Test_Connection extends \Test\TestCase {
|
||||||
$this->assertSame($agentPawd, $agent['ldapAgentPassword']);
|
$this->assertSame($agentPawd, $agent['ldapAgentPassword']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testUseBackupServer() {
|
||||||
|
$mainHost = 'ldap://nixda.ldap';
|
||||||
|
$backupHost = 'ldap://fallback.ldap';
|
||||||
|
$config = [
|
||||||
|
'ldapConfigurationActive' => true,
|
||||||
|
'ldapHost' => $mainHost,
|
||||||
|
'ldapPort' => 389,
|
||||||
|
'ldapBackupHost' => $backupHost,
|
||||||
|
'ldapBackupPort' => 389,
|
||||||
|
'ldapAgentName' => 'uid=agent',
|
||||||
|
'ldapAgentPassword' => 'SuchASecret'
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->connection->setIgnoreValidation(true);
|
||||||
|
$this->connection->setConfiguration($config);
|
||||||
|
|
||||||
|
$this->ldap->expects($this->any())
|
||||||
|
->method('isResource')
|
||||||
|
->will($this->returnValue(true));
|
||||||
|
|
||||||
|
$this->ldap->expects($this->any())
|
||||||
|
->method('setOption')
|
||||||
|
->will($this->returnValue(true));
|
||||||
|
|
||||||
|
$this->ldap->expects($this->exactly(3))
|
||||||
|
->method('connect')
|
||||||
|
->will($this->returnValue('ldapResource'));
|
||||||
|
|
||||||
|
// Not called often enough? Then, the fallback to the backup server is broken.
|
||||||
|
$this->connection->expects($this->exactly(4))
|
||||||
|
->method('getFromCache')
|
||||||
|
->with('overrideMainServer')
|
||||||
|
->will($this->onConsecutiveCalls(false, false, true, true));
|
||||||
|
|
||||||
|
$this->connection->expects($this->once())
|
||||||
|
->method('writeToCache')
|
||||||
|
->with('overrideMainServer', true);
|
||||||
|
|
||||||
|
$isThrown = false;
|
||||||
|
$this->ldap->expects($this->exactly(3))
|
||||||
|
->method('bind')
|
||||||
|
->will($this->returnCallback(function () use (&$isThrown) {
|
||||||
|
if(!$isThrown) {
|
||||||
|
$isThrown = true;
|
||||||
|
throw new \OC\ServerNotAvailableException();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}));
|
||||||
|
|
||||||
|
$this->connection->init();
|
||||||
|
$this->connection->resetConnectionResource();
|
||||||
|
// with the second init() we test whether caching works
|
||||||
|
$this->connection->init();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue