February 2016 - calendarserver-changes

[15464] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 15 Feb '16

15 Feb '16

Revision: 15464 http://trac.calendarserver.org//changeset/15464 Author: cdaboo(a)apple.com Date: 2016-02-15 11:56:54 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Replies from non-existent sharees should not cause 500 errors. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/storebridge.py CalendarServer/trunk/twistedcaldav/test/test_sharing.py Modified: CalendarServer/trunk/twistedcaldav/storebridge.py =================================================================== --- CalendarServer/trunk/twistedcaldav/storebridge.py 2016-02-15 16:03:00 UTC (rev 15463) +++ CalendarServer/trunk/twistedcaldav/storebridge.py 2016-02-15 19:56:54 UTC (rev 15464) @@ -3982,8 +3982,6 @@ else: owner = "urn:x-uid:" + ownerPrincipal.principalUID() - shareePrincipal = yield self.principalForUID(jsondata["sharee"]) - if "supported-components" in jsondata: comps = jsondata["supported-components"] if comps: @@ -4023,19 +4021,21 @@ shareePrincipal = yield self.principalForUID(jsondata["sharee"]) # FIXME: use urn:x-uid always? - if jsondata["shared-type"] == "calendar": - # Prefer mailto:, otherwise use principal URL - for cua in shareePrincipal.calendarUserAddresses(): - if cua.startswith("mailto:"): - break + if shareePrincipal is not None: + if jsondata["shared-type"] == "calendar": + # Prefer mailto:, otherwise use principal URL + for cua in shareePrincipal.calendarUserAddresses(): + if cua.startswith("mailto:"): + break + else: + cua = shareePrincipal.principalURL() else: - cua = shareePrincipal.principalURL() + cua = "urn:x-uid:" + shareePrincipal.principalUID() + commonName = shareePrincipal.displayName() else: - cua = "urn:x-uid:" + shareePrincipal.principalUID() + cua = "urn:x-uid:" + jsondata["sharee"] + commonName = "" - commonName = shareePrincipal.displayName() - # record = shareePrincipal.record - typeAttr = {"shared-type": jsondata["shared-type"]} xmldata = customxml.Notification( customxml.DTStamp.fromString(jsondata["dtstamp"]), Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2016-02-15 16:03:00 UTC (rev 15463) +++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py 2016-02-15 19:56:54 UTC (rev 15464) @@ -1413,6 +1413,50 @@ @inlineCallbacks + def test_shareeReplyWithMissingSharee(self): + + yield self.resource.upgradeToShare() + + yield self._doPOST("""<?xml version="1.0" encoding="utf-8" ?> + <CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/"> + <CS:set> + <D:href>mailto:user02@example.com</D:href> + <CS:summary>My Shared Calendar</CS:summary> + <CS:read-write/> + </CS:set> + </CS:share> + """) + propInvite = (yield self.resource.readProperty(customxml.Invite, None)) + uids = self._getUIDElementValues(propInvite) + + yield self._doPOSTSharerAccept("""<?xml version='1.0' encoding='UTF-8'?> + <invite-reply xmlns='http://calendarserver.org/ns/'> + <href xmlns='DAV:'>mailto:user01@example.com</href> + <invite-accepted/> + <hosturl> + <href xmlns='DAV:'>/calendars/__uids__/user01/calendar/</href> + </hosturl> + <in-reply-to>%s</in-reply-to> + <summary>The Shared Calendar</summary> + <common-name>User 02</common-name> + <first-name>user</first-name> + <last-name>02</last-name> + </invite-reply> + """ % (uids["urn:x-uid:user02"],)) + + yield self.directory.removeRecords(((yield self.userUIDFromShortName("user02")),)) + self.assertTrue((yield self.userUIDFromShortName("user02")) is None) + + request = SimpleStoreRequest(self, "GET", "/calendars/__uids__/user01/notification/") + notification = yield request.locateResource("/calendars/__uids__/user01/notification/") + names = yield notification.listChildren() + self.assertEqual(len(names), 1) + note_child = yield notification.getChild(names[0]) + note = yield note_child.text() + self.assertTrue(isinstance(note, str)) + + + @inlineCallbacks def test_hideInvalidSharers(self): yield self.resource.upgradeToShare()

