mirror of https://github.com/nextcloud/server.git
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>pull/11822/head
Georg Ehrke
6 years ago
parent
1ce8672276
commit
f5dc7b7f07
@ -0,0 +1,132 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Georg Ehrke
|
||||
*
|
||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||
*
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
namespace OCA\DAV\CalDAV;
|
||||
|
||||
use OCP\IConfig;
|
||||
use Sabre\CalDAV\Plugin as CalDAVPlugin;
|
||||
|
||||
/**
|
||||
* Class Outbox
|
||||
*
|
||||
* @package OCA\DAV\CalDAV
|
||||
*/
|
||||
class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
/** @var null|bool */
|
||||
private $disableFreeBusy = null;
|
||||
|
||||
/**
|
||||
* Outbox constructor.
|
||||
*
|
||||
* @param IConfig $config
|
||||
* @param string $principalUri
|
||||
*/
|
||||
public function __construct(IConfig $config, string $principalUri) {
|
||||
parent::__construct($principalUri);
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a list of ACE's for this node.
|
||||
*
|
||||
* Each ACE has the following properties:
|
||||
* * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
|
||||
* currently the only supported privileges
|
||||
* * 'principal', a url to the principal who owns the node
|
||||
* * 'protected' (optional), indicating that this ACE is not allowed to
|
||||
* be updated.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
function getACL() {
|
||||
// getACL is called so frequently that we cache the config result
|
||||
if ($this->disableFreeBusy === null) {
|
||||
$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
|
||||
}
|
||||
|
||||
$commonAcl = [
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => $this->getOwner(),
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => $this->getOwner() . '/calendar-proxy-read',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => $this->getOwner() . '/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
];
|
||||
|
||||
// schedule-send is an aggregate privilege for:
|
||||
// - schedule-send-invite
|
||||
// - schedule-send-reply
|
||||
// - schedule-send-freebusy
|
||||
//
|
||||
// If FreeBusy is disabled, we have to remove the latter privilege
|
||||
|
||||
if ($this->disableFreeBusy) {
|
||||
return array_merge($commonAcl, [
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
|
||||
'principal' => $this->getOwner(),
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
|
||||
'principal' => $this->getOwner() . '/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
|
||||
'principal' => $this->getOwner(),
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
|
||||
'principal' => $this->getOwner() . '/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
return array_merge($commonAcl, [
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
|
||||
'principal' => $this->getOwner(),
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
|
||||
'principal' => $this->getOwner() . '/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
]);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,123 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Georg Ehrke
|
||||
*
|
||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||
*
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\DAV\Tests\unit\CalDAV;
|
||||
|
||||
use OCA\DAV\CalDAV\Outbox;
|
||||
use OCP\IConfig;
|
||||
use Test\TestCase;
|
||||
|
||||
class OutboxTest extends TestCase {
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
/** @var Outbox */
|
||||
private $outbox;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->config = $this->createMock(IConfig::class);
|
||||
$this->outbox = new Outbox($this->config, 'user-principal-123');
|
||||
}
|
||||
|
||||
public function testGetACLFreeBusyEnabled() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getAppValue')
|
||||
->with('dav', 'disableFreeBusy', 'no')
|
||||
->will($this->returnValue('no'));
|
||||
|
||||
$this->assertEquals([
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123/calendar-proxy-read',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send',
|
||||
'principal' => 'user-principal-123',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send',
|
||||
'principal' => 'user-principal-123/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
], $this->outbox->getACL());
|
||||
}
|
||||
|
||||
public function testGetACLFreeBusyDisabled() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getAppValue')
|
||||
->with('dav', 'disableFreeBusy', 'no')
|
||||
->will($this->returnValue('yes'));
|
||||
|
||||
$this->assertEquals([
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123/calendar-proxy-read',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{DAV:}read',
|
||||
'principal' => 'user-principal-123/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send-invite',
|
||||
'principal' => 'user-principal-123',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send-invite',
|
||||
'principal' => 'user-principal-123/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send-reply',
|
||||
'principal' => 'user-principal-123',
|
||||
'protected' => true,
|
||||
],
|
||||
[
|
||||
'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-send-reply',
|
||||
'principal' => 'user-principal-123/calendar-proxy-write',
|
||||
'protected' => true,
|
||||
],
|
||||
], $this->outbox->getACL());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue