Merge pull request #20271 from owncloud/fix-18701
LDAP: attempt to connect to backup server again, if main server is no…
This commit is contained in:
commit
bf941032a3
|
@ -526,30 +526,41 @@ class Connection extends LDAPUtility {
|
||||||
\OCP\Util::WARN);
|
\OCP\Util::WARN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!$this->configuration->ldapOverrideMainServer
|
|
||||||
&& !$this->getFromCache('overrideMainServer')) {
|
$bindStatus = false;
|
||||||
$this->doConnect($this->configuration->ldapHost,
|
$error = null;
|
||||||
$this->configuration->ldapPort);
|
try {
|
||||||
$bindStatus = $this->bind();
|
if (!$this->configuration->ldapOverrideMainServer
|
||||||
$error = $this->ldap->isResource($this->ldapConnectionRes) ?
|
&& !$this->getFromCache('overrideMainServer')
|
||||||
$this->ldap->errno($this->ldapConnectionRes) : -1;
|
) {
|
||||||
} else {
|
$this->doConnect($this->configuration->ldapHost,
|
||||||
$bindStatus = false;
|
$this->configuration->ldapPort);
|
||||||
$error = null;
|
$bindStatus = $this->bind();
|
||||||
|
$error = $this->ldap->isResource($this->ldapConnectionRes) ?
|
||||||
|
$this->ldap->errno($this->ldapConnectionRes) : -1;
|
||||||
|
}
|
||||||
|
if($bindStatus === true) {
|
||||||
|
return $bindStatus;
|
||||||
|
}
|
||||||
|
} catch (\OC\ServerNotAvailableException $e) {
|
||||||
|
if(trim($this->configuration->ldapBackupHost) === "") {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//if LDAP server is not reachable, try the Backup (Replica!) Server
|
//if LDAP server is not reachable, try the Backup (Replica!) Server
|
||||||
if((!$bindStatus && ($error !== 0))
|
if( $error !== 0
|
||||||
|| $this->configuration->ldapOverrideMainServer
|
|| $this->configuration->ldapOverrideMainServer
|
||||||
|| $this->getFromCache('overrideMainServer')) {
|
|| $this->getFromCache('overrideMainServer'))
|
||||||
$this->doConnect($this->configuration->ldapBackupHost,
|
{
|
||||||
$this->configuration->ldapBackupPort);
|
$this->doConnect($this->configuration->ldapBackupHost,
|
||||||
$bindStatus = $this->bind();
|
$this->configuration->ldapBackupPort);
|
||||||
if(!$bindStatus && $error === -1) {
|
$bindStatus = $this->bind();
|
||||||
//when bind to backup server succeeded and failed to main server,
|
if($bindStatus && $error === -1) {
|
||||||
//skip contacting him until next cache refresh
|
//when bind to backup server succeeded and failed to main server,
|
||||||
$this->writeToCache('overrideMainServer', true);
|
//skip contacting him until next cache refresh
|
||||||
}
|
$this->writeToCache('overrideMainServer', true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $bindStatus;
|
return $bindStatus;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,118 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @author Arthur Schiwon <blizzz@owncloud.com>
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||||
|
* @license AGPL-3.0
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\user_ldap\tests\integration\lib;
|
||||||
|
|
||||||
|
use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
|
||||||
|
use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
|
||||||
|
use OCA\User_LDAP\Mapping\UserMapping;
|
||||||
|
use OCA\user_ldap\USER_LDAP;
|
||||||
|
|
||||||
|
require_once __DIR__ . '/../../../../../lib/base.php';
|
||||||
|
|
||||||
|
class IntegrationBackupServer extends AbstractIntegrationTest {
|
||||||
|
/** @var UserMapping */
|
||||||
|
protected $mapping;
|
||||||
|
|
||||||
|
/** @var USER_LDAP */
|
||||||
|
protected $backend;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* sets up the LDAP configuration to be used for the test
|
||||||
|
*/
|
||||||
|
protected function initConnection() {
|
||||||
|
parent::initConnection();
|
||||||
|
$originalHost = $this->connection->ldapHost;
|
||||||
|
$originalPort = $this->connection->ldapPort;
|
||||||
|
$this->connection->setConfiguration([
|
||||||
|
'ldapHost' => 'qwertz.uiop',
|
||||||
|
'ldapPort' => '32123',
|
||||||
|
'ldap_backup_host' => $originalHost,
|
||||||
|
'ldap_backup_port' => $originalPort,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* tests that a backup connection is being used when the main LDAP server
|
||||||
|
* is offline
|
||||||
|
*
|
||||||
|
* Beware: after starting docker, the LDAP host might not be ready yet, thus
|
||||||
|
* causing a false positive. Retry in that case… or increase the sleep time
|
||||||
|
* in run-test.sh
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function case1() {
|
||||||
|
try {
|
||||||
|
$this->connection->getConnectionResource();
|
||||||
|
} catch (\OC\ServerNotAvailableException $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ensures that an exception is thrown if LDAP main server and LDAP backup
|
||||||
|
* server are not available
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function case2() {
|
||||||
|
// reset possible LDAP connection
|
||||||
|
$this->initConnection();
|
||||||
|
try {
|
||||||
|
$this->connection->setConfiguration([
|
||||||
|
'ldap_backup_host' => 'qwertz.uiop',
|
||||||
|
'ldap_backup_port' => '32123',
|
||||||
|
]);
|
||||||
|
$this->connection->getConnectionResource();
|
||||||
|
} catch (\OC\ServerNotAvailableException $e) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ensures that an exception is thrown if main LDAP server is down and a
|
||||||
|
* backup server is not given
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function case3() {
|
||||||
|
// reset possible LDAP connection
|
||||||
|
$this->initConnection();
|
||||||
|
try {
|
||||||
|
$this->connection->setConfiguration([
|
||||||
|
'ldap_backup_host' => '',
|
||||||
|
'ldap_backup_port' => '',
|
||||||
|
]);
|
||||||
|
$this->connection->getConnectionResource();
|
||||||
|
} catch (\OC\ServerNotAvailableException $e) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once(__DIR__ . '/../setup-scripts/config.php');
|
||||||
|
$test = new IntegrationBackupServer($host, $port, $adn, $apwd, $bdn);
|
||||||
|
$test->init();
|
||||||
|
$test->run();
|
Loading…
Reference in New Issue