Revision: 6477 http://trac.macosforge.org/projects/calendarserver/changeset/6477 Author: cdaboo@apple.com Date: 2010-10-27 18:45:42 -0700 (Wed, 27 Oct 2010) Log Message: ----------- Test direct sharing with non __uids__ paths. Modified Paths: -------------- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml CalDAVTester/trunk/scripts/server/serverinfo-template.xml CalDAVTester/trunk/scripts/server/serverinfo.xml CalDAVTester/trunk/scripts/server/sslserverinfo.xml CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml Added Paths: ----------- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics =================================================================== --- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics (rev 0) +++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-write/9.ics 2010-10-28 01:45:42 UTC (rev 6477) @@ -0,0 +1,29 @@ +BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VTIMEZONE +TZID:US/Eastern +LAST-MODIFIED:20040110T032845Z +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +END:VTIMEZONE +BEGIN:VEVENT +UID:54E181BC7CCC373042B28842-9@ninevah.local +DTSTART;TZID=US/Eastern:20060201T100000 +DURATION:PT7H +DTSTAMP:20051222T205953Z +SUMMARY:event 9.ics +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-10-27 22:47:52 UTC (rev 6476) +++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-10-28 01:45:42 UTC (rev 6477) @@ -353,6 +353,11 @@ <key>$username%d:</key> <value>User %02d</value> </substitution> + <!-- user name URI encoded --> + <substitution> + <key>$username-encoded%d:</key> + <value>User%%20%02d</value> + </substitution> <!-- password --> <substitution> <key>$pswd%d:</key> Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-10-27 22:47:52 UTC (rev 6476) +++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-10-28 01:45:42 UTC (rev 6477) @@ -355,6 +355,11 @@ <key>$username%%d:</key> <value>User %%02d</value> </substitution> + <!-- user name URI encoded --> + <substitution> + <key>$username-encoded%%d:</key> + <value>User%%%%20%%02d</value> + </substitution> <!-- password --> <substitution> <key>$pswd%%d:</key> Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-10-27 22:47:52 UTC (rev 6476) +++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-10-28 01:45:42 UTC (rev 6477) @@ -355,6 +355,11 @@ <key>$username%d:</key> <value>User %02d</value> </substitution> + <!-- user name URI encoded --> + <substitution> + <key>$username-encoded%d:</key> + <value>User%%20%02d</value> + </substitution> <!-- password --> <substitution> <key>$pswd%d:</key> Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml =================================================================== --- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-10-27 22:47:52 UTC (rev 6476) +++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-10-28 01:45:42 UTC (rev 6477) @@ -354,6 +354,11 @@ <key>$username%d:</key> <value>User %02d</value> </substitution> + <!-- user name URI encoded --> + <substitution> + <key>$username-encoded%d:</key> + <value>User%%20%02d</value> + </substitution> <!-- password --> <substitution> <key>$pswd%d:</key> Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml 2010-10-27 22:47:52 UTC (rev 6476) +++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml 2010-10-28 01:45:42 UTC (rev 6477) @@ -56,7 +56,7 @@ </request> </start> - <test-suite name='Read-write calendar'> + <test-suite name='Read-write calendar' ignore='no'> <test name='1' ignore='no'> <description>Add user02 as read write for user01</description> <request print-response="no"> @@ -394,8 +394,65 @@ </test> </test-suite> - <test-suite name='Direct share not allowed'> + <test-suite name='Removal of direct share' ignore='no'> <test name='1' ignore='no'> + <description>Remove direct share</description> + <request user="$userid2:" pswd="$pswd2:" print-response="no"> + <method>DELETE</method> + <ruri>$sharedcalendar:/</ruri> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + <test name='2'> + <description>Shared calendar does not exist</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PROPFIND</method> + <ruri>$sharedcalendar:/</ruri> + <header> + <name>Depth</name> + <value>0</value> + </header> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CalDAV/sharing/calendars/read-only/4.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + <arg> + <name>status</name> + <value>404</value> + </arg> + </verify> + </request> + </test> + <test name='3'> + <description>Sharer calendar does exist</description> + <request print-response='no'> + <method>PROPFIND</method> + <ruri>$pathprefix1:/shared/</ruri> + <header> + <name>Depth</name> + <value>1</value> + </header> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CalDAV/sharing/calendars/read-only/4.xml</filepath> + </data> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>count</name> + <value>3</value> + </arg> + </verify> + </request> + </test> + </test-suite> + + <test-suite name='Direct share not allowed' ignore='no'> + <test name='1' ignore='no'> <description>Clear user02 as read-only proxy for user01</description> <request print-response="no"> <method>PROPPATCH</method> @@ -429,6 +486,130 @@ </test> </test-suite> + <test-suite name='Using non __uids__ path' ignore='no'> + <test name='1' ignore='no'> + <description>Add user02 as read write for user01</description> + <request print-response="no"> + <method>PROPPATCH</method> + <ruri>$principal1:calendar-proxy-write/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath> + </data> + <verify> + <callback>propfindItems</callback> + <arg> + <name>okprops</name> + <value>{DAV:}group-member-set</value> + </arg> + </verify> + </request> + </test> + <test name='2'> + <description>Sharee does direct share</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GET</method> + <ruri>$calendars_users:$username-encoded1:/shared/?action=share</ruri> + <verify> + <callback>statusCode</callback> + </verify> + <grabelement> + <name>{DAV:}href</name> + <variable>$sharedcalendar2:</variable> + </grabelement> + </request> + </test> + <test name='3'> + <description>Shared calendar exists</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PROPFIND</method> + <ruri>$sharedcalendar2:/</ruri> + <header> + <name>Depth</name> + <value>0</value> + </header> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CalDAV/sharing/calendars/read-write/4.xml</filepath> + </data> + <verify> + <callback>xmlElementMatch</callback> + <arg> + <name>exists</name> + <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value> + <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value> + <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp/{urn:ietf:params:xml:ns:caldav}transparent</value> + </arg> + <arg> + <name>notexists</name> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value> + <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value> + </arg> + </verify> + </request> + </test> + <test name='4'> + <description>Sharee creates event</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PUT</method> + <ruri>$sharedcalendar2:/9.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/CalDAV/sharing/calendars/read-write/9.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + <test name='5'> + <description>Sharer sees event</description> + <request print-response='no'> + <method>GET</method> + <ruri>$pathprefix1:/shared/9.ics</ruri> + <verify> + <callback>calendarDataMatch</callback> + <arg> + <name>filepath</name> + <value>Resource/CalDAV/sharing/calendars/read-write/9.ics</value> + </arg> + </verify> + </request> + </test> + <test name='6' ignore='no'> + <description>Remove direct share</description> + <request user="$userid2:" pswd="$pswd2:" print-response="no"> + <method>DELETE</method> + <ruri>$sharedcalendar2:/</ruri> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + <test name='7' ignore='no'> + <description>Clear user02 as read-only proxy for user01</description> + <request print-response="no"> + <method>PROPPATCH</method> + <ruri>$principal1:calendar-proxy-read/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CalDAV/calendaruserproxy/4.xml</filepath> + </data> + <verify> + <callback>propfindItems</callback> + <arg> + <name>okprops</name> + <value>{DAV:}group-member-set</value> + </arg> + </verify> + </request> + </test> + </test-suite> + <end/> </caldavtest>