sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle unallowed auth exception on port detection

remotes/origin/poc-doctrine-migrations
Arthur Schiwon 2015-05-12 14:45:32 +07:00 committed by Thomas Müller
parent 5a56393657
commit cdb0689334
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/ldap.php
Unescape Escape View File

@ -288,7 +288,7 @@ class LDAP implements ILDAPWrapper {
} else if ($errorCode === -1) {
throw new ServerNotAvailableException('Lost connection to LDAP server.');
} else if ($errorCode === 48) {
throw new \Exception('LDAP authentication method rejected');
throw new \Exception('LDAP authentication method rejected', $errorCode);
} else if ($errorCode === 1) {
throw new \Exception('LDAP Operations error', $errorCode);
} else {

24
apps/user_ldap/lib/wizard.php
Unescape Escape View File

@ -657,12 +657,26 @@ class Wizard extends LDAPUtility {
\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '. $p . ', TLS '. $t, \OCP\Util::DEBUG);
//connectAndBind may throw Exception, it needs to be catched by the
//callee of this method
if($this->connectAndBind($p, $t) === true) {
$config = array('ldapPort' => $p,
'ldapTLS' => intval($t)
);
// unallowed anonymous bind throws 48. But if it throws 48, we
// detected port and TLS, i.e. it is successful.
try {
$settingsFound = $this->connectAndBind($p, $t);
} catch (\Exception $e) {
if($e->getCode() === 48) {
$settingsFound = true;
} else {
throw $e;
}
}
if ($settingsFound === true) {
$config = array(
'ldapPort' => $p,
'ldapTLS' => intval($t)
);
$this->configuration->setConfiguration($config);
\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port '. $p, \OCP\Util::DEBUG);
\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port ' . $p, \OCP\Util::DEBUG);
$this->result->addChange('ldap_port', $p);
return $this->result;
}