Add CalDAV Support for system shares in nag and kronolith for Request…

… #12342. This does not address CardDAV and Turba yet, but it is probably very similar. Note I have not a very deep understanding of CardDAV or CalDAV protocol.
horde · Jul 11, 2013 · 1e33278 · 1e33278
1 parent 7da7a1a
commit 1e33278
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 5 deletions.
diff --git a/framework/Dav/lib/Horde/Dav/Principals.php b/framework/Dav/lib/Horde/Dav/Principals.php
@@ -64,7 +64,7 @@ public function getPrincipalsByPrefix($prefixPath)
         if ($prefixPath != 'principals') {
             throw new DAV\Exception\NotFound('Invalid principal prefix path ' . $prefixPath);
         }
-        $users = array();
+        $users = array($this->_getUserInfo('-system-'));
         if (!$this->_auth->hasCapability('list')) {
             return $users;
         }
@@ -87,7 +87,8 @@ public function getPrincipalByPath($path)
             throw new DAV\Exception\NotFound('Invalid principal prefix path ' . $prefix);
         }
         if ($this->_auth->hasCapability('list') &&
-            !$this->_auth->exists($user)) {
+            !$this->_auth->exists($user) &&
+            $user != '-system-') {
             throw new DAV\Exception\NotFound('User ' . $user . ' does not exist');
         }
         return $this->_getUserInfo($user);
@@ -102,6 +103,16 @@ public function getPrincipalByPath($path)
      */
     protected function _getUserInfo($user)
     {
+        if ($user == '-system-') {
+            return array(
+                'uri' => 'principals/-system-',
+                '{DAV:}displayname' => '-systems-',
+                '{http://sabredav.org/ns}email-address' => ''
+                /* Should we leave this empty, set something static
+                   or pull something from config ? */
+            );
+        }
+
         $identity = $this->_identities->create($user);
         return array(
             'uri' => 'principals/' . $user,
@@ -154,7 +165,9 @@ public function getGroupMemberSet($principal)
      */
     public function getGroupMembership($principal)
     {
-        return array();
+         // All users should have access to the -system- share
+         // Which should return only calendars the user sees in Horde.
+        return array('principals/-system-');
     }
 
     /**

diff --git a/framework/Dav/package.xml b/framework/Dav/package.xml
@@ -22,6 +22,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
+* [rla] Add system share support for CalDAV (Request #12342).
 * [jan] Fix PUTing content from the input stream to the backend.
 * [jan] Update to SabreDAV 1.8.6.
  </notes>
@@ -669,6 +670,7 @@
    <date>2013-06-04</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
+* [rla] Add system share support for CalDAV (Request #12342).
 * [jan] Fix PUTing content from the input stream to the backend.
 * [jan] Update to SabreDAV 1.8.6.
    </notes>

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.1.2-git
 ----------
 
+[rla] Add system calendar support for Kronolith CalDAV access (Request #12342).
 [mjr] Fix automatically adding organizer as attendee in dynamic view.
 [mjr] Prompt for sending cancellation iTip when deleting an event (Bug #12415).
 [rla] Properly display system-owned calendars when browsing DAV (Bug #12325).

diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
@@ -661,17 +661,21 @@ public function cleanupData()
      */
     public function davGetCollections($user)
     {
+        $queryUser = $user == '-system-' ? '' : $user;
         $shares = $GLOBALS['injector']
             ->getInstance('Kronolith_Shares')
             ->listShares(
                 $GLOBALS['registry']->getAuth(),
                 array('perm' => Horde_Perms::SHOW,
-                      'attributes' => $user)
+                      'attributes' => $queryUser)
             );
         $dav = $GLOBALS['injector']
             ->getInstance('Horde_Dav_Storage');
         $calendars = array();
         foreach ($shares as $id => $share) {
+            if (empty($queryUser) && $share->get('owner')) {
+                continue;
+            }
             try {
                 $id = $dav->getExternalCollectionId($id, 'calendar');
             } catch (Horde_Dav_Exception $e) {

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -34,6 +34,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [rla] Add system calendar support for Kronolith CalDAV access (Request #12342).
 * [mjr] Fix automatically adding organizer as attendee in dynamic view.
 * [mjr] Prompt for sending cancellation iTip when deleting an event (Bug #12415).
 * [rla] Properly display system-owned calendars when browsing DAV (Bug #12325).
@@ -2185,6 +2186,7 @@
    <date>2013-06-18</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [rla] Add system calendar support for Kronolith CalDAV access (Request #12342).
 * [mjr] Fix automatically adding organizer as attendee in dynamic view.
 * [mjr] Prompt for sending cancellation iTip when deleting an event (Bug #12415).
 * [rla] Properly display system-owned calendars when browsing DAV (Bug #12325).

diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.1.1-git
 ----------
 
+[rla] Add system tasklist support for Nag CalDAV access (Request #12342).
 [jan] Fix task description tooltip (Bug #12421).
 [mjr] Persist the tasklist and parent when creating a new task and using "Save
       and New" (Bug: 12400).

diff --git a/nag/lib/Application.php b/nag/lib/Application.php
@@ -421,16 +421,20 @@ public function cleanupData()
      */
     public function davGetCollections($user)
     {
+        $queryUser = $user == '-system-' ? '' : $user;
         $shares = $GLOBALS['nag_shares']
             ->listShares(
                 $GLOBALS['registry']->getAuth(),
                 array('perm' => Horde_Perms::SHOW,
-                      'attributes' => $user)
+                      'attributes' => $queryUser)
             );
         $dav = $GLOBALS['injector']
             ->getInstance('Horde_Dav_Storage');
         $tasklists = array();
         foreach ($shares as $id => $share) {
+            if (empty($queryUser) && $share->get('owner')) {
+                continue;
+            }
             try {
                 $id = $dav->getExternalCollectionId($id, 'tasks') ?: $id;
             } catch (Horde_Dav_Exception $e) {

diff --git a/nag/package.xml b/nag/package.xml
@@ -34,6 +34,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [rla] Add system tasklist support for Nag CalDAV access (Request #12342).
 * [jan] Fix task description tooltip (Bug #12421).
 * [mjr] Persist the tasklist and parent when creating a new task and using "Save and New" (Bug: 12400).
 * [mjr] Fix tag browsing of shared tasklists (Bug #12405).
@@ -1388,6 +1389,7 @@
    <date>2013-06-05</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [rla] Add system tasklist support for Nag CalDAV access (Request #12342).
 * [jan] Fix task description tooltip (Bug #12421).
 * [mjr] Persist the tasklist and parent when creating a new task and using "Save and New" (Bug: 12400).
 * [mjr] Fix tag browsing of shared tasklists (Bug #12405).