Merge pull request #16525 from nextcloud/bugfix/external-user-substitution

files_external: proper user context for sharing
This commit is contained in:
blizzz 2019-08-02 14:07:39 +02:00 committed by GitHub
commit bc409167f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 128 additions and 32 deletions

View File

@ -76,7 +76,7 @@ class ConfigAdapter implements IMountProvider {
*/ */
private function prepareStorageConfig(StorageConfig &$storage, IUser $user) { private function prepareStorageConfig(StorageConfig &$storage, IUser $user) {
foreach ($storage->getBackendOptions() as $option => $value) { foreach ($storage->getBackendOptions() as $option => $value) {
$storage->setBackendOption($option, \OC_Mount_Config::substitutePlaceholdersInConfig($value)); $storage->setBackendOption($option, \OC_Mount_Config::substitutePlaceholdersInConfig($value, $user->getUID()));
} }
$objectStore = $storage->getBackendOption('objectstore'); $objectStore = $storage->getBackendOption('objectstore');

View File

@ -34,7 +34,7 @@ trait SimpleSubstitutionTrait {
* @var string the placeholder without $ prefix * @var string the placeholder without $ prefix
* @since 16.0.0 * @since 16.0.0
*/ */
private $placeholder; protected $placeholder;
/** @var string */ /** @var string */
protected $sanitizedPlaceholder; protected $sanitizedPlaceholder;

View File

@ -0,0 +1,89 @@
<?php
/**
* @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net>
*
* @author Julius Härtl <jus@bitgrid.net>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program 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 program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Files_External\Config;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as ShareManager;
class UserContext {
/** @var IUserSession */
private $session;
/** @var ShareManager */
private $shareManager;
/** @var IRequest */
private $request;
/** @var string */
private $userId;
/** @var IUserManager */
private $userManager;
public function __construct(IUserSession $session, ShareManager $manager, IRequest $request, IUserManager $userManager) {
$this->session = $session;
$this->shareManager = $manager;
$this->request = $request;
$this->userManager = $userManager;
}
public function getSession(): IUserSession {
return $this->session;
}
public function setUserId(string $userId): void {
$this->userId = $userId;
}
protected function getUserId(): ?string {
if ($this->userId !== null) {
return $this->userId;
}
if($this->session && $this->session->getUser() !== null) {
return $this->session->getUser()->getUID();
}
try {
$shareToken = $this->request->getParam('token');
$share = $this->shareManager->getShareByToken($shareToken);
return $share->getShareOwner();
} catch (ShareNotFound $e) {}
return null;
}
protected function getUser(): ?IUser {
$userId = $this->getUserId();
if($userId !== null) {
return $this->userManager->get($userId);
}
return null;
}
}

View File

@ -23,31 +23,20 @@
namespace OCA\Files_External\Config; namespace OCA\Files_External\Config;
use OCP\IUserSession; class UserPlaceholderHandler extends UserContext implements IConfigHandler {
class UserPlaceholderHandler implements IConfigHandler {
use SimpleSubstitutionTrait; use SimpleSubstitutionTrait;
/** @var IUserSession */
private $session;
public function __construct(IUserSession $session) {
$this->session = $session;
$this->placeholder = 'user';
}
/** /**
* @param mixed $optionValue * @param mixed $optionValue
* @return mixed the same type as $optionValue * @return mixed the same type as $optionValue
* @since 16.0.0 * @since 16.0.0
*/ */
public function handle($optionValue) { public function handle($optionValue) {
$user = $this->session->getUser(); $this->placeholder = 'user';
if($user === null) { $uid = $this->getUserId();
if($uid === null) {
return $optionValue; return $optionValue;
} }
$uid = $user->getUID();
return $this->processInput($optionValue, $uid); return $this->processInput($optionValue, $uid);
} }
} }

View File

@ -50,6 +50,7 @@ use OCA\Files_External\Service\UserGlobalStoragesService;
use OCP\IUserManager; use OCP\IUserManager;
use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\GlobalStoragesService;
use OCA\Files_External\Service\UserStoragesService; use OCA\Files_External\Service\UserStoragesService;
use OCA\Files_External\Config\UserContext;
/** /**
* Class to configure mount.json globally and for users * Class to configure mount.json globally and for users
@ -107,7 +108,7 @@ class OC_Mount_Config {
$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint(); $mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
$mountEntry = self::prepareMountPointEntry($storage, false); $mountEntry = self::prepareMountPointEntry($storage, false);
foreach ($mountEntry['options'] as &$option) { foreach ($mountEntry['options'] as &$option) {
$option = self::substitutePlaceholdersInConfig($option); $option = self::substitutePlaceholdersInConfig($option, $uid);
} }
$mountPoints[$mountPoint] = $mountEntry; $mountPoints[$mountPoint] = $mountEntry;
} }
@ -116,7 +117,7 @@ class OC_Mount_Config {
$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint(); $mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
$mountEntry = self::prepareMountPointEntry($storage, true); $mountEntry = self::prepareMountPointEntry($storage, true);
foreach ($mountEntry['options'] as &$option) { foreach ($mountEntry['options'] as &$option) {
$option = self::substitutePlaceholdersInConfig($uid, $option); $option = self::substitutePlaceholdersInConfig($option, $uid);
} }
$mountPoints[$mountPoint] = $mountEntry; $mountPoints[$mountPoint] = $mountEntry;
} }
@ -211,16 +212,20 @@ class OC_Mount_Config {
/** /**
* @param mixed $input * @param mixed $input
* @param string|null $userId
* @return mixed * @return mixed
* @throws \OCP\AppFramework\QueryException * @throws \OCP\AppFramework\QueryException
* @since 16.0.0 * @since 16.0.0
*/ */
public static function substitutePlaceholdersInConfig($input) { public static function substitutePlaceholdersInConfig($input, string $userId = null) {
/** @var BackendService $backendService */ /** @var BackendService $backendService */
$backendService = self::$app->getContainer()->query(BackendService::class); $backendService = self::$app->getContainer()->query(BackendService::class);
/** @var IConfigHandler[] $handlers */ /** @var IConfigHandler[] $handlers */
$handlers = $backendService->getConfigHandlers(); $handlers = $backendService->getConfigHandlers();
foreach ($handlers as $handler) { foreach ($handlers as $handler) {
if ($handler instanceof UserContext && $userId !== null) {
$handler->setUserId($userId);
}
$input = $handler->handle($input); $input = $handler->handle($input);
} }
return $input; return $input;

View File

@ -24,8 +24,12 @@
namespace OCA\files_external\tests\Config; namespace OCA\files_external\tests\Config;
use OCA\Files_External\Config\UserPlaceholderHandler; use OCA\Files_External\Config\UserPlaceholderHandler;
use OCP\IRequest;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager;
class UserPlaceholderHandlerTest extends \Test\TestCase { class UserPlaceholderHandlerTest extends \Test\TestCase {
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
@ -34,6 +38,15 @@ class UserPlaceholderHandlerTest extends \Test\TestCase {
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
protected $session; protected $session;
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
private $shareManager;
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
private $userManager;
/** @var UserPlaceholderHandler */ /** @var UserPlaceholderHandler */
protected $handler; protected $handler;
@ -45,8 +58,11 @@ class UserPlaceholderHandlerTest extends \Test\TestCase {
->method('getUid') ->method('getUid')
->willReturn('alice'); ->willReturn('alice');
$this->session = $this->createMock(IUserSession::class); $this->session = $this->createMock(IUserSession::class);
$this->shareManager = $this->createMock(IManager::class);
$this->request = $this->createMock(IRequest::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->handler = new UserPlaceholderHandler($this->session); $this->handler = new UserPlaceholderHandler($this->session, $this->shareManager, $this->request, $this->userManager);
} }
protected function setUser() { protected function setUser() {
@ -75,6 +91,9 @@ class UserPlaceholderHandlerTest extends \Test\TestCase {
* @dataProvider optionProvider * @dataProvider optionProvider
*/ */
public function testHandleNoUser($option) { public function testHandleNoUser($option) {
$this->shareManager->expects($this->once())
->method('getShareByToken')
->willThrowException(new ShareNotFound());
$this->assertSame($option, $this->handler->handle($option)); $this->assertSame($option, $this->handler->handle($option));
} }

View File

@ -25,20 +25,12 @@ namespace OCA\User_LDAP\Handler;
use OCA\Files_External\Config\IConfigHandler; use OCA\Files_External\Config\IConfigHandler;
use OCA\Files_External\Config\SimpleSubstitutionTrait; use OCA\Files_External\Config\SimpleSubstitutionTrait;
use OCA\Files_External\Config\UserContext;
use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\User_Proxy;
use OCP\IUserSession;
class ExtStorageConfigHandler implements IConfigHandler { class ExtStorageConfigHandler extends UserContext implements IConfigHandler {
use SimpleSubstitutionTrait; use SimpleSubstitutionTrait;
/** @var IUserSession */
private $session;
public function __construct(IUserSession $session) {
$this->placeholder = 'home';
$this->session = $session;
}
/** /**
* @param mixed $optionValue * @param mixed $optionValue
* @return mixed the same type as $optionValue * @return mixed the same type as $optionValue
@ -46,7 +38,9 @@ class ExtStorageConfigHandler implements IConfigHandler {
* @throws \Exception * @throws \Exception
*/ */
public function handle($optionValue) { public function handle($optionValue) {
$user = $this->session->getUser(); $this->placeholder = 'home';
$user = $this->getUser();
if($user === null) { if($user === null) {
return $optionValue; return $optionValue;
} }