1 0

[15463] CalendarServer/trunk
by source_changes＠macosforge.org 15 Feb '16

15 Feb '16

Revision: 15463 http://trac.calendarserver.org//changeset/15463 Author: cdaboo(a)apple.com Date: 2016-02-15 08:03:00 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix for invalid vcards during simple/crud bulk create requests. Modified Paths: -------------- CalendarServer/trunk/requirements-dev.txt CalendarServer/trunk/twistedcaldav/storebridge.py Modified: CalendarServer/trunk/requirements-dev.txt =================================================================== --- CalendarServer/trunk/requirements-dev.txt 2016-02-15 16:02:00 UTC (rev 15462) +++ CalendarServer/trunk/requirements-dev.txt 2016-02-15 16:03:00 UTC (rev 15463) @@ -5,4 +5,4 @@ q tl.eggdeps --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLib… ---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/tr… +--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/tr… Modified: CalendarServer/trunk/twistedcaldav/storebridge.py =================================================================== --- CalendarServer/trunk/twistedcaldav/storebridge.py 2016-02-15 16:02:00 UTC (rev 15462) +++ CalendarServer/trunk/twistedcaldav/storebridge.py 2016-02-15 16:03:00 UTC (rev 15463) @@ -655,6 +655,12 @@ for index, component in indexedComponents: try: + if component is None: + newchildURL = "" + newchild = None + changedComponent = None + raise ValueError("Invalid component") + # Create a new name if one was not provided name = hashlib.md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix() @@ -701,7 +707,7 @@ davxml.PropertyStatus( davxml.PropertyContainer( davxml.GETETag.fromString(etag.generate()), - customxml.UID.fromString(component.resourceUID()), + customxml.UID.fromString(component.resourceUID() if component else ""), ), davxml.Status.fromResponseCode(OK), ) @@ -727,7 +733,7 @@ davxml.Status.fromResponseCode(code), davxml.Error( WebDAVUnknownElement.withName(*error), - customxml.UID.fromString(component.resourceUID()), + customxml.UID.fromString(component.resourceUID() if component else ""), ) if error else None, ) ) @@ -818,7 +824,10 @@ indexedComponents = [] for index, xmldata in crudCreateInfo: - component = xmldata.generateComponent() + try: + component = xmldata.generateComponent() + except: + component = None format = xmldata.content_type if hasPrivilege is not True: @@ -3345,6 +3354,12 @@ for index, component in indexedComponents: try: + if component is None: + newchildURL = "" + newchild = None + changedComponent = None + raise ValueError("Invalid component") + # Create a new name if one was not provided name = hashlib.md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix()

1 0

[15462] CalDAVTester/trunk
by source_changes＠macosforge.org 15 Feb '16

15 Feb '16

