January 2009 - calendarserver-changes

[3625] CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3624/
by source_changes＠macosforge.org 30 Jan '09

30 Jan '09

Revision: 3625 http://trac.macosforge.org/projects/calendarserver/changeset/3625 Author: cdaboo(a)apple.com Date: 2009-01-30 08:17:10 -0800 (Fri, 30 Jan 2009) Log Message: ----------- Branch to work on cache-on-demand directory. Added Paths: ----------- CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3624/

1 0

[3624] CalendarServer/trunk/support/submit
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 3624 http://trac.macosforge.org/projects/calendarserver/changeset/3624 Author: sagen(a)apple.com Date: 2009-01-29 10:10:04 -0800 (Thu, 29 Jan 2009) Log Message: ----------- Base the build architecture list on the python library instead of /usr/lib/libSystem.dylib Modified Paths: -------------- CalendarServer/trunk/support/submit Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2009-01-29 17:48:41 UTC (rev 3623) +++ CalendarServer/trunk/support/submit 2009-01-29 18:10:04 UTC (rev 3624) @@ -172,7 +172,7 @@ fi; sudo ~rc/bin/buildit "${wc}" CALENDARSERVER_CACHE_DEPS="${CALENDARSERVER_CACHE_DEPS-${wd}/.dependencies}" \ - $(file /usr/lib/libSystem.dylib | sed -n -e 's|^.*(for architecture $[^)][^)]*$.*$|-arch \1|p' | sed 's|ppc7400|ppc|') \ + $(file /System/Library/Frameworks/Python.framework/Versions/Current/Python | sed -n -e 's|^.*(for architecture $[^)][^)]*$.*$|-arch \1|p' | sed 's|ppc7400|ppc|') \ -release SnowLeopard \ ${merge_flags};

1 0

[3623] CalendarServer/trunk/run
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 3623 http://trac.macosforge.org/projects/calendarserver/changeset/3623 Author: cdaboo(a)apple.com Date: 2009-01-29 09:48:41 -0800 (Thu, 29 Jan 2009) Log Message: ----------- Latest CalDAVTester. Modified Paths: -------------- CalendarServer/trunk/run Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2009-01-29 17:48:12 UTC (rev 3622) +++ CalendarServer/trunk/run 2009-01-29 17:48:41 UTC (rev 3623) @@ -692,7 +692,7 @@ caldavtester="${top}/CalDAVTester"; -svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3619; +svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3622; # # Calendar Server

1 0

