From 8653d1486243079426a855584111db519af6e544 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 26 Oct 2016 10:13:31 +0200 Subject: [PATCH] Do not expose user data in exceptions & fix typo Signed-off-by: Morris Jobke --- lib/private/Files/Node/Root.php | 2 +- lib/private/Share/Share.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 28438e8adb..8434ed6400 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -351,7 +351,7 @@ class Root extends Folder implements IRootFolder { if (is_null($userObject)) { \OCP\Util::writeLog('files', 'Backends provided no user object for ' . $userId, \OCP\Util::ERROR); - throw new \OC\User\NoUserException('Backends provided no user object for ' . $userId); + throw new \OC\User\NoUserException('Backends provided no user object'); } $userId = $userObject->getUID(); diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 842dded067..b9accda728 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -139,9 +139,9 @@ class Share extends Constants { $userManager = \OC::$server->getUserManager(); $userObject = $userManager->get($ownerUser); - if (is_null($ownerUser)) { + if (is_null($userObject)) { \OCP\Util::writeLog('files', ' Backends provided no user object for ' . $ownerUser, \OCP\Util::ERROR); - throw new \OC\User\NoUserException('Backends provided no user object for ' . $ownerUser); + throw new \OC\User\NoUserException('Backends provided no user object'); } $ownerUser = $userObject->getUID();