Merge pull request #7611 from nextcloud/fix-7445

Don't attempt to translate login names to uids when uids are provided

Author: MorrisJobke

apps/user_ldap/tests/User_LDAPTest.php

@@ -1343,10 +1343,6 @@ private function prepareAccessForSetPassword(&$access, $enablePasswordChange = t
 					}
 					return true;
 			   }));
-
-		$access->userManager->expects($this->atLeastOnce())
-			->method('get')
-			->willReturn($this->createMock(User::class));
 	}
 
 	/**
@@ -1357,6 +1353,9 @@ public function testSetPasswordInvalid() {
 		$access = $this->getAccessMock();
 
 		$this->prepareAccessForSetPassword($access);
+		$access->userManager->expects($this->atLeastOnce())
+			->method('get')
+			->willReturn($this->createMock(User::class));
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 

core/Controller/LostController.php

@@ -224,6 +224,12 @@ public function email($user){
 			return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
 		}
 
+		\OCP\Util::emitHook(
+			'\OCA\Files_Sharing\API\Server2Server',
+			'preLoginNameUsedAsUserName',
+			['uid' => &$user]
+		);
+
 		// FIXME: use HTTP error codes
 		try {
 			$this->sendEmail($user);

lib/private/User/Manager.php

@@ -152,16 +152,6 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 			return $this->cachedUsers[$uid];
 		}
 
-		if (method_exists($backend, 'loginName2UserName')) {
-			$loginName = $backend->loginName2UserName($uid);
-			if ($loginName !== false) {
-				$uid = $loginName;
-			}
-			if (isset($this->cachedUsers[$uid])) {
-				return $this->cachedUsers[$uid];
-			}
-		}
-
 		$user = new User($uid, $backend, $this, $this->config);
 		if ($cacheUser) {
 			$this->cachedUsers[$uid] = $user;

tests/lib/Files/FilesystemTest.php

@@ -368,39 +368,6 @@ public function testLocalMountWhenUserDoesNotExistTwice() {
 		$this->assertEquals(2, $thrown);
 	}
 
-	public function testUserNameCasing() {
-		$this->logout();
-		$userId = $this->getUniqueID('user_');
-
-		\OC_User::clearBackends();
-		// needed for loginName2UserName mapping
-		$userBackend = $this->createMock(\OC\User\Database::class);
-		\OC::$server->getUserManager()->registerBackend($userBackend);
-
-		$userBackend->expects($this->once())
-			->method('userExists')
-			->with(strtoupper($userId))
-			->will($this->returnValue(true));
-		$userBackend->expects($this->once())
-			->method('loginName2UserName')
-			->with(strtoupper($userId))
-			->will($this->returnValue($userId));
-
-		$view = new \OC\Files\View();
-		$this->assertFalse($view->file_exists('/' . $userId));
-
-		\OC\Files\Filesystem::initMountPoints(strtoupper($userId));
-
-		list($storage1, $path1) = $view->resolvePath('/' . $userId);
-		list($storage2, $path2) = $view->resolvePath('/' . strtoupper($userId));
-
-		$this->assertTrue($storage1->instanceOfStorage('\OCP\Files\IHomeStorage'));
-		$this->assertEquals('', $path1);
-
-		// not mounted, still on the local root storage
-		$this->assertEquals(strtoupper($userId), $path2);
-	}
-
 	/**
 	 * Tests that the home storage is used for the user's mount point
 	 */

tests/lib/User/ManagerTest.php

@@ -185,6 +185,8 @@ public function testGetOneBackendExists() {
 			->method('userExists')
 			->with($this->equalTo('foo'))
 			->will($this->returnValue(true));
+		$backend->expects($this->never())
+			->method('loginName2UserName');
 
 		$manager = new \OC\User\Manager($this->config);
 		$manager->registerBackend($backend);
@@ -208,6 +210,24 @@ public function testGetOneBackendNotExists() {
 		$this->assertEquals(null, $manager->get('foo'));
 	}
 
+	public function testGetOneBackendDoNotTranslateLoginNames() {
+		/**
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->createMock(\Test\Util\User\Dummy::class);
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('bLeNdEr'))
+			->will($this->returnValue(true));
+		$backend->expects($this->never())
+			->method('loginName2UserName');
+
+		$manager = new \OC\User\Manager($this->config);
+		$manager->registerBackend($backend);
+
+		$this->assertEquals('bLeNdEr', $manager->get('bLeNdEr')->getUID());
+	}
+
 	public function testSearchOneBackend() {
 		/**
 		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
@@ -217,6 +237,8 @@ public function testSearchOneBackend() {
 			->method('getUsers')
 			->with($this->equalTo('fo'))
 			->will($this->returnValue(array('foo', 'afoo')));
+		$backend->expects($this->never())
+			->method('loginName2UserName');
 
 		$manager = new \OC\User\Manager($this->config);
 		$manager->registerBackend($backend);
@@ -236,6 +258,8 @@ public function testSearchTwoBackendLimitOffset() {
 			->method('getUsers')
 			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
 			->will($this->returnValue(array('foo1', 'foo2')));
+		$backend1->expects($this->never())
+			->method('loginName2UserName');
 
 		/**
 		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
@@ -245,6 +269,8 @@ public function testSearchTwoBackendLimitOffset() {
 			->method('getUsers')
 			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
 			->will($this->returnValue(array('foo3')));
+		$backend2->expects($this->never())
+			->method('loginName2UserName');
 
 		$manager = new \OC\User\Manager($this->config);
 		$manager->registerBackend($backend1);
@@ -324,6 +350,8 @@ public function testCreateUserSingleBackendNotExists() {
 			->method('userExists')
 			->with($this->equalTo('foo'))
 			->will($this->returnValue(false));
+		$backend->expects($this->never())
+			->method('loginName2UserName');
 
 		$manager = new \OC\User\Manager($this->config);
 		$manager->registerBackend($backend);

tests/lib/Util/User/Dummy.php

@@ -108,6 +108,13 @@ public function checkPassword($uid, $password) {
 		return false;
 	}
 
+	public function loginName2UserName($loginName) {
+		if(isset($this->users[strtolower($loginName)])) {
+			return strtolower($loginName);
+		}
+		return false;
+	}
+
 	/**
 	 * Get a list of all users
 	 *