mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10233 from nextcloud/backport/10227/ldap-bind-loop 

[stable13] Only bind to ldap if configuration for the first server is set
This commit is contained in:
Morris Jobke 2018-07-13 17:52:49 +02:00 committed by GitHub
parent 30dea9906a 9f9f1d8cb0
commit 761daeab1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/Connection.php
View File

@ -564,8 +564,8 @@ class Connection extends LDAPUtility {
if (!$isOverrideMainServer) { if (!$isOverrideMainServer) {
$this->doConnect($this->configuration->ldapHost, $this->doConnect($this->configuration->ldapHost,
$this->configuration->ldapPort); $this->configuration->ldapPort);
}
return $this->bind(); return $this->bind();
}
} catch (ServerNotAvailableException $e) { } catch (ServerNotAvailableException $e) {
if(!$isBackupHost) { if(!$isBackupHost) {
throw $e; throw $e;

4
apps/user_ldap/tests/ConnectionTest.php
View File

@ -110,7 +110,7 @@ class ConnectionTest extends \Test\TestCase {
->method('setOption') ->method('setOption')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$this->ldap->expects($this->exactly(2)) $this->ldap->expects($this->exactly(3))
->method('connect') ->method('connect')
->will($this->returnValue('ldapResource')); ->will($this->returnValue('ldapResource'));
@ -119,7 +119,7 @@ class ConnectionTest extends \Test\TestCase {
->will($this->returnValue(0)); ->will($this->returnValue(0));
// Not called often enough? Then, the fallback to the backup server is broken. // Not called often enough? Then, the fallback to the backup server is broken.
$this->connection->expects($this->exactly(3)) $this->connection->expects($this->exactly(4))
->method('getFromCache') ->method('getFromCache')
->with('overrideMainServer') ->with('overrideMainServer')
->will($this->onConsecutiveCalls(false, false, true, true)); ->will($this->onConsecutiveCalls(false, false, true, true));