wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14540 from army1349/master

Browse source 
LDAP Password Modify Extended Operation support
This commit is contained in:
Morris Jobke 2019-07-19 17:29:24 +02:00 committed by GitHub
commit c00d6f4eac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/user_ldap/lib/Access.php
View file

@ -366,7 +366,9 @@ class Access extends LDAPUtility {
return false;
}
try {
return @$this->invokeLDAPMethod('modReplace', $cr, $userDN, $password);
// try PASSWD extended operation first
return @$this->invokeLDAPMethod('exopPasswd', $cr, $userDN, '', $password) ||
@$this->invokeLDAPMethod('modReplace', $cr, $userDN, $password);
} catch(ConstraintViolationException $e) {
throw new HintException('Password change rejected.', \OC::$server->getL10N('user_ldap')->t('Password change rejected. Hint: ').$e->getMessage(), $e->getCode());
}

11
apps/user_ldap/lib/LDAP.php
View file

@ -219,6 +219,17 @@ class LDAP implements ILDAPWrapper {
return $this->invokeLDAPMethod('mod_replace', $link, $userDN, array('userPassword' => $password));
}
/**
* @param LDAP $link
* @param string $userDN
* @param string $oldPassword
* @param string $password
* @return bool
*/
public function exopPasswd($link, $userDN, $oldPassword, $password) {
return $this->invokeLDAPMethod('exop_passwd', $link, $userDN, $oldPassword, $password);
}
/**
* @param LDAP $link
* @param string $option