March 2008 - calendarserver-changes

[2269] CalendarServer/trunk/contrib/launchd/calendarserver.plist
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2269 http://trac.macosforge.org/projects/calendarserver/changeset/2269 Author: wsanchez(a)apple.com Date: 2008-03-31 15:28:37 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Bump up file limits Modified Paths: -------------- CalendarServer/trunk/contrib/launchd/calendarserver.plist Modified: CalendarServer/trunk/contrib/launchd/calendarserver.plist =================================================================== --- CalendarServer/trunk/contrib/launchd/calendarserver.plist 2008-03-31 19:57:21 UTC (rev 2268) +++ CalendarServer/trunk/contrib/launchd/calendarserver.plist 2008-03-31 22:28:37 UTC (rev 2269) @@ -44,5 +44,17 @@ <key>StandardErrorPath</key> <string>/var/log/caldavd/error.log</string> + <key>HardResourceLimits</key> + <dict> + <key>NumberOfFiles</key> + <integer>12000</integer> + </dict> + + <key>SoftResourceLimits</key> + <dict> + <key>NumberOfFiles</key> + <integer>12000</integer> + </dict> + </dict> </plist>

1 0

[2268] CalendarServer/branches/users/cdaboo/timezones-2054/
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2268 http://trac.macosforge.org/projects/calendarserver/changeset/2268 Author: cdaboo(a)apple.com Date: 2008-03-31 12:57:21 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Merged in to trunk a while ago. Removed Paths: ------------- CalendarServer/branches/users/cdaboo/timezones-2054/

1 0

[2267] CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2267 http://trac.macosforge.org/projects/calendarserver/changeset/2267 Author: cdaboo(a)apple.com Date: 2008-03-31 12:56:43 -0700 (Mon, 31 Mar 2008) Log Message: ----------- No longer relevant. Removed Paths: ------------- CalendarServer/branches/users/cdaboo/multiple-computer-records-1911/

1 0

[2266] CalendarServer/branches/users/cdaboo/en0-1298/
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2266 http://trac.macosforge.org/projects/calendarserver/changeset/2266 Author: cdaboo(a)apple.com Date: 2008-03-31 12:55:32 -0700 (Mon, 31 Mar 2008) Log Message: ----------- No longer relevant. Removed Paths: ------------- CalendarServer/branches/users/cdaboo/en0-1298/

1 0

[2265] CalendarServer/branches/users/cdaboo/mysql-2262/
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2265 http://trac.macosforge.org/projects/calendarserver/changeset/2265 Author: cdaboo(a)apple.com Date: 2008-03-31 12:54:56 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Not ready to go down this road yet. Removed Paths: ------------- CalendarServer/branches/users/cdaboo/mysql-2262/

1 0

[2264] CalendarServer/branches/users/cdaboo/mysql-2262/twistedcaldav/sql.py
by source_changes＠macosforge.org 31 Mar '08

31 Mar '08

Revision: 2264 http://trac.macosforge.org/projects/calendarserver/changeset/2264 Author: cdaboo(a)apple.com Date: 2008-03-31 07:03:03 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Allow choice of DB-API driver. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/mysql-2262/twistedcaldav/sql.py Modified: CalendarServer/branches/users/cdaboo/mysql-2262/twistedcaldav/sql.py =================================================================== --- CalendarServer/branches/users/cdaboo/mysql-2262/twistedcaldav/sql.py 2008-03-28 16:51:37 UTC (rev 2263) +++ CalendarServer/branches/users/cdaboo/mysql-2262/twistedcaldav/sql.py 2008-03-31 14:03:03 UTC (rev 2264) @@ -29,6 +29,8 @@ except ImportError: from pysqlite2 import dbapi2 as sqlite +import MySQLdb + from twisted.python import log db_prefix = ".db." @@ -38,7 +40,7 @@ A generic SQL database. """ - def __init__(self, dbpath, persistent, autocommit=False): + def __init__(self, dbpath, persistent, autocommit=False, driver="sqlite"): """ @param dbpath: the path where the db file is stored. @@ -48,10 +50,17 @@ @type persistent: bool @param autocommit: C{True} if auto-commit mode is desired, C{False} otherwise @type autocommit: bool + @param driver: name of the database driver to use + @type driver: C{str} """ self.dbpath = dbpath self.persistent = persistent self.autocommit = autocommit + + self.driver = driver + self.dbdriver = {"sqlite": sqlite, "mysql": MySQLdb}.get(self.driver, None) + if self.dbdriver is None: + raise ValueError("SQl driver type: %s is not supported." % (driver,)) def _db_version(self): """ @@ -74,9 +83,9 @@ db_filename = self.dbpath try: if self.autocommit: - self._db_connection = sqlite.connect(db_filename, isolation_level=None) + self._db_connection = self.dbdriver.connect(db_filename, isolation_level=None) else: - self._db_connection = sqlite.connect(db_filename) + self._db_connection = self.dbdriver.connect(db_filename) except: log.err("Unable to open database: %s" % (db_filename,)) raise @@ -220,7 +229,7 @@ """ if self.persistent: - self._db_connection = sqlite.connect(self.dbpath, isolation_level=None) + self._db_connection = self.dbdriver.connect(self.dbpath, isolation_level=None) q = self._db_connection.cursor() self._db_upgrade_data_tables(q, old_version) self._db_upgrade_schema(q)

