May 2007 - calendarserver-changes - lists.macosforge.org

[1532] CalDAVTester/trunk/scripts/tests/errors.xml
by source_changes＠macosforge.org 17 May '07

17 May '07

Revision: 1532 http://trac.macosforge.org/projects/calendarserver/changeset/1532 Author: cdaboo(a)apple.com Date: 2007-05-17 09:50:58 -0700 (Thu, 17 May 2007) Log Message: ----------- Add a test for an invalid urn:uuid address in scheduling that was causing a 500 error. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/errors.xml Modified: CalDAVTester/trunk/scripts/tests/errors.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/errors.xml 2007-05-17 16:50:20 UTC (rev 1531) +++ CalDAVTester/trunk/scripts/tests/errors.xml 2007-05-17 16:50:58 UTC (rev 1532) @@ -1100,6 +1100,34 @@ </test> </test-suite> + <test-suite name='Invalid urn: calendar user address' ignore='no'> + <test name='1'> + <description>POST free busy</description> + <request print-response='no'> + <method>POST</method> + <header> + <name>Originator</name> + <value>urn:uuid:bogus-uuid</value> + </header> + <header> + <name>Recipient</name> + <value>$cuaddr2:, $cuaddr3:</value> + </header> + <ruri>$pathprefix:/$outbox:/</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/schedule/6.txt</filepath> + </data> + <verify> + <callback>statusCode</callback> + <arg> + <name>status</name> + <value>403</value> + </arg> + </verify> + </request> + </test> + </test-suite> <end/> </caldavtest>

1 0

[1531] CalDAVTester/trunk/src/caldavtest.py
by source_changes＠macosforge.org 17 May '07

17 May '07

Revision: 1531 http://trac.macosforge.org/projects/calendarserver/changeset/1531 Author: cdaboo(a)apple.com Date: 2007-05-17 09:50:20 -0700 (Thu, 17 May 2007) Log Message: ----------- Fixed potential uninitialized variable error. Modified Paths: -------------- CalDAVTester/trunk/src/caldavtest.py Modified: CalDAVTester/trunk/src/caldavtest.py =================================================================== --- CalDAVTester/trunk/src/caldavtest.py 2007-05-17 15:22:22 UTC (rev 1530) +++ CalDAVTester/trunk/src/caldavtest.py 2007-05-17 16:50:20 UTC (rev 1531) @@ -117,6 +117,7 @@ return "i" else: result = False + resulttxt = "" if test.stats: reqstats = stats() else:

1 0

[1530] CalendarServer/trunk/conf
by source_changes＠macosforge.org 17 May '07

17 May '07

Revision: 1530 http://trac.macosforge.org/projects/calendarserver/changeset/1530 Author: cdaboo(a)apple.com Date: 2007-05-17 08:22:22 -0700 (Thu, 17 May 2007) Log Message: ----------- Add in some missing config.py parameters. Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-test.plist CalendarServer/trunk/conf/caldavd.plist Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2007-05-16 16:35:20 UTC (rev 1529) +++ CalendarServer/trunk/conf/caldavd-test.plist 2007-05-17 15:22:22 UTC (rev 1530) @@ -356,8 +356,17 @@ <string>logs/caldavd-pydir.sock</string> </dict> +  + +  <key>ControlSocket</key> <string>logs/caldavd.sock</string> +  + <key>ResponseCompression</key> + <false/> + </dict> </plist> Modified: CalendarServer/trunk/conf/caldavd.plist =================================================================== --- CalendarServer/trunk/conf/caldavd.plist 2007-05-16 16:35:20 UTC (rev 1529) +++ CalendarServer/trunk/conf/caldavd.plist 2007-05-17 15:22:22 UTC (rev 1530) @@ -261,5 +261,17 @@ <key>EnableNotifications</key> <true/> +  + +  + <key>ControlSocket</key> + <string>/var/run/caldavd.sock</string> + +  + <key>ResponseCompression</key> + <true/> + </dict> </plist>

1 0

[1529] CalendarServer/trunk/twistedcaldav/static.py
by source_changes＠macosforge.org 16 May '07

16 May '07

Revision: 1529 http://trac.macosforge.org/projects/calendarserver/changeset/1529 Author: cdaboo(a)apple.com Date: 2007-05-16 09:35:20 -0700 (Wed, 16 May 2007) Log Message: ----------- Make sure that private sqlite file is not included in quota total. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2007-05-15 17:36:25 UTC (rev 1528) +++ CalendarServer/trunk/twistedcaldav/static.py 2007-05-16 16:35:20 UTC (rev 1529) @@ -294,7 +294,7 @@ @return: an L{Deferred} with a C{int} result containing the size of the resource. """ if self.isCollection(): - def walktree(top, top_level = False): + def walktree(top): """ Recursively descend the directory tree rooted at top, calling the callback function for each regular file @@ -306,7 +306,7 @@ for f in top.listdir(): # Ignore the database - if top_level and f == db_basename: + if f == db_basename: continue child = top.child(f) @@ -326,7 +326,7 @@ walktree = deferredGenerator(walktree) - return walktree(self.fp, True) + return walktree(self.fp) else: return succeed(self.fp.getsize())