[3622] CalDAVTester/trunk
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 3622 http://trac.macosforge.org/projects/calendarserver/changeset/3622 Author: cdaboo(a)apple.com Date: 2009-01-29 09:48:12 -0800 (Thu, 29 Jan 2009) Log Message: ----------- Fix to allow proper testing with OD. Modified Paths: -------------- CalDAVTester/trunk/odsetup.py CalDAVTester/trunk/scripts/server/serverinfo-template.xml CalDAVTester/trunk/scripts/tests/acl.xml Modified: CalDAVTester/trunk/odsetup.py =================================================================== --- CalDAVTester/trunk/odsetup.py 2009-01-29 00:20:08 UTC (rev 3621) +++ CalDAVTester/trunk/odsetup.py 2009-01-29 17:48:12 UTC (rev 3622) @@ -161,13 +161,27 @@ hostname = plist["ServerHostName"] docroot = plist["DocumentRoot"] sudoers = plist["SudoersFile"] + try: + basic_ok = plist["Authentication"]["Basic"]["Enabled"] + except KeyError: + pass + try: + digest_ok = plist["Authentication"]["Digest"]["Enabled"] + except KeyError: + pass + if basic_ok: + authtype = "basic" + elif digest_ok: + authtype = "digest" + if not hostname: + hostname = "localhost" if docroot[0] != "/": docroot = base_dir + docroot if sudoers[0] != "/": sudoers = base_dir + sudoers - return hostname, docroot, sudoers + return hostname, authtype, docroot, sudoers def patchConfig(config, admin): """ @@ -199,7 +213,7 @@ users.append({"username":"superuser", "password": "superuser"}) writePlist(plist, sudoers) -def buildServerinfo(hostname, docroot): +def buildServerinfo(hostname, authtype, docroot): # Read in the serverinfo-template.xml file fd = open(serverinfo_template, "r") @@ -236,6 +250,7 @@ data = data % { "hostname" : hostname, + "authtype" : authtype, "overrides" : subs_str, } @@ -375,7 +390,7 @@ if args[0] == "create": # Read the caldavd.plist file and extract some information we will need. - hostname, docroot, sudoers = readConfig(config) + hostname, authtype, docroot, sudoers = readConfig(config) # Patch the sudoers file for the superuser principal. patchSudoers(sudoers) @@ -387,20 +402,20 @@ patchConfig(config, "/principals/__uids__/%s/" % (guids["testadmin"],)) # Create an appropriate serverinfo.xml file from the template - buildServerinfo(hostname, docroot) + buildServerinfo(hostname, authtype, docroot) # Add large calendars to user account addLargeCalendars(hostname, docroot) elif args[0] == "create-users": # Read the caldavd.plist file and extract some information we will need. - hostname, docroot, sudoers = readConfig(config) + hostname, authtype, docroot, sudoers = readConfig(config) # Now generate the OD accounts (caching guids as we go). doToAccounts(createUser, users_only=True) # Create an appropriate serverinfo.xml file from the template - buildServerinfo(hostname, docroot) + buildServerinfo(hostname, authtype, docroot) elif args[0] == "remove": doToAccounts(removeUser) Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2009-01-29 00:20:08 UTC (rev 3621) +++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2009-01-29 17:48:12 UTC (rev 3622) @@ -21,7 +21,7 @@ <serverinfo> <host>%(hostname)s</host> <port>8008</port> - <authtype>basic</authtype> + <authtype>%(authtype)s</authtype> <substitutions> <substitution> <key>$host:</key> Modified: CalDAVTester/trunk/scripts/tests/acl.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/acl.xml 2009-01-29 00:20:08 UTC (rev 3621) +++ CalDAVTester/trunk/scripts/tests/acl.xml 2009-01-29 17:48:12 UTC (rev 3622) @@ -1204,7 +1204,7 @@ </test> <test name='5' ignore='no'> <description>Bogus authenticated get on non-existent inaccessible resource</description> - <request user="admin" pswd="foobar"> + <request user="$useradmin:" pswd="foobar"> <method>GET</method> <ruri>$pathprefix1:/calendar-bogus/</ruri> <verify> @@ -1218,7 +1218,7 @@ </test> <test name='6' ignore='no'> <description>Bogus authenticated get on existing inaccessible resource</description> - <request user="admin" pswd="foobar"> + <request user="$useradmin:" pswd="foobar"> <method>GET</method> <ruri>$calendarpath1:/1.ics</ruri> <verify>

1 0

[3621] CalendarServer/trunk/support/submit
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 3621 http://trac.macosforge.org/projects/calendarserver/changeset/3621 Author: sagen(a)apple.com Date: 2009-01-28 16:20:08 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Fix the no-merge_flags case (only running submit -b without -i) Modified Paths: -------------- CalendarServer/trunk/support/submit Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2009-01-28 23:17:49 UTC (rev 3620) +++ CalendarServer/trunk/support/submit 2009-01-29 00:20:08 UTC (rev 3621) @@ -167,6 +167,8 @@ merge_flags="-merge \"${package_tmp}\""; elif "${install}"; then merge_flags="-merge /"; + else + merge_flags=""; fi; sudo ~rc/bin/buildit "${wc}" CALENDARSERVER_CACHE_DEPS="${CALENDARSERVER_CACHE_DEPS-${wd}/.dependencies}" \

1 0

