[CalendarServer-changes] [2092]
CalendarServer/branches/users/cdaboo/private_events-2081/
twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 7 14:14:31 PST 2008
Revision: 2092
http://trac.macosforge.org/projects/calendarserver/changeset/2092
Author: cdaboo at apple.com
Date: 2008-01-07 14:14:30 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
Filtering of data on GET for X-CALENDARSERVER-ACCESS.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/caldavxml.py
CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/__init__.py
CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/static.py
Added Paths:
-----------
CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/get.py
Modified: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/caldavxml.py 2008-01-04 22:39:32 UTC (rev 2091)
+++ CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/caldavxml.py 2008-01-07 22:14:30 UTC (rev 2092)
@@ -528,6 +528,16 @@
"""
Returns a calendar component derived from this element.
"""
+ data = self.calendarData()
+ if data:
+ return iComponent.fromString(data)
+ else:
+ return None
+
+ def calendarData(self):
+ """
+ Returns the calendar data derived from this element.
+ """
for data in self.children:
if not isinstance(data, davxml.PCDATAElement):
return None
@@ -535,7 +545,7 @@
# We guaranteed in __init__() that there is only one child...
break
- return iComponent.fromString(str(data))
+ return str(data)
def expandRecurrence(self, calendar):
"""
Modified: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/__init__.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/__init__.py 2008-01-04 22:39:32 UTC (rev 2091)
+++ CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/__init__.py 2008-01-07 22:14:30 UTC (rev 2092)
@@ -24,6 +24,7 @@
__all__ = [
"copymove",
"delete",
+ "get",
"mkcalendar",
"mkcol",
"put",
Added: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/get.py (rev 0)
+++ CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/method/get.py 2008-01-07 22:14:30 UTC (rev 2092)
@@ -0,0 +1,167 @@
+##
+# Copyright (c) 2005-2008 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+CalDAV GET method.
+"""
+
+__all__ = ["http_GET"]
+
+from twisted.internet.defer import deferredGenerator, waitForDeferred
+from twisted.web2.dav import davxml
+from twisted.web2.http import HTTPError
+from twisted.web2.http import Response
+from twisted.web2.http_headers import MimeType
+from twisted.web2.stream import MemoryStream
+
+from twistedcaldav import caldavxml
+from twistedcaldav.customxml import TwistedCalendarAccessProperty
+from twistedcaldav.ical import Component
+
+def http_GET(self, request):
+
+ # Look for calendar access restriction on existing resource.
+ if self.exists():
+ try:
+ access = self.readDeadProperty(TwistedCalendarAccessProperty)
+ except HTTPError:
+ access = None
+
+ if access in (Component.ACCESS_CONFIDENTIAL, Component.ACCESS_RESTRICTED):
+
+ # Check authorization first
+ d = waitForDeferred(self.authorize(request, (davxml.Read(),)))
+ yield d
+ d.getResult()
+
+ # Non DAV:owner's have limited access to the data
+ d = waitForDeferred(self.owner(request))
+ yield d
+ owner = d.getResult()
+
+ authz = self.currentPrincipal(request)
+ if davxml.Principal(owner) != authz:
+
+ # Create a CALDAV:calendar-data element with the appropriate iCalendar Component/Property
+ # filter in place for the access restriction in use
+
+ extra_access = ()
+ if access == Component.ACCESS_RESTRICTED:
+ extra_access = (
+ caldavxml.Property(name="SUMMARY"),
+ caldavxml.Property(name="LOCATION"),
+ )
+
+ filter = caldavxml.CalendarData(
+ caldavxml.CalendarComponent(
+
+ # VCALENDAR proeprties
+ caldavxml.Property(name="PRODID"),
+ caldavxml.Property(name="VERSION"),
+ caldavxml.Property(name="CALSCALE"),
+ caldavxml.Property(name=Component.ACCESS_PROPERTY),
+
+ # VEVENT
+ caldavxml.CalendarComponent(
+ caldavxml.Property(name="UID"),
+ caldavxml.Property(name="RECURRENCE-ID"),
+ caldavxml.Property(name="SEQUENCE"),
+ caldavxml.Property(name="DTSTAMP"),
+ caldavxml.Property(name="STATUS"),
+ caldavxml.Property(name="TRANSP"),
+ caldavxml.Property(name="DTSTART"),
+ caldavxml.Property(name="DTEND"),
+ caldavxml.Property(name="DURATION"),
+ caldavxml.Property(name="RRULE"),
+ caldavxml.Property(name="RDATE"),
+ caldavxml.Property(name="EXRULE"),
+ caldavxml.Property(name="EXDATE"),
+ *extra_access,
+ **{"name":"VEVENT"}
+ ),
+
+ # VTODO
+ caldavxml.CalendarComponent(
+ caldavxml.Property(name="UID"),
+ caldavxml.Property(name="RECURRENCE-ID"),
+ caldavxml.Property(name="SEQUENCE"),
+ caldavxml.Property(name="DTSTAMP"),
+ caldavxml.Property(name="STATUS"),
+ caldavxml.Property(name="DTSTART"),
+ caldavxml.Property(name="COMPLETED"),
+ caldavxml.Property(name="DUE"),
+ caldavxml.Property(name="DURATION"),
+ caldavxml.Property(name="RRULE"),
+ caldavxml.Property(name="RDATE"),
+ caldavxml.Property(name="EXRULE"),
+ caldavxml.Property(name="EXDATE"),
+ *extra_access,
+ **{"name":"VTODO"}
+ ),
+
+ # VJOURNAL
+ caldavxml.CalendarComponent(
+ caldavxml.Property(name="UID"),
+ caldavxml.Property(name="RECURRENCE-ID"),
+ caldavxml.Property(name="SEQUENCE"),
+ caldavxml.Property(name="DTSTAMP"),
+ caldavxml.Property(name="STATUS"),
+ caldavxml.Property(name="TRANSP"),
+ caldavxml.Property(name="DTSTART"),
+ caldavxml.Property(name="RRULE"),
+ caldavxml.Property(name="RDATE"),
+ caldavxml.Property(name="EXRULE"),
+ caldavxml.Property(name="EXDATE"),
+ *extra_access,
+ **{"name":"VJOURNAL"}
+ ),
+
+ # VFREEBUSY
+ caldavxml.CalendarComponent(
+ caldavxml.Property(name="UID"),
+ caldavxml.Property(name="DTSTAMP"),
+ caldavxml.Property(name="DTSTART"),
+ caldavxml.Property(name="DTEND"),
+ caldavxml.Property(name="DURATION"),
+ caldavxml.Property(name="FREEBUSY"),
+ *extra_access,
+ **{"name":"VFREEBUSY"}
+ ),
+
+ # VTIMEZONE
+ caldavxml.CalendarComponent(
+ caldavxml.AllProperties(),
+ caldavxml.AllComponents(),
+ name="VTIMEZONE",
+ ),
+ name="VCALENDAR",
+ ),
+ )
+
+ # Now "filter" the resource calendar data through the CALDAV:calendar-data element
+ caldata = filter.elementFromResource(self).calendarData()
+ response = Response()
+ response.stream = MemoryStream(caldata)
+ response.headers.setHeader("content-type", MimeType.fromString("text/calendar; charset=utf-8"))
+ yield response
+ return
+
+ # Do normal GET behavior
+ d = waitForDeferred(super(CalDAVFile, self).http_GET(request))
+ yield d
+ yield d.getResult()
+
+http_GET = deferredGenerator(http_GET)
Modified: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/static.py 2008-01-04 22:39:32 UTC (rev 2091)
+++ CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/static.py 2008-01-07 22:14:30 UTC (rev 2092)
@@ -795,5 +795,6 @@
# FIXME: Little bit of a circular dependency here...
twistedcaldav.method.copymove.CalDAVFile = CalDAVFile
twistedcaldav.method.delete.CalDAVFile = CalDAVFile
+twistedcaldav.method.get.CalDAVFile = CalDAVFile
twistedcaldav.method.mkcol.CalDAVFile = CalDAVFile
twistedcaldav.method.put.CalDAVFile = CalDAVFile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080107/f092966a/attachment.html
More information about the calendarserver-changes
mailing list