[CalendarServer-changes] [14154] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Nov 12 10:04:07 PST 2014
Revision: 14154
http://trac.calendarserver.org//changeset/14154
Author: cdaboo at apple.com
Date: 2014-11-12 10:04:07 -0800 (Wed, 12 Nov 2014)
Log Message:
-----------
Cross-pod group proxy change tests.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV-pod/groupproxy/
CalDAVTester/trunk/Resource/CalDAV-pod/groupproxy/1.xml
CalDAVTester/trunk/Resource/Common/PROPPATCH/read-only-proxy.xml
CalDAVTester/trunk/scripts/tests-pod/CalDAV/groupproxy.xml
Added: CalDAVTester/trunk/Resource/CalDAV-pod/groupproxy/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV-pod/groupproxy/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/groupproxy/1.xml 2014-11-12 18:04:07 UTC (rev 14154)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<D:group-member-set/>
+<D:group-membership/>
+<CS:expanded-group-member-set/>
+<CS:expanded-group-membership/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/Common/PROPPATCH/read-only-proxy.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPPATCH/read-only-proxy.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPPATCH/read-only-proxy.xml 2014-11-12 18:04:07 UTC (rev 14154)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$proxy:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-11-10 22:28:45 UTC (rev 14153)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-11-12 18:04:07 UTC (rev 14154)
@@ -654,5 +654,44 @@
</substitution>
</repeat>
+ <!-- Forty Group accounts -->
+ <repeat count="40">
+ <substitution>
+ <key>$groupid%d:</key>
+ <value>group%02d</value>
+ </substitution>
+ <!-- group guid-->
+ <substitution>
+ <key>$groupguid%d:</key>
+ <value>20000000-0000-0000-0000-000000000%03d</value>
+ </substitution>
+ <!-- group name-->
+ <substitution>
+ <key>$groupname%d:</key>
+ <value>Group %02d</value>
+ </substitution>
+ <!-- relative path to first group principal resource-->
+ <substitution>
+ <key>$gprincipal%d:</key>
+ <value>$principals_resources:$groupid%d:/</value>
+ </substitution>
+ <substitution>
+ <key>$gprincipaluri%d:</key>
+ <value>$principals_uids:$groupguid%d:/</value>
+ </substitution>
+ <substitution>
+ <key>$gemail%d:</key>
+ <value>$groupid%d:@example.com</value>
+ </substitution>
+ <substitution>
+ <key>$gcuaddralt%d:</key>
+ <value>$gprincipaluri%d:</value>
+ </substitution>
+ <substitution>
+ <key>$gcuaddrurn%d:</key>
+ <value>urn:x-uid:$groupguid%d:</value>
+ </substitution>
+ </repeat>
+
</substitutions>
</serverinfo>
Added: CalDAVTester/trunk/scripts/tests-pod/CalDAV/groupproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/groupproxy.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/groupproxy.xml 2014-11-12 18:04:07 UTC (rev 14154)
@@ -0,0 +1,1096 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest>
+ <description>Test proxy user features</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>proxy</feature>
+ <feature>podding</feature>
+ </require-feature>
+
+ <start>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
+ </data>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:" end-delete="yes">
+ <method>PUT</method>
+ <ruri>$pcalendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
+ </data>
+ </request>
+ </start>
+
+ <test-suite name="Setup group">
+ <test name='1'>
+ <description>Add group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controladdmember2.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember1:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember2:</name>
+ <value>$puserguid1:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Proxy on podA'>
+ <test name='1'>
+ <description>Verify no group memberships right now</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ <value>{$CS:}expanded-group-member-set$</value>
+ <value>{$CS:}expanded-group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ <value>{$CS:}expanded-group-member-set$</value>
+ <value>{$CS:}expanded-group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify no group memberships right now</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Verify no group memberships right now</description>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Verify no access to resource</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2="yes" user="$puserid1:" pswd="$ppswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Add group as read proxy for podA user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPPATCH/read-only-proxy.xml</filepath>
+ <substitute>
+ <name>$proxy:</name>
+ <value>$gprincipaluri20:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{DAV:}group-member-set$<href xmlns="DAV:">$gprincipaluri20:</href>]]></value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{DAV:}group-member-set$<href xmlns="DAV:">$gprincipaluri20:</href>]]></value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Verify no group memberships right now</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Verify single group membership</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Verify single group membership</description>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Verify access to resource</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>200</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>200</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Verify no access for write</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="Change group - remove podB user">
+ <test name='1'>
+ <description>Remove group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$puserguid1:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Test proxy state'>
+ <test name='1'>
+ <description>Verify no group memberships right now</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify single group membership</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$gprincipaluri20:]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Verify no group membership</description>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Verify access to resource</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>200</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Verify no access for write</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Remove proxy'>
+ <test name='1'>
+ <description>Remove group as read proxy for podA user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPPATCH/remove-proxies.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{DAV:}group-member-set$]]></value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{DAV:}group-member-set$]]></value>
+ <value>{DAV:}group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify no group memberships right now</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ <value>{$CS:}expanded-group-member-set$</value>
+ <value>{$CS:}expanded-group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes'>
+ <method>PROPFIND</method>
+ <ruri>$principal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set$</value>
+ <value>{DAV:}group-membership$</value>
+ <value>{$CS:}expanded-group-member-set$</value>
+ <value>{$CS:}expanded-group-membership$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Verify single group membership</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$principal2:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Verify no group memberships right now</description>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>PROPFIND</method>
+ <ruri>$pprincipal1:</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/groupproxy/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-member-set[|]</value>
+ <value>$verify-property-prefix:/{$CS:}expanded-group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Verify no access to resource</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ <request host2="yes" user="$puserid1:" pswd="$ppswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name="Clean group">
+ <test name='1'>
+ <description>Remove group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141112/33844f07/attachment-0001.html>
More information about the calendarserver-changes
mailing list