1 0

[1528] CalendarServer/trunk/twistedcaldav/ical.py
by source_changes＠macosforge.org 15 May '07

15 May '07

Revision: 1528 http://trac.macosforge.org/projects/calendarserver/changeset/1528 Author: cdaboo(a)apple.com Date: 2007-05-15 10:36:25 -0700 (Tue, 15 May 2007) Log Message: ----------- Revert r1524. Actually iTIP requires that there is no VTIMEZONE in a VFREEBUSY request. The client must not send one so the server is right to verify that. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/ical.py Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2007-05-15 16:15:23 UTC (rev 1527) +++ CalendarServer/trunk/twistedcaldav/ical.py 2007-05-15 17:36:25 UTC (rev 1528) @@ -879,7 +879,7 @@ # TODO: verify REQUEST/VFREEBUSY as being OK # Only one VFREEBUSY (actually multiple X-'s are allowed but we will reject) - if len([c for c in self.subcomponents() if c.name() != "VTIMEZONE"]) != 1: + if len([c for c in self.subcomponents()]) != 1: return False except ValueError:

1 0

[1527] CalendarServer/trunk/twistedcaldav/config.py
by source_changes＠macosforge.org 15 May '07

15 May '07

Revision: 1527 http://trac.macosforge.org/projects/calendarserver/changeset/1527 Author: cdaboo(a)apple.com Date: 2007-05-15 09:15:23 -0700 (Tue, 15 May 2007) Log Message: ----------- Make sure quotas are enabled by default. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2007-05-15 16:06:46 UTC (rev 1526) +++ CalendarServer/trunk/twistedcaldav/config.py 2007-05-15 16:15:23 UTC (rev 1527) @@ -227,6 +227,12 @@ CalendarPrincipalResource.enableDropBox(self.EnableDropBox) CalendarPrincipalResource.enableNotifications(self.EnableNotifications) + # Handle global quota value + from twistedcaldav.directory.calendar import DirectoryCalendarHomeResource + from twistedcaldav.resource import CalDAVResource + DirectoryCalendarHomeResource.quotaLimit = self.UserQuota + CalDAVResource.sizeLimit = self.MaximumAttachmentSize + def updateDefaults(self, items): _mergeData(self._defaults, items) self.update(items)

1 0

[1526] CalDAVTester/trunk/scripts/tests/quota.xml
by source_changes＠macosforge.org 15 May '07

15 May '07

Revision: 1526 http://trac.macosforge.org/projects/calendarserver/changeset/1526 Author: cdaboo(a)apple.com Date: 2007-05-15 09:06:46 -0700 (Tue, 15 May 2007) Log Message: ----------- Add test to verify that quota is on by default. Also we now have to ignore tests that check for the absence of quota as it cannot be turned off once it is on by default. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/quota.xml Modified: CalDAVTester/trunk/scripts/tests/quota.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/quota.xml 2007-05-14 19:37:21 UTC (rev 1525) +++ CalDAVTester/trunk/scripts/tests/quota.xml 2007-05-15 16:06:46 UTC (rev 1526) @@ -206,6 +206,33 @@ </request> </start> + <test-suite name='Quota enabled by default on calendar home' ignore='no'> + <test name='1' ignore='no'> + <description>allprop on non-quota collection</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>0</value> + </header> + <ruri>$pathprefix2:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/quota/3.xml</filepath> + </data> + <verify> + <callback>propfindItems</callback> + <arg> + <name>okprops</name> + <value>DAV:resourcetype</value> + <value>DAV:quota-available-bytes</value> + <value>DAV:quota-used-bytes</value> + </arg> + </verify> + </request> + </test> + </test-suite> + <test-suite name='Properties on collections' ignore='no'> <test name='1' ignore='no'> <description>allprop on non-quota collection</description> @@ -253,7 +280,7 @@ </verify> </request> </test> - <test name='3' ignore='no'> + <test name='3' ignore='yes'> <description>propname on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -299,7 +326,7 @@ </verify> </request> </test> - <test name='5' ignore='no'> + <test name='5' ignore='yes'> <description>props on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -399,7 +426,7 @@ </verify> </request> </test> - <test name='3' ignore='no'> + <test name='3' ignore='yes'> <description>propname on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -445,7 +472,7 @@ </verify> </request> </test> - <test name='5' ignore='no'> + <test name='5' ignore='yes'> <description>props on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -545,7 +572,7 @@ </verify> </request> </test> - <test name='3' ignore='no'> + <test name='3' ignore='yes'> <description>propname on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -591,7 +618,7 @@ </verify> </request> </test> - <test name='5' ignore='no'> + <test name='5' ignore='yes'> <description>props on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -691,7 +718,7 @@ </verify> </request> </test> - <test name='3' ignore='no'> + <test name='3' ignore='yes'> <description>propname on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method> @@ -737,7 +764,7 @@ </verify> </request> </test> - <test name='5' ignore='no'> + <test name='5' ignore='yes'> <description>props on non-quota collection</description> <request print-response='no'> <method>PROPFIND</method>