Revision: 15462 http://trac.calendarserver.org//changeset/15462 Author: cdaboo(a)apple.com Date: 2016-02-15 08:02:00 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Tests for invalid vcards during simple/crud bulk create requests. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml Added Paths: ----------- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/8.xml CalDAVTester/trunk/Resource/CardDAV/bulk/simple/15.vcf Added: CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/8.xml =================================================================== --- CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/8.xml (rev 0) +++ CalDAVTester/trunk/Resource/CardDAV/bulk/crud-one/8.xml 2016-02-15 16:02:00 UTC (rev 15462) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" ?> +<MM:multiput xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:MM="http://me.com/_namespace/"> +<MM:resource> +<D:set> +<C:address-data><![CDATA[BEGIN:VCARD +VERSION:3.0 +N:01;User;;; +FN:User 01 +EMAIL;type=INTERNET;type=WORK;type=pref:user01@example.com +TEL;type=WORK;type=pref:1-555-555-5555 +TEL;type=CELL:1-444-444-4444 +ADR;type=WORK;type=pref:;;1245 Test;Happy House +Sesame Street;California;11111;USA +UID:user01-uid08 +END:VCARD +]]> +</C:address-data> +</D:set> +</MM:resource> +</MM:multiput> Added: CalDAVTester/trunk/Resource/CardDAV/bulk/simple/15.vcf =================================================================== --- CalDAVTester/trunk/Resource/CardDAV/bulk/simple/15.vcf (rev 0) +++ CalDAVTester/trunk/Resource/CardDAV/bulk/simple/15.vcf 2016-02-15 16:02:00 UTC (rev 15462) @@ -0,0 +1,11 @@ +BEGIN:VCARD +VERSION:3.0 +N:01;User;;; +FN:User 01 +EMAIL;type=INTERNET;type=WORK;type=pref:user01@example.com +TEL;type=WORK;type=pref:1-555-555-5555 +TEL;type=CELL:1-444-444-4444 +ADR;type=WORK;type=pref:;;1245 Test;Happy House +Sesame Street;California;11111;USA +UID:user01-uid15 +END:VCARD Modified: CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2016-02-08 19:11:11 UTC (rev 15461) +++ CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2016-02-15 16:02:00 UTC (rev 15462) @@ -713,6 +713,27 @@ </test> </test-suite> + <test-suite name='Simple POST - bad vcard'> + <test name='1'> + <description>POST single bad vcard</description> + <request> + <method>POST</method> + <ruri>$addressbookpath1:/</ruri> + <data> + <content-type>text/vcard; charset=utf-8</content-type> + <filepath>Resource/CardDAV/bulk/simple/15.vcf</filepath> + </data> + <verify> + <callback>statusCode</callback> + <arg> + <name>status</name> + <value>400</value> + </arg> + </verify> + </request> + </test> + </test-suite> + <test-suite name='CRUD POST - one vcard create'> <test name='1'> <description>POST single new vcard</description> @@ -1511,6 +1532,27 @@ </test> </test-suite> + <test-suite name='CRUD POST - bad vcard'> + <test name='1'> + <description>POST single new vcard</description> + <request> + <method>POST</method> + <ruri>$addressbookpath1:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/CardDAV/bulk/crud-one/8.xml</filepath> + </data> + <verify> + <callback>xmlElementMatch</callback> + <arg> + <name>exists</name> + <value>$verify-bad-response:[*400]</value> + </arg> + </verify> + </request> + </test> + </test-suite> + <end/> </caldavtest>

1 0

[15461] CalDAVTester/tags/release/CalDAVTester-5.0/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15461 http://trac.calendarserver.org//changeset/15461 Author: dre(a)apple.com Date: 2016-02-08 11:11:11 -0800 (Mon, 08 Feb 2016) Log Message: ----------- Tag CalDAVTester 5.0 Added Paths: ----------- CalDAVTester/tags/release/CalDAVTester-5.0/ Property changes on: CalDAVTester/tags/release/CalDAVTester-5.0 ___________________________________________________________________ Added: svn:ignore + .project .pydevproject .settings Added: svn:mergeinfo + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584 /CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193 /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910 /CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163 /CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346 /CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469 /CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989 /CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581 /CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145 /CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558 /CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206 /CalDAVTester/branches/users/cdaboo/pycard:7226-7237 /CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440 /CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204

1 0

[15460] CalDAVTester/tags/release/CalDAVTester-5.1/trunk/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15460 http://trac.calendarserver.org//changeset/15460 Author: dre(a)apple.com Date: 2016-02-08 11:10:50 -0800 (Mon, 08 Feb 2016) Log Message: ----------- Tag CalDAVTester 5.1 Added Paths: ----------- CalDAVTester/tags/release/CalDAVTester-5.1/trunk/ Property changes on: CalDAVTester/tags/release/CalDAVTester-5.1/trunk ___________________________________________________________________ Added: svn:ignore + .project .pydevproject .settings Added: svn:mergeinfo + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584 /CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193 /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910 /CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163 /CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346 /CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469 /CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989 /CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581 /CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145 /CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558 /CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206 /CalDAVTester/branches/users/cdaboo/pycard:7226-7237 /CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440 /CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204

