load share settings from the share manager in more places
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
7e1c842d96
commit
b1dca57a1c
|
@ -55,6 +55,7 @@ use OCP\IL10N;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
use OCP\IURLGenerator;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
|
use OCP\Share\IManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ViewController
|
* Class ViewController
|
||||||
|
@ -86,6 +87,8 @@ class ViewController extends Controller {
|
||||||
private $initialState;
|
private $initialState;
|
||||||
/** @var ITemplateManager */
|
/** @var ITemplateManager */
|
||||||
private $templateManager;
|
private $templateManager;
|
||||||
|
/** @var IManager */
|
||||||
|
private $shareManager;
|
||||||
|
|
||||||
public function __construct(string $appName,
|
public function __construct(string $appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
|
@ -98,7 +101,8 @@ class ViewController extends Controller {
|
||||||
IRootFolder $rootFolder,
|
IRootFolder $rootFolder,
|
||||||
Helper $activityHelper,
|
Helper $activityHelper,
|
||||||
IInitialState $initialState,
|
IInitialState $initialState,
|
||||||
ITemplateManager $templateManager
|
ITemplateManager $templateManager,
|
||||||
|
IManager $shareManager
|
||||||
) {
|
) {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
$this->appName = $appName;
|
$this->appName = $appName;
|
||||||
|
@ -113,6 +117,7 @@ class ViewController extends Controller {
|
||||||
$this->activityHelper = $activityHelper;
|
$this->activityHelper = $activityHelper;
|
||||||
$this->initialState = $initialState;
|
$this->initialState = $initialState;
|
||||||
$this->templateManager = $templateManager;
|
$this->templateManager = $templateManager;
|
||||||
|
$this->shareManager = $shareManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -302,7 +307,7 @@ class ViewController extends Controller {
|
||||||
$params['owner'] = $storageInfo['owner'] ?? '';
|
$params['owner'] = $storageInfo['owner'] ?? '';
|
||||||
$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'] ?? '';
|
$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'] ?? '';
|
||||||
$params['isPublic'] = false;
|
$params['isPublic'] = false;
|
||||||
$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
|
$params['allowShareWithLink'] = $this->shareManager->shareApiAllowLinks() ? 'yes' : 'no';
|
||||||
$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
|
$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
|
||||||
$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
|
$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
|
||||||
$params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', false);
|
$params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', false);
|
||||||
|
|
|
@ -22,10 +22,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use OCP\Share\IManager;
|
||||||
|
|
||||||
$config = \OC::$server->getConfig();
|
$config = \OC::$server->getConfig();
|
||||||
$userSession = \OC::$server->getUserSession();
|
$userSession = \OC::$server->getUserSession();
|
||||||
// TODO: move this to the generated config.js
|
// TODO: move this to the generated config.js
|
||||||
$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
|
/** @var IManager $shareManager */
|
||||||
|
$shareManager = \OC::$server->get(IManager::class);
|
||||||
|
$publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no';;
|
||||||
|
|
||||||
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
|
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
|
||||||
$isIE = OC_Util::isIe();
|
$isIE = OC_Util::isIe();
|
||||||
|
|
|
@ -48,6 +48,7 @@ use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
use OCP\IURLGenerator;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
|
use OCP\Share\IManager;
|
||||||
use OCP\Template;
|
use OCP\Template;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
@ -84,6 +85,8 @@ class ViewControllerTest extends TestCase {
|
||||||
private $initialState;
|
private $initialState;
|
||||||
/** @var ITemplateManager|\PHPUnit\Framework\MockObject\MockObject */
|
/** @var ITemplateManager|\PHPUnit\Framework\MockObject\MockObject */
|
||||||
private $templateManager;
|
private $templateManager;
|
||||||
|
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
|
||||||
|
private $shareManager;
|
||||||
|
|
||||||
protected function setUp(): void {
|
protected function setUp(): void {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
@ -105,6 +108,7 @@ class ViewControllerTest extends TestCase {
|
||||||
$this->activityHelper = $this->createMock(Helper::class);
|
$this->activityHelper = $this->createMock(Helper::class);
|
||||||
$this->initialState = $this->createMock(IInitialState::class);
|
$this->initialState = $this->createMock(IInitialState::class);
|
||||||
$this->templateManager = $this->createMock(ITemplateManager::class);
|
$this->templateManager = $this->createMock(ITemplateManager::class);
|
||||||
|
$this->shareManager = $this->createMock(IManager::class);
|
||||||
$this->viewController = $this->getMockBuilder('\OCA\Files\Controller\ViewController')
|
$this->viewController = $this->getMockBuilder('\OCA\Files\Controller\ViewController')
|
||||||
->setConstructorArgs([
|
->setConstructorArgs([
|
||||||
'files',
|
'files',
|
||||||
|
@ -119,6 +123,7 @@ class ViewControllerTest extends TestCase {
|
||||||
$this->activityHelper,
|
$this->activityHelper,
|
||||||
$this->initialState,
|
$this->initialState,
|
||||||
$this->templateManager,
|
$this->templateManager,
|
||||||
|
$this->shareManager,
|
||||||
])
|
])
|
||||||
->setMethods([
|
->setMethods([
|
||||||
'getStorageInfo',
|
'getStorageInfo',
|
||||||
|
@ -153,6 +158,8 @@ class ViewControllerTest extends TestCase {
|
||||||
->expects($this->any())
|
->expects($this->any())
|
||||||
->method('getAppValue')
|
->method('getAppValue')
|
||||||
->willReturnArgument(2);
|
->willReturnArgument(2);
|
||||||
|
$this->shareManager->method('shareApiAllowLinks')
|
||||||
|
->willReturn(true);
|
||||||
|
|
||||||
$nav = new Template('files', 'appnavigation');
|
$nav = new Template('files', 'appnavigation');
|
||||||
$nav->assign('usage_relative', 123);
|
$nav->assign('usage_relative', 123);
|
||||||
|
|
|
@ -56,7 +56,9 @@ use OCP\Group\Events\UserAddedEvent;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
use OCP\IGroup;
|
use OCP\IGroup;
|
||||||
use OCP\IServerContainer;
|
use OCP\IServerContainer;
|
||||||
|
use OCP\IUserSession;
|
||||||
use OCP\Share\Events\ShareCreatedEvent;
|
use OCP\Share\Events\ShareCreatedEvent;
|
||||||
|
use OCP\Share\IManager;
|
||||||
use OCP\Util;
|
use OCP\Util;
|
||||||
use Psr\Container\ContainerInterface;
|
use Psr\Container\ContainerInterface;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
|
@ -166,20 +168,24 @@ class Application extends App {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function setupSharingMenus() {
|
protected function setupSharingMenus() {
|
||||||
$config = \OC::$server->getConfig();
|
/** @var IManager $shareManager */
|
||||||
|
$shareManager = \OC::$server->get(IManager::class);
|
||||||
|
|
||||||
if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes' || !class_exists('\OCA\Files\App')) {
|
if (!$shareManager->shareApiEnabled() || !class_exists('\OCA\Files\App')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// show_Quick_Access stored as string
|
// show_Quick_Access stored as string
|
||||||
\OCA\Files\App::getNavigationManager()->add(function () {
|
\OCA\Files\App::getNavigationManager()->add(function () use ($shareManager) {
|
||||||
$config = \OC::$server->getConfig();
|
|
||||||
$l = \OC::$server->getL10N('files_sharing');
|
$l = \OC::$server->getL10N('files_sharing');
|
||||||
|
/** @var IUserSession $userSession */
|
||||||
|
$userSession = \OC::$server->get(IUserSession::class);
|
||||||
|
$user = $userSession->getUser();
|
||||||
|
$userId = $user ? $user->getUID() : null;
|
||||||
|
|
||||||
$sharingSublistArray = [];
|
$sharingSublistArray = [];
|
||||||
|
|
||||||
if (\OCP\Util::isSharingDisabledForUser() === false) {
|
if ($shareManager->sharingDisabledForUser($userId) === false) {
|
||||||
$sharingSublistArray[] = [
|
$sharingSublistArray[] = [
|
||||||
'id' => 'sharingout',
|
'id' => 'sharingout',
|
||||||
'appname' => 'files_sharing',
|
'appname' => 'files_sharing',
|
||||||
|
@ -197,9 +203,9 @@ class Application extends App {
|
||||||
'name' => $l->t('Shared with you'),
|
'name' => $l->t('Shared with you'),
|
||||||
];
|
];
|
||||||
|
|
||||||
if (\OCP\Util::isSharingDisabledForUser() === false) {
|
if ($shareManager->sharingDisabledForUser($userId) === false) {
|
||||||
// Check if sharing by link is enabled
|
// Check if sharing by link is enabled
|
||||||
if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
|
if ($shareManager->shareApiAllowLinks()) {
|
||||||
$sharingSublistArray[] = [
|
$sharingSublistArray[] = [
|
||||||
'id' => 'sharinglinks',
|
'id' => 'sharinglinks',
|
||||||
'appname' => 'files_sharing',
|
'appname' => 'files_sharing',
|
||||||
|
|
|
@ -28,6 +28,7 @@ namespace OCA\Files_Sharing;
|
||||||
use OCP\Capabilities\ICapability;
|
use OCP\Capabilities\ICapability;
|
||||||
use OCP\Constants;
|
use OCP\Constants;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
use OCP\Share\IManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Capabilities
|
* Class Capabilities
|
||||||
|
@ -38,9 +39,12 @@ class Capabilities implements ICapability {
|
||||||
|
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
private $config;
|
private $config;
|
||||||
|
/** @var IManager */
|
||||||
|
private $shareManager;
|
||||||
|
|
||||||
public function __construct(IConfig $config) {
|
public function __construct(IConfig $config, IManager $shareManager) {
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
|
$this->shareManager = $shareManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -51,7 +55,7 @@ class Capabilities implements ICapability {
|
||||||
public function getCapabilities() {
|
public function getCapabilities() {
|
||||||
$res = [];
|
$res = [];
|
||||||
|
|
||||||
if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
|
if (!$this->shareManager->shareApiEnabled()) {
|
||||||
$res['api_enabled'] = false;
|
$res['api_enabled'] = false;
|
||||||
$res['public'] = ['enabled' => false];
|
$res['public'] = ['enabled' => false];
|
||||||
$res['user'] = ['send_mail' => false];
|
$res['user'] = ['send_mail' => false];
|
||||||
|
@ -60,10 +64,10 @@ class Capabilities implements ICapability {
|
||||||
$res['api_enabled'] = true;
|
$res['api_enabled'] = true;
|
||||||
|
|
||||||
$public = [];
|
$public = [];
|
||||||
$public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
|
$public['enabled'] = $this->shareManager->shareApiAllowLinks();
|
||||||
if ($public['enabled']) {
|
if ($public['enabled']) {
|
||||||
$public['password'] = [];
|
$public['password'] = [];
|
||||||
$public['password']['enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes');
|
$public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword();
|
||||||
|
|
||||||
if ($public['password']['enforced']) {
|
if ($public['password']['enforced']) {
|
||||||
$public['password']['askForOptionalPassword'] = false;
|
$public['password']['askForOptionalPassword'] = false;
|
||||||
|
@ -73,28 +77,28 @@ class Capabilities implements ICapability {
|
||||||
|
|
||||||
$public['expire_date'] = [];
|
$public['expire_date'] = [];
|
||||||
$public['multiple_links'] = true;
|
$public['multiple_links'] = true;
|
||||||
$public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
|
$public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate();
|
||||||
if ($public['expire_date']['enabled']) {
|
if ($public['expire_date']['enabled']) {
|
||||||
$public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
|
$public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays();
|
||||||
$public['expire_date']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
|
$public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced();
|
||||||
}
|
}
|
||||||
|
|
||||||
$public['expire_date_internal'] = [];
|
$public['expire_date_internal'] = [];
|
||||||
$public['expire_date_internal']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
|
$public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate();
|
||||||
if ($public['expire_date_internal']['enabled']) {
|
if ($public['expire_date_internal']['enabled']) {
|
||||||
$public['expire_date_internal']['days'] = $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
|
$public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays();
|
||||||
$public['expire_date_internal']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
|
$public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced();
|
||||||
}
|
}
|
||||||
|
|
||||||
$public['expire_date_remote'] = [];
|
$public['expire_date_remote'] = [];
|
||||||
$public['expire_date_remote']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_remote_expire_date', 'no') === 'yes';
|
$public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate();
|
||||||
if ($public['expire_date_remote']['enabled']) {
|
if ($public['expire_date_remote']['enabled']) {
|
||||||
$public['expire_date_remote']['days'] = $this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7');
|
$public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays();
|
||||||
$public['expire_date_remote']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_remote_expire_date', 'no') === 'yes';
|
$public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced();
|
||||||
}
|
}
|
||||||
|
|
||||||
$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
|
$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
|
||||||
$public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
|
$public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload();
|
||||||
$public['upload_files_drop'] = $public['upload'];
|
$public['upload_files_drop'] = $public['upload'];
|
||||||
}
|
}
|
||||||
$res['public'] = $public;
|
$res['public'] = $public;
|
||||||
|
@ -106,17 +110,17 @@ class Capabilities implements ICapability {
|
||||||
|
|
||||||
// deprecated in favour of 'group', but we need to keep it for now
|
// deprecated in favour of 'group', but we need to keep it for now
|
||||||
// in order to stay compatible with older clients
|
// in order to stay compatible with older clients
|
||||||
$res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
|
$res['group_sharing'] = $this->shareManager->allowGroupSharing();
|
||||||
|
|
||||||
$res['group'] = [];
|
$res['group'] = [];
|
||||||
$res['group']['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
|
$res['group']['enabled'] = $this->shareManager->allowGroupSharing();
|
||||||
$res['group']['expire_date']['enabled'] = true;
|
$res['group']['expire_date']['enabled'] = true;
|
||||||
$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
|
$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Federated sharing
|
//Federated sharing
|
||||||
$res['federation'] = [
|
$res['federation'] = [
|
||||||
'outgoing' => $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes',
|
'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
|
||||||
'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
|
'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
|
||||||
// old bogus one, expire_date was not working before, keeping for compatibility
|
// old bogus one, expire_date was not working before, keeping for compatibility
|
||||||
'expire_date' => ['enabled' => true],
|
'expire_date' => ['enabled' => true],
|
||||||
|
|
|
@ -27,8 +27,24 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Tests;
|
namespace OCA\Files_Sharing\Tests;
|
||||||
|
|
||||||
|
use OC\Share20\Manager;
|
||||||
use OCA\Files_Sharing\Capabilities;
|
use OCA\Files_Sharing\Capabilities;
|
||||||
|
use OCP\EventDispatcher\IEventDispatcher;
|
||||||
|
use OCP\Files\IRootFolder;
|
||||||
|
use OCP\Files\Mount\IMountManager;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
use OCP\IGroupManager;
|
||||||
|
use OCP\IL10N;
|
||||||
|
use OCP\ILogger;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
use OCP\IUserManager;
|
||||||
|
use OCP\IUserSession;
|
||||||
|
use OCP\L10N\IFactory;
|
||||||
|
use OCP\Mail\IMailer;
|
||||||
|
use OCP\Security\IHasher;
|
||||||
|
use OCP\Security\ISecureRandom;
|
||||||
|
use OCP\Share\IProviderFactory;
|
||||||
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class CapabilitiesTest
|
* Class CapabilitiesTest
|
||||||
|
@ -60,7 +76,26 @@ class CapabilitiesTest extends \Test\TestCase {
|
||||||
private function getResults(array $map) {
|
private function getResults(array $map) {
|
||||||
$config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock();
|
$config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock();
|
||||||
$config->method('getAppValue')->willReturnMap($map);
|
$config->method('getAppValue')->willReturnMap($map);
|
||||||
$cap = new Capabilities($config);
|
$shareManager = new Manager(
|
||||||
|
$this->createMock(ILogger::class),
|
||||||
|
$config,
|
||||||
|
$this->createMock(ISecureRandom::class),
|
||||||
|
$this->createMock(IHasher::class),
|
||||||
|
$this->createMock(IMountManager::class),
|
||||||
|
$this->createMock(IGroupManager::class),
|
||||||
|
$this->createMock(IL10N::class),
|
||||||
|
$this->createMock(IFactory::class),
|
||||||
|
$this->createMock(IProviderFactory::class),
|
||||||
|
$this->createMock(IUserManager::class),
|
||||||
|
$this->createMock(IRootFolder::class),
|
||||||
|
$this->createMock(EventDispatcherInterface::class),
|
||||||
|
$this->createMock(IMailer::class),
|
||||||
|
$this->createMock(IURLGenerator::class),
|
||||||
|
$this->createMock(\OC_Defaults::class),
|
||||||
|
$this->createMock(IEventDispatcher::class),
|
||||||
|
$this->createMock(IUserSession::class)
|
||||||
|
);
|
||||||
|
$cap = new Capabilities($config, $shareManager);
|
||||||
$result = $this->getFilesSharingPart($cap->getCapabilities());
|
$result = $this->getFilesSharingPart($cap->getCapabilities());
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,6 +90,8 @@ class SharingTest extends TestCase {
|
||||||
['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
|
['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
|
||||||
['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
|
['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
|
||||||
]);
|
]);
|
||||||
|
$this->shareManager->method('shareWithGroupMembersOnly')
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
$expected = new TemplateResponse(
|
$expected = new TemplateResponse(
|
||||||
'settings',
|
'settings',
|
||||||
|
@ -121,6 +123,7 @@ class SharingTest extends TestCase {
|
||||||
'shareDefaultRemoteExpireDateSet' => 'no',
|
'shareDefaultRemoteExpireDateSet' => 'no',
|
||||||
'shareRemoteExpireAfterNDays' => '7',
|
'shareRemoteExpireAfterNDays' => '7',
|
||||||
'shareRemoteEnforceExpireDate' => 'no',
|
'shareRemoteEnforceExpireDate' => 'no',
|
||||||
|
'allowLinksExcludeGroups' => '',
|
||||||
],
|
],
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
|
@ -156,6 +159,8 @@ class SharingTest extends TestCase {
|
||||||
['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
|
['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
|
||||||
['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
|
['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
|
||||||
]);
|
]);
|
||||||
|
$this->shareManager->method('shareWithGroupMembersOnly')
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
$expected = new TemplateResponse(
|
$expected = new TemplateResponse(
|
||||||
'settings',
|
'settings',
|
||||||
|
@ -187,6 +192,7 @@ class SharingTest extends TestCase {
|
||||||
'shareDefaultRemoteExpireDateSet' => 'no',
|
'shareDefaultRemoteExpireDateSet' => 'no',
|
||||||
'shareRemoteExpireAfterNDays' => '7',
|
'shareRemoteExpireAfterNDays' => '7',
|
||||||
'shareRemoteEnforceExpireDate' => 'no',
|
'shareRemoteEnforceExpireDate' => 'no',
|
||||||
|
'allowLinksExcludeGroups' => '',
|
||||||
],
|
],
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
|
|
|
@ -72,6 +72,7 @@ use OCP\IGroupManager;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
|
use OCP\Share\IManager;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
class OC_Util {
|
class OC_Util {
|
||||||
|
@ -336,8 +337,9 @@ class OC_Util {
|
||||||
* @suppress PhanDeprecatedFunction
|
* @suppress PhanDeprecatedFunction
|
||||||
*/
|
*/
|
||||||
public static function isPublicLinkPasswordRequired() {
|
public static function isPublicLinkPasswordRequired() {
|
||||||
$enforcePassword = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_links_password', 'no');
|
/** @var IManager $shareManager */
|
||||||
return $enforcePassword === 'yes';
|
$shareManager = \OC::$server->get(IManager::class);
|
||||||
|
return $shareManager->shareApiLinkEnforcePassword();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -348,25 +350,10 @@ class OC_Util {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
|
public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
|
||||||
if ($config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
|
/** @var IManager $shareManager */
|
||||||
$groupsList = $config->getAppValue('core', 'shareapi_exclude_groups_list', '');
|
$shareManager = \OC::$server->get(IManager::class);
|
||||||
$excludedGroups = json_decode($groupsList);
|
$userId = $user ? $user->getUID() : null;
|
||||||
if (is_null($excludedGroups)) {
|
return $shareManager->sharingDisabledForUser($userId);
|
||||||
$excludedGroups = explode(',', $groupsList);
|
|
||||||
$newValue = json_encode($excludedGroups);
|
|
||||||
$config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
|
|
||||||
}
|
|
||||||
$usersGroups = $groupManager->getUserGroupIds($user);
|
|
||||||
if (!empty($usersGroups)) {
|
|
||||||
$remainingGroups = array_diff($usersGroups, $excludedGroups);
|
|
||||||
// if the user is only in groups which are disabled for sharing then
|
|
||||||
// sharing is also disabled for the user
|
|
||||||
if (empty($remainingGroups)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -376,14 +363,9 @@ class OC_Util {
|
||||||
* @suppress PhanDeprecatedFunction
|
* @suppress PhanDeprecatedFunction
|
||||||
*/
|
*/
|
||||||
public static function isDefaultExpireDateEnforced() {
|
public static function isDefaultExpireDateEnforced() {
|
||||||
$isDefaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no');
|
/** @var IManager $shareManager */
|
||||||
$enforceDefaultExpireDate = false;
|
$shareManager = \OC::$server->get(IManager::class);
|
||||||
if ($isDefaultExpireDateEnabled === 'yes') {
|
return $shareManager->shareApiLinkDefaultExpireDateEnforced();
|
||||||
$value = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
|
|
||||||
$enforceDefaultExpireDate = $value === 'yes';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $enforceDefaultExpireDate;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -45,6 +45,7 @@ use OCP\IServerContainer;
|
||||||
use OCP\IURLGenerator;
|
use OCP\IURLGenerator;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
|
use OCP\IUserSession;
|
||||||
use OCP\L10N\IFactory;
|
use OCP\L10N\IFactory;
|
||||||
use OCP\Mail\IMailer;
|
use OCP\Mail\IMailer;
|
||||||
use OCP\Security\Events\ValidatePasswordPolicyEvent;
|
use OCP\Security\Events\ValidatePasswordPolicyEvent;
|
||||||
|
@ -104,6 +105,7 @@ class ManagerTest extends \Test\TestCase {
|
||||||
protected $urlGenerator;
|
protected $urlGenerator;
|
||||||
/** @var \OC_Defaults|MockObject */
|
/** @var \OC_Defaults|MockObject */
|
||||||
protected $defaults;
|
protected $defaults;
|
||||||
|
protected $userSession;
|
||||||
|
|
||||||
protected function setUp(): void {
|
protected function setUp(): void {
|
||||||
$this->logger = $this->createMock(ILogger::class);
|
$this->logger = $this->createMock(ILogger::class);
|
||||||
|
@ -119,6 +121,7 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->urlGenerator = $this->createMock(IURLGenerator::class);
|
$this->urlGenerator = $this->createMock(IURLGenerator::class);
|
||||||
$this->defaults = $this->createMock(\OC_Defaults::class);
|
$this->defaults = $this->createMock(\OC_Defaults::class);
|
||||||
$this->dispatcher = $this->createMock(IEventDispatcher::class);
|
$this->dispatcher = $this->createMock(IEventDispatcher::class);
|
||||||
|
$this->userSession = $this->createMock(IUserSession::class);
|
||||||
|
|
||||||
$this->l10nFactory = $this->createMock(IFactory::class);
|
$this->l10nFactory = $this->createMock(IFactory::class);
|
||||||
$this->l = $this->createMock(IL10N::class);
|
$this->l = $this->createMock(IL10N::class);
|
||||||
|
@ -149,7 +152,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->defaultProvider = $this->createMock(DefaultShareProvider::class);
|
$this->defaultProvider = $this->createMock(DefaultShareProvider::class);
|
||||||
|
@ -178,7 +182,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2690,7 +2695,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$share = $this->createMock(IShare::class);
|
$share = $this->createMock(IShare::class);
|
||||||
|
@ -2734,7 +2740,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$share = $this->createMock(IShare::class);
|
$share = $this->createMock(IShare::class);
|
||||||
|
@ -2785,7 +2792,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$share = $this->createMock(IShare::class);
|
$share = $this->createMock(IShare::class);
|
||||||
|
@ -4123,7 +4131,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
$this->assertSame($expected,
|
$this->assertSame($expected,
|
||||||
$manager->shareProviderExists($shareType)
|
$manager->shareProviderExists($shareType)
|
||||||
|
@ -4156,7 +4165,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$factory->setProvider($this->defaultProvider);
|
$factory->setProvider($this->defaultProvider);
|
||||||
|
@ -4220,7 +4230,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$factory->setProvider($this->defaultProvider);
|
$factory->setProvider($this->defaultProvider);
|
||||||
|
@ -4336,7 +4347,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$factory->setProvider($this->defaultProvider);
|
$factory->setProvider($this->defaultProvider);
|
||||||
|
@ -4461,7 +4473,8 @@ class ManagerTest extends \Test\TestCase {
|
||||||
$this->mailer,
|
$this->mailer,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->defaults,
|
$this->defaults,
|
||||||
$this->dispatcher
|
$this->dispatcher,
|
||||||
|
$this->userSession
|
||||||
);
|
);
|
||||||
|
|
||||||
$factory->setProvider($this->defaultProvider);
|
$factory->setProvider($this->defaultProvider);
|
||||||
|
|
|
@ -10,8 +10,6 @@ namespace Test;
|
||||||
|
|
||||||
use OC_Util;
|
use OC_Util;
|
||||||
use OCP\App\IAppManager;
|
use OCP\App\IAppManager;
|
||||||
use OCP\IConfig;
|
|
||||||
use OCP\IUser;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class UtilTest
|
* Class UtilTest
|
||||||
|
@ -171,53 +169,6 @@ class UtilTest extends \Test\TestCase {
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @dataProvider dataProviderForTestIsSharingDisabledForUser
|
|
||||||
* @param array $groups existing groups
|
|
||||||
* @param array $membership groups the user belong to
|
|
||||||
* @param array $excludedGroups groups which should be excluded from sharing
|
|
||||||
* @param bool $expected expected result
|
|
||||||
*/
|
|
||||||
public function testIsSharingDisabledForUser($groups, $membership, $excludedGroups, $expected) {
|
|
||||||
$config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock();
|
|
||||||
$groupManager = $this->getMockBuilder('OCP\IGroupManager')->disableOriginalConstructor()->getMock();
|
|
||||||
$user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
|
|
||||||
|
|
||||||
$config
|
|
||||||
->expects($this->at(0))
|
|
||||||
->method('getAppValue')
|
|
||||||
->with('core', 'shareapi_exclude_groups', 'no')
|
|
||||||
->willReturn('yes');
|
|
||||||
$config
|
|
||||||
->expects($this->at(1))
|
|
||||||
->method('getAppValue')
|
|
||||||
->with('core', 'shareapi_exclude_groups_list')
|
|
||||||
->willReturn(json_encode($excludedGroups));
|
|
||||||
|
|
||||||
$groupManager
|
|
||||||
->expects($this->at(0))
|
|
||||||
->method('getUserGroupIds')
|
|
||||||
->with($user)
|
|
||||||
->willReturn($membership);
|
|
||||||
|
|
||||||
$result = \OC_Util::isSharingDisabledForUser($config, $groupManager, $user);
|
|
||||||
|
|
||||||
$this->assertSame($expected, $result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function dataProviderForTestIsSharingDisabledForUser() {
|
|
||||||
return [
|
|
||||||
// existing groups, groups the user belong to, groups excluded from sharing, expected result
|
|
||||||
[['g1', 'g2', 'g3'], [], ['g1'], false],
|
|
||||||
[['g1', 'g2', 'g3'], [], [], false],
|
|
||||||
[['g1', 'g2', 'g3'], ['g2'], ['g1'], false],
|
|
||||||
[['g1', 'g2', 'g3'], ['g2'], [], false],
|
|
||||||
[['g1', 'g2', 'g3'], ['g1', 'g2'], ['g1'], false],
|
|
||||||
[['g1', 'g2', 'g3'], ['g1', 'g2'], ['g1', 'g2'], true],
|
|
||||||
[['g1', 'g2', 'g3'], ['g1', 'g2'], ['g1', 'g2', 'g3'], true],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test default apps
|
* Test default apps
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue