diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-02-15 11:52:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-19 12:35:33 +0100 |
| commit | b216be8ccaae96bc67d84dcaaa15f0a3a7b5e5f8 (patch) | |
| tree | 0c3e1113bd4d651300e71bacd495b78e3398f198 /apps/dav/appinfo | |
| parent | 4e2f9ce05ba8b8a8d695fc85b5ef56b35e2d59cb (diff) | |
| download | nextcloud-server-b216be8ccaae96bc67d84dcaaa15f0a3a7b5e5f8.tar.gz nextcloud-server-b216be8ccaae96bc67d84dcaaa15f0a3a7b5e5f8.zip | |
Add correct principals for the current user before ACL check
Diffstat (limited to 'apps/dav/appinfo')
| -rw-r--r-- | apps/dav/appinfo/v1/caldav.php | 5 | ||||
| -rw-r--r-- | apps/dav/appinfo/v1/carddav.php | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index 333e8bbb3c4..3e56e3d0e81 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -62,7 +62,10 @@ $server->setBaseUri($baseuri); $server->addPlugin(new MaintenancePlugin()); $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud')); $server->addPlugin(new \Sabre\CalDAV\Plugin()); -$server->addPlugin(new \Sabre\DAVACL\Plugin()); + +$acl = new \OCA\DAV\Connector\LegacyDAVACL(); +$server->addPlugin($acl); + $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger())); diff --git a/apps/dav/appinfo/v1/carddav.php b/apps/dav/appinfo/v1/carddav.php index 54f0d259bb9..4a3f98475cd 100644 --- a/apps/dav/appinfo/v1/carddav.php +++ b/apps/dav/appinfo/v1/carddav.php @@ -22,7 +22,6 @@ // Backends use OCA\DAV\CardDAV\AddressBookRoot; use OCA\DAV\CardDAV\CardDavBackend; -use OCA\DAV\Connector\Sabre\AppEnabledPlugin; use OCA\DAV\Connector\Sabre\Auth; use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin; use OCA\DAV\Connector\Sabre\MaintenancePlugin; @@ -63,7 +62,10 @@ $server->setBaseUri($baseuri); $server->addPlugin(new MaintenancePlugin()); $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud')); $server->addPlugin(new Plugin()); -$server->addPlugin(new \Sabre\DAVACL\Plugin()); + +$acl = new \OCA\DAV\Connector\LegacyDAVACL(); +$server->addPlugin($acl); + $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin()); $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger())); |