[CalendarServer-changes] [3951] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3951
          http://trac.macosforge.org/projects/calendarserver/changeset/3951
Author:   sagen at apple.com
Date:     2009-04-02 15:28:09 -0700 (Thu, 02 Apr 2009)
Log Message:
-----------
Ignore SACLs when processing iMIP reply POSTs to /inbox.  We have a hard-coded ACL for that.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/provision/root.py
    CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py

Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py	2009-04-02 07:48:14 UTC (rev 3950)
+++ CalendarServer/trunk/calendarserver/provision/root.py	2009-04-02 22:28:09 UTC (rev 3951)
@@ -189,7 +189,12 @@
                     ))
 
 
-        if self.useSacls and not hasattr(request, "checkedSACL") and not hasattr(request, "checkingSACL"):
+        # We don't want the /inbox resource to pay attention to SACLs because
+        # we just want it to use the hard-coded ACL for the imip reply user
+        if segments[0] == "inbox":
+            request.checkedSACL = True
+
+        elif self.useSacls and not hasattr(request, "checkedSACL") and not hasattr(request, "checkingSACL"):
             yield self.checkSacl(request)
             child = (yield super(RootResource, self).locateChild(request, segments))
             returnValue(child)

Modified: CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py	2009-04-02 07:48:14 UTC (rev 3950)
+++ CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py	2009-04-02 22:28:09 UTC (rev 3951)
@@ -802,7 +802,7 @@
         # Get the request IP and map to hostname.
         clientip = self.request.remoteAddr.host
         host, aliases, _ignore_ips = socket.gethostbyaddr(clientip)
-        for host in itertools.chain((host,), aliases):
+        for host in itertools.chain((host, clientip), aliases):
             if host == allowed:
                 break
         else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090402/e045e8ca/attachment.html>