1 0

[2263] CalendarServer/branches/users/cdaboo/mysql-2262/
by source_changes＠macosforge.org 28 Mar '08

28 Mar '08

Revision: 2263 http://trac.macosforge.org/projects/calendarserver/changeset/2263 Author: cdaboo(a)apple.com Date: 2008-03-28 09:51:37 -0700 (Fri, 28 Mar 2008) Log Message: ----------- Branch for work to add MySQL as a DB option. Added Paths: ----------- CalendarServer/branches/users/cdaboo/mysql-2262/ Copied: CalendarServer/branches/users/cdaboo/mysql-2262 (from rev 2262, CalendarServer/trunk)

1 0

[2262] CalDAVTester/trunk
by source_changes＠macosforge.org 28 Mar '08

28 Mar '08

Revision: 2262 http://trac.macosforge.org/projects/calendarserver/changeset/2262 Author: cdaboo(a)apple.com Date: 2008-03-28 09:43:35 -0700 (Fri, 28 Mar 2008) Log Message: ----------- Test to make sure only valid utf-8 calendar data is processed. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/nonascii.xml Added Paths: ----------- CalDAVTester/trunk/Resource/nonascii/10.ics CalDAVTester/trunk/Resource/nonascii/11.ics Added: CalDAVTester/trunk/Resource/nonascii/10.ics =================================================================== --- CalDAVTester/trunk/Resource/nonascii/10.ics (rev 0) +++ CalDAVTester/trunk/Resource/nonascii/10.ics 2008-03-28 16:43:35 UTC (rev 2262) @@ -0,0 +1,30 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +DTSTART;TZID=US/Eastern:20060101T100000 +DURATION:PT1H +SUMMARY:\xD4test\xD5 +UID:54E181BC7CCC373042B28842@ninevah.local +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/nonascii/11.ics =================================================================== --- CalDAVTester/trunk/Resource/nonascii/11.ics (rev 0) +++ CalDAVTester/trunk/Resource/nonascii/11.ics 2008-03-28 16:43:35 UTC (rev 2262) @@ -0,0 +1,34 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN +VERSION:2.0 +METHOD:REQUEST +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +DTSTART;TZID=US/Eastern:20060101T100000 +DURATION:PT1H +SUMMARY:\xD4test\xD5 +UID:54E181BC7CCC373042B28842@ninevah.local +ORGANIZER;CN=User 01:$cuaddr1: +ATTENDEE;CN=User 02:$cuaddr2: +ATTENDEE;CN=User 03:$cuaddr3: +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/tests/nonascii.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-03-28 16:30:27 UTC (rev 2261) +++ CalDAVTester/trunk/scripts/tests/nonascii.xml 2008-03-28 16:43:35 UTC (rev 2262) @@ -23,7 +23,12 @@ <caldavtest> <description>Test use of UTF-8 for HTTP and calendar data</description> - <start/> + <start> + <request end-delete="yes"> + <method>MKCOL</method> + <ruri>$pathprefix:/collection/</ruri> + </request> + </start> <test-suite name='MKCALENDAR' ignore="yes"> <test name='1'> @@ -376,6 +381,145 @@ </test> </test-suite> + <test-suite name='Non-utf-8 calendar data' ignore="no"> + <test name='1'> + <description>PUT with non-utf-8 data without charset</description> + <request end-delete="yes"> + <method>PUT</method> + <ruri>nonutf8.ics</ruri> + <data> + <content-type>text/calendar</content-type> + <filepath>Resource/nonascii/10.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + <test name='2'> + <description>PUT with non-utf-8 data with utf-8 charset</description> + <request end-delete="yes"> + <method>PUT</method> + <ruri>nonutf8.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/nonascii/10.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + <test name='3'> + <description>PUT with non-utf-8 data with non-utf-8 charset</description> + <request end-delete="yes"> + <method>PUT</method> + <ruri>nonutf8.ics</ruri> + <data> + <content-type>text/calendar; charset=iso-8859-1</content-type> + <filepath>Resource/nonascii/10.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + </test-suite> + + <test-suite name='Copy/Move Non-utf-8 calendar data' ignore="no"> + <test name='1'> + <description>PUT with non-utf-8 data to regular collection</description> + <request end-delete="yes"> + <method>PUT</method> + <ruri>$pathprefix:/collection/nonutf8.ics</ruri> + <data> + <content-type>text/calendar</content-type> + <filepath>Resource/nonascii/10.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + <test name='2'> + <description>COPY non-utf-8 data to calendar collection</description> + <request end-delete="yes"> + <method>COPY</method> + <header> + <name>Destination</name> + <value>$host:$calendarpath1:/copy1.ics</value> + </header> + <ruri>$pathprefix:/collection/nonutf8.ics</ruri> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + <test name='3'> + <description>MOVE non-utf-8 data to calendar collection</description> + <request end-delete="yes"> + <method>MOVE</method> + <header> + <name>Destination</name> + <value>$host:$calendarpath1:/copy1.ics</value> + </header> + <ruri>$pathprefix:/collection/nonutf8.ics</ruri> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + </test-suite> + + <test-suite name="POSTs" ignore='no'> + <test name='1'> + <description>POST with non-utf-8 data</description> + <request print-response='no'> + <method>POST</method> + <header> + <name>Originator</name> + <value>$cuaddr1:</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/nonascii/11.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value> + </arg> + </verify> + </request> + </test> + </test-suite> + <end/> </caldavtest>