1 0

[15459] CalDAVTester/tags/release/CalDAVTester-5.2/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15459 http://trac.calendarserver.org//changeset/15459 Author: dre(a)apple.com Date: 2016-02-08 11:10:29 -0800 (Mon, 08 Feb 2016) Log Message: ----------- Tag CalDAVTester 5.2 Added Paths: ----------- CalDAVTester/tags/release/CalDAVTester-5.2/ Property changes on: CalDAVTester/tags/release/CalDAVTester-5.2 ___________________________________________________________________ Added: svn:ignore + .project .pydevproject .settings CalDAVTester.egg-info Added: svn:mergeinfo + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584 /CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193 /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910 /CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163 /CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346 /CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469 /CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989 /CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581 /CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145 /CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558 /CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206 /CalDAVTester/branches/users/cdaboo/pycard:7226-7237 /CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440 /CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204 /CalendarServer/branches/users/sagen/move2who-cdt:13094-13164

1 0

[15458] CalDAVTester/tags/release/CalDAVTester-5.3/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15458 http://trac.calendarserver.org//changeset/15458 Author: dre(a)apple.com Date: 2016-02-08 11:09:55 -0800 (Mon, 08 Feb 2016) Log Message: ----------- Tag CalDAVTester 5.3 Added Paths: ----------- CalDAVTester/tags/release/CalDAVTester-5.3/ Property changes on: CalDAVTester/tags/release/CalDAVTester-5.3 ___________________________________________________________________ Added: svn:ignore + .project .pydevproject .settings CalDAVTester.egg-info Added: svn:mergeinfo + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584 /CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193 /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910 /CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163 /CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346 /CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469 /CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989 /CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581 /CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145 /CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558 /CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206 /CalDAVTester/branches/users/cdaboo/pycard:7226-7237 /CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440 /CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204 /CalendarServer/branches/users/sagen/move2who-cdt:13094-13164

1 0

[15457] CalDAVTester/tags/release/CalDAVTester-5.2/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15457 http://trac.calendarserver.org//changeset/15457 Author: dre(a)apple.com Date: 2016-02-08 11:08:49 -0800 (Mon, 08 Feb 2016) Log Message: ----------- oops wrong one Removed Paths: ------------- CalDAVTester/tags/release/CalDAVTester-5.2/

1 0

[15456] CalDAVTester/tags/release/CalDAVTester-5.3/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15456 http://trac.calendarserver.org//changeset/15456 Author: dre(a)apple.com Date: 2016-02-08 11:08:45 -0800 (Mon, 08 Feb 2016) Log Message: ----------- oops wrong one Removed Paths: ------------- CalDAVTester/tags/release/CalDAVTester-5.3/

1 0

[15455] CalDAVTester/tags/release/CalDAVTester-5.1/
by source_changes＠macosforge.org 08 Feb '16

08 Feb '16

Revision: 15455 http://trac.calendarserver.org//changeset/15455 Author: dre(a)apple.com Date: 2016-02-08 11:06:36 -0800 (Mon, 08 Feb 2016) Log Message: ----------- Tag CalDAVTester 5.1 Added Paths: ----------- CalDAVTester/tags/release/CalDAVTester-5.1/ Property changes on: CalDAVTester/tags/release/CalDAVTester-5.1 ___________________________________________________________________ Added: svn:ignore + .project .pydevproject .settings Added: svn:mergeinfo + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584 /CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193 /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910 /CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163 /CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346 /CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469 /CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989 /CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581 /CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145 /CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558 /CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206 /CalDAVTester/branches/users/cdaboo/pycard:7226-7237 /CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440 /CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204

1 0