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

Merge pull request #12901 from owncloud/move-ldap-check-to-manager 

Move the Null-Byte LDAP check to the user manager
This commit is contained in:
Robin McCorkell 2014-12-18 00:28:00 +00:00
parent d83fdd7f9d f6820406b6
commit 619dcae7af
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/user.php
View File

@ -212,9 +212,6 @@ class OC_User {
* Log in a user and regenerate a new session - if the password is ok * Log in a user and regenerate a new session - if the password is ok
*/ */
public static function login($loginname, $password) { public static function login($loginname, $password) {
$loginname = str_replace("\0", '', $loginname);
$password = str_replace("\0", '', $password);
session_regenerate_id(true); session_regenerate_id(true);
$result = self::getUserSession()->login($loginname, $password); $result = self::getUserSession()->login($loginname, $password);
if ($result) { if ($result) {

3
lib/private/user/manager.php
View File

@ -151,6 +151,9 @@ class Manager extends PublicEmitter implements IUserManager {
* @return mixed the User object on success, false otherwise * @return mixed the User object on success, false otherwise
*/ */
public function checkPassword($loginname, $password) { public function checkPassword($loginname, $password) {
$loginname = str_replace("\0", '', $loginname);
$password = str_replace("\0", '', $password);
foreach ($this->backends as $backend) { foreach ($this->backends as $backend) {
if ($backend->implementsActions(\OC_User_Backend::CHECK_PASSWORD)) { if ($backend->implementsActions(\OC_User_Backend::CHECK_PASSWORD)) {
$uid = $backend->checkPassword($loginname, $password); $uid = $backend->checkPassword($loginname, $password);