[Pkg-owncloud-commits] [owncloud] 21/59: Backport of #9570

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 5a3684114493b83ba7a4491a800dbbddec8b3a1e
Author: Philippe Jung <phil.jung at free.fr>
Date:   Thu Jul 10 14:27:31 2014 +0200

    Backport of #9570
    
    [Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users
    
    File written by blizzz
---
 apps/user_ldap/lib/user/manager.php   |   3 +-
 apps/user_ldap/tests/user/manager.php | 151 ++++++++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index 6c63551..0f17900 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -143,7 +143,8 @@ class Manager {
 			return $this->users['byUid'][$id];
 		}
 
-		if(strpos(mb_strtolower($id, 'UTF-8'), 'dc=') === false) {
+		if(strpos(mb_strtolower($id, 'UTF-8'), 'dc=') === false
+		   && strpos(mb_strtolower($id, 'UTF-8'), 'uid=') === false ) {
 			//most likely a uid
 			$dn = $this->access->username2dn($id);
 			if($dn !== false) {
diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php
new file mode 100644
index 0000000..7599980
--- /dev/null
+++ b/apps/user_ldap/tests/user/manager.php
@@ -0,0 +1,151 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2014 Arthur Schiwon blizzz at owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\user_ldap\tests;
+
+use OCA\user_ldap\lib\user\Manager;
+
+class Test_User_Manager extends \PHPUnit_Framework_TestCase {
+
+    private function getTestInstances() {
+        $access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');
+        $config  = $this->getMock('\OCP\IConfig');
+        $filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
+        $log     = $this->getMock('\OCA\user_ldap\lib\LogWrapper');
+        $avaMgr  = $this->getMock('\OCP\IAvatarManager');
+        $image   = $this->getMock('\OCP\Image');
+
+        return array($access, $config, $filesys, $image, $log, $avaMgr);
+    }
+
+    public function testGetByDNExisting() {
+        list($access, $config, $filesys, $image, $log, $avaMgr) =
+            $this->getTestInstances();
+
+        $inputDN = 'cn=foo,dc=foobar,dc=bar';
+        $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
+
+        $access->expects($this->once())
+            ->method('dn2username')
+            ->with($this->equalTo($inputDN))
+            ->will($this->returnValue($uid));
+
+        $access->expects($this->never())
+            ->method('username2dn');
+
+        $manager = new Manager($config, $filesys, $log, $avaMgr, $image);
+        $manager->setLdapAccess($access);
+        $user = $manager->get($inputDN);
+
+        $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+    }
+
+    public function testGetByEDirectoryDN() {
+        list($access, $config, $filesys, $image, $log, $avaMgr) =
+            $this->getTestInstances();
+
+        $inputDN = 'uid=foo,o=foobar,c=bar';
+        $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
+
+        $access->expects($this->once())
+            ->method('dn2username')
+            ->with($this->equalTo($inputDN))
+            ->will($this->returnValue($uid));
+
+        $access->expects($this->never())
+            ->method('username2dn');
+
+        $manager = new Manager($config, $filesys, $log, $avaMgr, $image);
+        $manager->setLdapAccess($access);
+        $user = $manager->get($inputDN);
+
+        $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+    }
+
+    public function testGetByDNNotExisting() {
+        list($access, $config, $filesys, $image, $log, $avaMgr) =
+            $this->getTestInstances();
+
+        $inputDN = 'cn=gone,dc=foobar,dc=bar';
+
+        $access->expects($this->once())
+            ->method('dn2username')
+            ->with($this->equalTo($inputDN))
+            ->will($this->returnValue(false));
+
+        $access->expects($this->once())
+            ->method('username2dn')
+            ->with($this->equalTo($inputDN))
+            ->will($this->returnValue(false));
+
+        $manager = new Manager($config, $filesys, $log, $avaMgr, $image);
+        $manager->setLdapAccess($access);
+        $user = $manager->get($inputDN);
+
+        $this->assertNull($user);
+    }
+
+    public function testGetByUidExisting() {
+        list($access, $config, $filesys, $image, $log, $avaMgr) =
+            $this->getTestInstances();
+
+        $dn = 'cn=foo,dc=foobar,dc=bar';
+        $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e';
+
+        $access->expects($this->never())
+            ->method('dn2username');
+
+        $access->expects($this->once())
+            ->method('username2dn')
+            ->with($this->equalTo($uid))
+            ->will($this->returnValue($dn));
+
+        $manager = new Manager($config, $filesys, $log, $avaMgr, $image);
+        $manager->setLdapAccess($access);
+        $user = $manager->get($uid);
+
+        $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+    }
+
+    public function testGetByUidNotExisting() {
+        list($access, $config, $filesys, $image, $log, $avaMgr) =
+            $this->getTestInstances();
+
+        $dn = 'cn=foo,dc=foobar,dc=bar';
+        $uid = 'gone';
+
+        $access->expects($this->never())
+            ->method('dn2username');
+
+        $access->expects($this->exactly(2))
+            ->method('username2dn')
+            ->with($this->equalTo($uid))
+            ->will($this->returnValue(false));
+
+        $manager = new Manager($config, $filesys, $log, $avaMgr, $image);
+        $manager->setLdapAccess($access);
+        $user = $manager->get($uid);
+
+        $this->assertNull($user);
+    }
+
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git