[3620] CalendarServer/trunk
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 3620 http://trac.macosforge.org/projects/calendarserver/changeset/3620 Author: cdaboo(a)apple.com Date: 2009-01-28 15:17:49 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Reject invalid recurrence components. Modified Paths: -------------- CalendarServer/trunk/run CalendarServer/trunk/twistedcaldav/ical.py Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2009-01-28 23:16:21 UTC (rev 3619) +++ CalendarServer/trunk/run 2009-01-28 23:17:49 UTC (rev 3620) @@ -692,7 +692,7 @@ caldavtester="${top}/CalDAVTester"; -svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3608; +svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3619; # # Calendar Server Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2009-01-28 23:16:21 UTC (rev 3619) +++ CalendarServer/trunk/twistedcaldav/ical.py 2009-01-28 23:17:49 UTC (rev 3620) @@ -1042,12 +1042,14 @@ # Must not contain more than one type of iCalendar component, except for # the required timezone components, and component UIDs must match # - ctype = None - component_id = None - component_rids = set() - timezone_refs = set() - timezones = set() - got_master = False + ctype = None + component_id = None + component_rids = set() + timezone_refs = set() + timezones = set() + got_master = False + got_override = False + master_recurring = False for subcomponent in self.subcomponents(): # Disallowed in CalDAV-Access-08, section 4.1 @@ -1070,21 +1072,32 @@ uid = subcomponent.propertyValue("UID") if uid is None: raise ValueError("All components must have UIDs") - + rid = subcomponent.getRecurrenceIDUTC() + + # Verify that UIDs are the same if component_id is None: component_id = uid - else: - if component_id != uid: + elif component_id != uid: raise ValueError("Calendar resources may not contain components with different UIDs " + "(%s and %s found)" % (component_id, subcomponent.propertyValue("UID"))) - elif subcomponent.propertyValue("Recurrence-ID") is None: - if got_master: - raise ValueError("Calendar resources may not contain components with the same UIDs and no Recurrence-IDs " + - "(%s and %s found)" % (component_id, subcomponent.propertyValue("UID"))) - else: - got_master = True - - rid = subcomponent.getRecurrenceIDUTC() + + # Verify that there is only one master component + if rid is None: + if got_master: + raise ValueError("Calendar resources may not contain components with the same UIDs and no Recurrence-IDs " + + "(%s and %s found)" % (component_id, subcomponent.propertyValue("UID"))) + else: + got_master = True + master_recurring = subcomponent.hasProperty("RRULE") or subcomponent.hasProperty("RDATE") + else: + got_override = True + + # Check that if an override is present then the master is recurring + if got_override and got_master and not master_recurring: + raise ValueError("Calendar resources must have a recurring master component if there is an overridden one " + + "(%s)" % (subcomponent.propertyValue("UID"),)) + + # Check for duplicate RECURRENCE-IDs if rid in component_rids: raise ValueError("Calendar resources may not contain components with the same Recurrence-IDs " + "(%s)" % (rid,))

1 0

[3619] CalDAVTester/trunk
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 3619 http://trac.macosforge.org/projects/calendarserver/changeset/3619 Author: cdaboo(a)apple.com Date: 2009-01-28 15:16:21 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Test for invalid recurrence components. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/errors.xml Added Paths: ----------- CalDAVTester/trunk/Resource/errors/37.ics CalDAVTester/trunk/Resource/errors/38.ics Added: CalDAVTester/trunk/Resource/errors/37.ics =================================================================== --- CalDAVTester/trunk/Resource/errors/37.ics (rev 0) +++ CalDAVTester/trunk/Resource/errors/37.ics 2009-01-28 23:16:21 UTC (rev 3619) @@ -0,0 +1,42 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//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 +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060102T100000 +DURATION:PT1H +SUMMARY:event 37 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-37@ninevah.local +END:VEVENT +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060103T110000 +DURATION:PT1H +SUMMARY:event 37 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-37@ninevah.local +RECURRENCE-ID;TZID=US/Eastern:20060103T100000 +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/errors/38.ics =================================================================== --- CalDAVTester/trunk/Resource/errors/38.ics (rev 0) +++ CalDAVTester/trunk/Resource/errors/38.ics 2009-01-28 23:16:21 UTC (rev 3619) @@ -0,0 +1,42 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//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 +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060103T110000 +DURATION:PT1H +SUMMARY:event 38 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-38@ninevah.local +RECURRENCE-ID;TZID=US/Eastern:20060103T100000 +END:VEVENT +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060102T100000 +DURATION:PT1H +SUMMARY:event 38 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-38@ninevah.local +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/tests/errors.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/errors.xml 2009-01-28 19:18:26 UTC (rev 3618) +++ CalDAVTester/trunk/scripts/tests/errors.xml 2009-01-28 23:16:21 UTC (rev 3619) @@ -363,6 +363,42 @@ </verify> </request> </test> + <test name='14'> + <description>PUT invalid master/Recurrence-ID</description> + <request end-delete="yes" print-response='no'> + <method>PUT</method> + <ruri>$calendarpath1:/37.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/errors/37.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-object-resource</value> + </arg> + </verify> + </request> + </test> + <test name='15'> + <description>PUT invalid master/Recurrence-ID</description> + <request end-delete="yes" print-response='no'> + <method>PUT</method> + <ruri>$calendarpath1:/38.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/errors/38.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-object-resource</value> + </arg> + </verify> + </request> + </test> </test-suite> <test-suite name='COPY' ignore='no'>

