Ldap fixes #1068
Ldap fixes #1068
Conversation
|
Hello @circulon, this it the wrong repository for contributing patches to the library itself. Please have a look at the fatfree-core repository instead. |
| @@ -122,7 +122,7 @@ protected function _ldap($id,$pw) { | |||
| ldap_set_option($dc,LDAP_OPT_REFERRALS,0) && | |||
| ldap_bind($dc,$this->args['rdn'],$this->args['pw']) && | |||
| ($result=ldap_search($dc,$this->args['base_dn'], | |||
| $this->args['uid'].'='.$id)) && | |||
| $this->args['uid'].'='.$id, array($this->args['uid']))) && | |||
There was a problem hiding this comment.
Please use the short array notation.
| @@ -127,7 +127,8 @@ protected function _ldap($id,$pw) { | |||
| ($info=ldap_get_entries($dc,$result)) && | |||
| @ldap_bind($dc,$info[0]['dn'],$pw) && | |||
| @ldap_close($dc)) { | |||
| return $info[0][$this->args['uid']][0]==$id; | |||
| $uid = strtolower($this->args['uid']); | |||
| return (mb_strtolower($info[0][$uid][0])) == (mb_strtolower($id)); | |||
There was a problem hiding this comment.
Fat-Free Framework tries to keep the "dependencies" as minimal as possible. The pull request introduces a dependency for the mbstring extension.
For the record: The system variable ENCODING defines the mb_internal_encoding when the extension mbstring is available. mbstring is an optional dependency at the moment.
|
This is similar to the changes I was going to submit, with some minor differences. uid doesn't work for Active Directory, so I modified to either use uid if nothing is supplied (for backward compatibility purposes) or an array of attribute. This is also supposed to be best practice for LDAP requests. It also allowed to check for multiple attributes for the matching values (i.e. user.name or [email protected]) which could be defined. Anything that returns more than 1 differing response, is classed as a failed auth by default. I do like the port idea... I might pinch that and throw it into mine, before submitting the PR |
|
For the record: The PR of @docwyatt2001 is here: f3-factory/fatfree-core#227 👍 |
|
Issue f3-factory/fatfree-core#227 was merged and should fix this here as well. Please reopen if there's something left. |
Fixes multiple ldap authentication issues and allows use of a custom port