nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-25 02:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

group memberships for the calendar-proxy-{read,write} pseudo-principal are always empty

Browse Source 
Only regular principals can be members in any groups, for
pseudo-principals group membership doesn't make sense. In case somebody
asks, do not return the group memberships of the parent principal but
rather provide an empty answer.
This commit is contained in:
Florian Schlichting 2017-05-01 21:05:47 +02:00
parent 8c5101c185
commit 7e3a9a476f
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/DAVPrincipal.php
View File

@ -501,6 +501,10 @@ class DAVPrincipal extends Principal
case 'http://calendarserver.org/ns/:group-membership': case 'http://calendarserver.org/ns/:group-membership':
case 'DAV::group-membership': case 'DAV::group-membership':
if ( $request->IsProxyRequest() ) {
/* the calendar-proxy-{read,write} pseudo-principal should not be a member of any group */
return false;
}
$reply->DAVElement( $prop, 'group-membership', $reply->href($this->GroupMembership()) ); $reply->DAVElement( $prop, 'group-membership', $reply->href($this->GroupMembership()) );
break; break;

14
testing/tests/regression-suite/0525-iCal-PROPFIND.result
View File

@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
ETag: "5712eb30f86b6a9755a688c43b4bb763" ETag: "5379cc33938a9b800403f94bdfec0571"
Content-Length: 1477 Content-Length: 1091
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -23,15 +23,6 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href> <href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href> <href>/caldav.php/assistant1/</href>
</group-member-set> </group-member-set>
<group-membership>
<href>/caldav.php/assistant1/</href>
<href>/caldav.php/teamclient1/</href>
<href>/caldav.php/user1/</href>
<href>/caldav.php/user1/calendar-proxy-read/</href>
<href>/caldav.php/assistant1/calendar-proxy-read/</href>
<href>/caldav.php/resource1/calendar-proxy-read/</href>
<href>/caldav.php/resource2/calendar-proxy-read/</href>
</group-membership>
<C:calendar-proxy-read-for> <C:calendar-proxy-read-for>
<href>/caldav.php/user1/</href> <href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href> <href>/caldav.php/assistant1/</href>
@ -45,6 +36,7 @@ Content-Type: text/xml; charset="utf-8"
<propstat> <propstat>
<prop> <prop>
<C1:calendar-description/> <C1:calendar-description/>
<group-membership/>
</prop> </prop>
<status>HTTP/1.1 404 Not Found</status> <status>HTTP/1.1 404 Not Found</status>
</propstat> </propstat>