1 0

[3618] CalendarServer/trunk/support/submit
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 3618 http://trac.macosforge.org/projects/calendarserver/changeset/3618 Author: wsanchez(a)apple.com Date: 2009-01-28 11:18:26 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Add -i, -p flags Modified Paths: -------------- CalendarServer/trunk/support/submit Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2009-01-28 16:47:18 UTC (rev 3617) +++ CalendarServer/trunk/support/submit 2009-01-28 19:18:26 UTC (rev 3618) @@ -32,7 +32,9 @@ # Command line ## -build=false; + build=false; +install=false; +package=false; submission_enabled=true; @@ -43,32 +45,39 @@ if [ "${1-}" != "-" ]; then echo "$@"; echo; fi; echo "Usage: ${program} release"; - echo " ${program} -b"; + echo " ${program} -b[ip]"; echo ""; echo "Options:"; echo " -b Run buildit"; + echo " -i Install resulting build on this system"; + echo " -p Create a package with the resulting build"; if [ "${1-}" == "-" ]; then return 0; fi; exit 64; } -while getopts 'hb' option; do +while getopts 'hbip' option; do case "$option" in '?') usage; ;; 'h') usage -; exit 0; ;; - 'b') build=true; ;; + 'b') build=true; ;; + 'i') install=true; ;; + 'p') package=true; ;; esac; done; shift $((${OPTIND} - 1)); if ! "${build}"; then - if [ $# == 0 ]; then usage "No release specified"; fi; - release="$1"; shift; + if "${install}"; then usage "-i flag requires -b"; fi; + if "${package}"; then usage "-p flag requires -b"; fi; - if ! "${submission_enabled}"; then - echo "Submissions from this branch are not enabled."; - exit 1; - fi; + if [ $# == 0 ]; then usage "No release specified"; fi; + release="$1"; shift; + + if ! "${submission_enabled}"; then + echo "Submissions from this branch are not enabled."; + exit 1; + fi; fi; if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi; @@ -151,9 +160,29 @@ if "${build}"; then echo ""; echo "Building ${project_version}..."; - sudo ~rc/bin/buildit "${wc}" \ + + if "${package}"; then + package_tmp="${tmp}/pkg"; + install -d "${package_tmp}"; + merge_flags="-merge \"${package_tmp}\""; + elif "${install}"; then + merge_flags="-merge /"; + fi; + + sudo ~rc/bin/buildit "${wc}" CALENDARSERVER_CACHE_DEPS="${CALENDARSERVER_CACHE_DEPS-${wd}/.dependencies}" \ $(file /usr/lib/libSystem.dylib | sed -n -e 's|^.*(for architecture $[^)][^)]*$.*$|-arch \1|p' | sed 's|ppc7400|ppc|') \ - -release SnowLeopard; + -release SnowLeopard \ + ${merge_flags}; + + if "${package}"; then + package_file="${project_version}.tgz"; + echo "Creating package: ${package_file}..."; + tar -C "${package_tmp}" -cvzf "${package_file}" .; + if "${install}"; then + echo "Installing package: ${package_file}"; + tar -C / -xvzf "${package_file}"; + fi; + fi; else echo ""; echo "Submitting sources for ${project_version}...";

1 0

