fix(CardDAV): allow disabling of the system address book via config option

Signed-off-by: Anna Larch <anna@nextcloud.com>

diff --git a/apps/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php
index 938575bd1a775e5daba8c364307c1ac2f7747309..4d8812c73df6b131ebd0644ae0383da917dc37e2 100644 (file)
--- a/apps/dav/lib/CardDAV/UserAddressBooks.php
+++ b/apps/dav/lib/CardDAV/UserAddressBooks.php
@@ -88,7 +88,8 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
                $addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
                // add the system address book
                $systemAddressBook = null;
-               if (is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
+               $systemAddressBookExposed = $this->config->getAppValue('dav', 'system_addressbook_exposed', 'yes') === 'yes';
+               if ($systemAddressBookExposed && is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
                        $systemAddressBook = $this->carddavBackend->getAddressBooksByUri('principals/system/system', 'system');
                        if ($systemAddressBook !== null) {
                                $systemAddressBook['uri'] = SystemAddressbook::URI_SHARED;