1 0

[2261] CalendarServer/trunk/twistedcaldav/ical.py
by source_changes＠macosforge.org 28 Mar '08

28 Mar '08

Revision: 2261 http://trac.macosforge.org/projects/calendarserver/changeset/2261 Author: cdaboo(a)apple.com Date: 2008-03-28 09:30:27 -0700 (Fri, 28 Mar 2008) Log Message: ----------- Bypass vobject's charset auto-detection mode and instead require all calendar data to be utf-8. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/ical.py Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2008-03-26 23:53:57 UTC (rev 2260) +++ CalendarServer/trunk/twistedcaldav/ical.py 2008-03-28 16:30:27 UTC (rev 2261) @@ -206,7 +206,10 @@ C{stream}. """ try: - return clazz(None, vobject=readComponents(stream).next()) + return clazz(None, vobject=readComponents(stream, findBegin=False).next()) + except UnicodeDecodeError, e: + stream.seek(0) + raise ValueError("%s: %s" % (e, stream.read())) except vParseError, e: raise ValueError(e) except StopIteration, e:

1 0

[2260] CalendarServer/branches/release/CalendarServer-1.3-dev/setup.py
by source_changes＠macosforge.org 26 Mar '08

26 Mar '08

Revision: 2260 http://trac.macosforge.org/projects/calendarserver/changeset/2260 Author: wsanchez(a)apple.com Date: 2008-03-26 16:53:57 -0700 (Wed, 26 Mar 2008) Log Message: ----------- base version = 1.3 Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-1.3-dev/setup.py Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/setup.py =================================================================== --- CalendarServer/branches/release/CalendarServer-1.3-dev/setup.py 2008-03-26 23:44:53 UTC (rev 2259) +++ CalendarServer/branches/release/CalendarServer-1.3-dev/setup.py 2008-03-26 23:53:57 UTC (rev 2260) @@ -25,7 +25,7 @@ # Compute the version number. # -base_version = "1.1" +base_version = "1.3" branches = ( "tags/release/CalendarServer-" + base_version,

1 0