[3617] CalendarServer/trunk/twistedcaldav/directory
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 3617 http://trac.macosforge.org/projects/calendarserver/changeset/3617 Author: cdaboo(a)apple.com Date: 2009-01-28 08:47:18 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Redo fix for invalid XML in resourceInfo attribute. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryschema.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2009-01-28 08:01:06 UTC (rev 3616) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2009-01-28 16:47:18 UTC (rev 3617) @@ -1,5 +1,5 @@ ## -# Copyright (c) 2006-2008 Apple Inc. All rights reserved. +# Copyright (c) 2006-2009 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. @@ -191,6 +191,33 @@ return result + def _parseResourceInfo(self, plist, guid, recordType, shortname): + """ + Parse OD ResourceInfo attribute and extract information that the server needs. + + @param plist: the plist that is the attribute value. + @type plist: str + @param guid: the directory GUID of the record being parsed. + @type guid: str + @param shortname: the record shortname of the record being parsed. + @type shortname: str + @return: a C{tuple} of C{bool} for auto-accept, C{str} for proxy GUID, C{str} for read-only proxy GUID. + """ + try: + plist = readPlistFromString(plist) + wpframework = plist.get("com.apple.WhitePagesFramework", {}) + autoaccept = wpframework.get("AutoAcceptsInvitation", False) + proxy = wpframework.get("CalendaringDelegate", None) + read_only_proxy = wpframework.get("ReadOnlyCalendaringDelegate", None) + except (ExpatError, AttributeError), e: + self.log_error( + "Failed to parse ResourceInfo attribute of record (%s)%s (guid=%s): %s\n%s" % + (recordType, shortname, guid, e, plist,) + ) + raise ValueError("Invalid ResourceInfo") + + return (autoaccept, proxy, read_only_proxy,) + def recordTypes(self): return ( DirectoryService.recordType_users, @@ -528,19 +555,9 @@ resourceInfo = value.get(dsattributes.kDSNAttrResourceInfo) if resourceInfo is not None: try: - plist = readPlistFromString(resourceInfo) - except ExpatError, e: - self.log_error( - "Failed to parse ResourceInfo attribute of record (%s)%s (guid=%s, name=%s): %s\n%s" % - (recordType, recordShortName, recordGUID, recordFullName, e, resourceInfo) - ) + autoSchedule, proxy, read_only_proxy = self._parseResourceInfo(resourceInfo, recordGUID, recordType, recordShortName) + except ValueError: continue - - wpframework = plist.get("com.apple.WhitePagesFramework", {}) - autoSchedule = wpframework.get("AutoAcceptsInvitation", False) - proxy = wpframework.get("CalendaringDelegate", None) - read_only_proxy = wpframework.get("ReadOnlyCalendaringDelegate", None) - if proxy: proxyGUIDs = (proxy,) if read_only_proxy: Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py 2009-01-28 08:01:06 UTC (rev 3616) +++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py 2009-01-28 16:47:18 UTC (rev 3617) @@ -608,7 +608,59 @@ self.verifyQuery(self.service.recordWithEmailAddress, "location05(a)example.com") self.verifyNoQuery(self.service.recordWithEmailAddress, "location05(a)example.com") -def fakeODRecord(fullName, shortName=None, guid=None, email=None, members=None): + def test_resourceinfo(self): + good_plist = """<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>com.apple.WhitePagesFramework</key> + <dict> + <key>AutoAcceptsInvitation</key> + <true/> + <key>Label</key> + <string>Location</string> + <key>CalendaringDelegate</key> + <string></string> + <key>ReadOnlyCalendaringDelegate</key> + <string></string> + </dict> +</dict> +</plist> +""" + + bad_plist = """<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>com.apple.WhitePagesFramework</key> + <string>bogus</string> +</dict> +</plist> +""" + + invalid_xml = """<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>com.apple.WhitePagesFramework</key> + <string>R&D</string> +</dict> +</plist> +""" + + self.loadRecords({ + DirectoryService.recordType_locations: [ + fakeODRecord("Location 01", resourceInfo=good_plist), + fakeODRecord("Location 02", resourceInfo=bad_plist), + fakeODRecord("Location 03", resourceInfo=invalid_xml), + ], + }) + + self.verifyRecords(DirectoryService.recordType_locations, ("location01",)) + self.verifyDisabledRecords(DirectoryService.recordType_locations, (), ()) + + +def fakeODRecord(fullName, shortName=None, guid=None, email=None, members=None, resourceInfo=None): if shortName is None: shortName = shortNameForFullName(fullName) @@ -630,6 +682,9 @@ if members: attrs[dsattributes.kDSNAttrGroupMembers] = members + if resourceInfo: + attrs[dsattributes.kDSNAttrResourceInfo] = resourceInfo + return [ shortName, attrs ] def shortNameForFullName(fullName): Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryschema.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryschema.py 2009-01-28 08:01:06 UTC (rev 3616) +++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryschema.py 2009-01-28 16:47:18 UTC (rev 3617) @@ -114,20 +114,34 @@ </plist> """ + plist_invalid_xml = """<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>com.apple.WhitePagesFramework</key> + <string>R&D</string> +</dict> +</plist> +""" + test_bool = ( - (plist_good_false, False, "1234-GUID-5678", "1234-GUID-5679"), - (plist_good_true, True, "", ""), - (plist_good_missing, False, None, None), - (plist_wrong, False, None, None), - (plist_bad, False, None, None), - (plist_invalid, False, None, None), + (plist_good_false, False, "1234-GUID-5678", "1234-GUID-5679", None), + (plist_good_true, True, "", "", None), + (plist_good_missing, False, None, None, None), + (plist_wrong, False, None, None, None), + (plist_bad, False, None, None, ValueError), + (plist_invalid, False, None, None, ValueError), + (plist_invalid_xml, False, None, None, ValueError), ) def test_plists(self): service = OpenDirectoryService(node="/Search", dosetup=False) for item in ODResourceInfoParse.test_bool: - item1, item2, item3 = service._parseResourceInfo(item[0], "guid", "name") - self.assertEqual(item1, item[1]) - self.assertEqual(item2, item[2]) - self.assertEqual(item3, item[3]) + if item[4] is None: + item1, item2, item3 = service._parseResourceInfo(item[0], "guid", "locations", "name") + self.assertEqual(item1, item[1]) + self.assertEqual(item2, item[2]) + self.assertEqual(item3, item[3]) + else: + self.assertRaises(item[4], service._parseResourceInfo, item[0], "guid", "locations", "name")