1 0

[1525] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 14 May '07

14 May '07

Revision: 1525 http://trac.macosforge.org/projects/calendarserver/changeset/1525 Author: wsanchez(a)apple.com Date: 2007-05-14 12:37:21 -0700 (Mon, 14 May 2007) Log Message: ----------- Catch exceptions in readProperty as well as errbacks. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2007-05-14 17:32:02 UTC (rev 1524) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2007-05-14 19:37:21 UTC (rev 1525) @@ -289,21 +289,21 @@ return davxml.ResourceType.collection return davxml.ResourceType.empty - def render(self, req): + def render(self, request): if not self.fp.exists(): return responsecode.NOT_FOUND if self.fp.isdir(): - if req.uri[-1] != "/": + if request.uri[-1] != "/": # Redirect to include trailing '/' in URI - return RedirectResponse(req.unparseURL(path=req.path+'/')) + return RedirectResponse(request.unparseURL(path=request.path+'/')) else: ifp = self.fp.childSearchPreauth(*self.indexNames) if ifp: # Render from the index file - return self.createSimilarFile(ifp.path).render(req) + return self.createSimilarFile(ifp.path).render(request) - return self.renderDirectory(req) + return self.renderDirectory(request) try: f = self.fp.open() @@ -430,9 +430,9 @@ def gotProperties(qnames): even = False for qname in qnames: - property = waitForDeferred(self.readProperty(qname, request)) - yield property try: + property = waitForDeferred(self.readProperty(qname, request)) + yield property property = property.getResult() name = property.sname() value = property.toxml()

1 0

[1524] CalendarServer/trunk/twistedcaldav/ical.py
by source_changes＠macosforge.org 14 May '07

14 May '07

Revision: 1524 http://trac.macosforge.org/projects/calendarserver/changeset/1524 Author: cdaboo(a)apple.com Date: 2007-05-14 10:32:02 -0700 (Mon, 14 May 2007) Log Message: ----------- Fix for failure to do free-busy request when it includes a VTIMEZONE component. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/ical.py Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2007-05-14 16:46:12 UTC (rev 1523) +++ CalendarServer/trunk/twistedcaldav/ical.py 2007-05-14 17:32:02 UTC (rev 1524) @@ -879,7 +879,7 @@ # TODO: verify REQUEST/VFREEBUSY as being OK # Only one VFREEBUSY (actually multiple X-'s are allowed but we will reject) - if len([c for c in self.subcomponents()]) != 1: + if len([c for c in self.subcomponents() if c.name() != "VTIMEZONE"]) != 1: return False except ValueError:

1 0

[1523] CalendarServer/trunk
by source_changes＠macosforge.org 14 May '07

14 May '07

Revision: 1523 http://trac.macosforge.org/projects/calendarserver/changeset/1523 Author: dreid(a)apple.com Date: 2007-05-14 09:46:12 -0700 (Mon, 14 May 2007) Log Message: ----------- Explicitly use /bin/bash all the time because otherwise we're just going to keep running into problems when /bin/sh is /bin/dash instead of /bin/bash Modified Paths: -------------- CalendarServer/trunk/test CalendarServer/trunk/testcaldav Modified: CalendarServer/trunk/test =================================================================== --- CalendarServer/trunk/test 2007-05-11 21:05:05 UTC (rev 1522) +++ CalendarServer/trunk/test 2007-05-14 16:46:12 UTC (rev 1523) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ## # Copyright (c) 2005-2007 Apple Inc. All rights reserved. Modified: CalendarServer/trunk/testcaldav =================================================================== --- CalendarServer/trunk/testcaldav 2007-05-11 21:05:05 UTC (rev 1522) +++ CalendarServer/trunk/testcaldav 2007-05-14 16:46:12 UTC (rev 1523) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ## # Copyright (c) 2005-2007 Apple Inc. All rights reserved.

1 0