1 0

[3616] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 3616 http://trac.macosforge.org/projects/calendarserver/changeset/3616 Author: wsanchez(a)apple.com Date: 2009-01-28 00:01:06 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Ignore OD records with an invalid XML plist in the ResourceInfo attribute. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2009-01-27 21:23:24 UTC (rev 3615) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2009-01-28 08:01:06 UTC (rev 3616) @@ -29,6 +29,8 @@ from twext.python.plistlib import readPlistFromString +from xml.parsers.expat import ExpatError + import opendirectory import dsattributes import dsquery @@ -189,35 +191,6 @@ return result - def _parseResourceInfo(self, plist, guid, shortname): - """ - Parse OD ResourceInfo attribute and extract information that the server needs. - - @param plist: the plist that is the attribute value. - @type plist: str - @param guid: the directory GUID of the record being parsed. - @type guid: str - @param shortname: the record shortname of the record being parsed. - @type shortname: str - @return: a C{tuple} of C{bool} for auto-accept, C{str} for proxy GUID, C{str} for read-only proxy GUID. - """ - try: - plist = readPlistFromString(plist) - wpframework = plist.get("com.apple.WhitePagesFramework", {}) - autoaccept = wpframework.get("AutoAcceptsInvitation", False) - proxy = wpframework.get("CalendaringDelegate", None) - read_only_proxy = wpframework.get("ReadOnlyCalendaringDelegate", None) - except AttributeError: - self.log_error( - "Failed to parse ResourceInfo attribute of record %s (%s): %s" % - (shortname, guid, plist,) - ) - autoaccept = False - proxy = None - read_only_proxy = None - - return (autoaccept, proxy, read_only_proxy,) - def recordTypes(self): return ( DirectoryService.recordType_users, @@ -554,7 +527,20 @@ if recordType in (DirectoryService.recordType_resources, DirectoryService.recordType_locations): resourceInfo = value.get(dsattributes.kDSNAttrResourceInfo) if resourceInfo is not None: - autoSchedule, proxy, read_only_proxy = self._parseResourceInfo(resourceInfo, recordGUID, recordShortName) + try: + plist = readPlistFromString(resourceInfo) + except ExpatError, e: + self.log_error( + "Failed to parse ResourceInfo attribute of record (%s)%s (guid=%s, name=%s): %s\n%s" % + (recordType, recordShortName, recordGUID, recordFullName, e, resourceInfo) + ) + continue + + wpframework = plist.get("com.apple.WhitePagesFramework", {}) + autoSchedule = wpframework.get("AutoAcceptsInvitation", False) + proxy = wpframework.get("CalendaringDelegate", None) + read_only_proxy = wpframework.get("ReadOnlyCalendaringDelegate", None) + if proxy: proxyGUIDs = (proxy,) if read_only_proxy:

1 0