[CalendarServer-changes] [71]
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 28 07:18:18 PDT 2006
Revision: 71
Author: cdaboo at apple.com
Date: 2006-08-28 07:18:16 -0700 (Mon, 28 Aug 2006)
Log Message:
-----------
Latest merges with twisted branch.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.auth.patch
Added Paths:
-----------
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.acl.patch
Removed Paths:
-------------
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.acl.patch
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.http.patch
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.mkcol.patch
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch
CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.static.patch
Deleted: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.acl.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.acl.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.acl.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,16 +0,0 @@
-Index: twisted/web2/dav/acl.py
-===================================================================
---- twisted/web2/dav/acl.py (revision 17935)
-+++ twisted/web2/dav/acl.py (working copy)
-@@ -161,9 +161,9 @@
- Check whether the supplied principal matches this principal or is a
- member of this principal resource.
- @param href: the L{HRef} to test.
-- @return: True if there is a matchg, False otherwise
-+ @return: True if there is a match, False otherwise
- """
-- uri = str(href)
-+ uri = str(href)
- if self.principalURL() == uri:
- return True
- else:
Modified: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.auth.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.auth.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.auth.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,23 +1,13 @@
Index: twisted/web2/dav/auth.py
===================================================================
---- twisted/web2/dav/auth.py (revision 17935)
+--- twisted/web2/dav/auth.py (revision 17966)
+++ twisted/web2/dav/auth.py (working copy)
-@@ -6,6 +6,8 @@
- from twisted.web2.dav import davxml
- from twisted.web2.dav.acl import TwistedPasswordProperty
+@@ -8,8 +8,6 @@
-+__all__ = ["PrincipalCredentials"]
-+
+ __all__ = ["PrincipalCredentials", "AuthenticationWrapper"]
+
+-__all__ = ["PrincipalCredentials"]
+-
class AuthenticationWrapper(WrapperResource):
def __init__(self, resource, portal, credentialFactories, loginInterfaces):
- super(AuthenticationWrapper, self).__init__(resource)
-@@ -11,7 +13,8 @@
- super(AuthenticationWrapper, self).__init__(resource)
-
- self.portal = portal
-- self.credentialFactories = credentialFactories
-+ self.credentialFactories = dict([(factory.scheme, factory)
-+ for factory in credentialFactories])
- self.loginInterfaces = loginInterfaces
-
- def hook(self, req):
+ """Wrap the given resource and use the parameters to set up the request
Deleted: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.http.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.http.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.http.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,24 +0,0 @@
-Index: twisted/web2/dav/http.py
-===================================================================
---- twisted/web2/dav/http.py (revision 17935)
-+++ twisted/web2/dav/http.py (working copy)
-@@ -102,7 +102,8 @@
- else:
- uri = joinURL(base_uri, subpath)
-
-- denials.append(davxml.Resource(davxml.HRef(uri), *[davxml.Privilege(p) for p in privileges]))
-+ for p in privileges:
-+ denials.append(davxml.Resource(davxml.HRef(uri), davxml.Privilege(p)))
-
- super(NeedPrivilegesResponse, self).__init__(responsecode.FORBIDDEN, davxml.NeedPrivileges(*denials))
-
-@@ -115,9 +116,6 @@
- """
- @param xml_responses: an interable of davxml.Response objects.
- """
-- multistatus = davxml.MultiStatus(*xml_responses)
-- output = multistatus.toxml()
--
- Response.__init__(self, code=responsecode.MULTI_STATUS,
- stream=davxml.MultiStatus(*xml_responses).toxml())
-
Added: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.acl.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.acl.patch (rev 0)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.acl.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -0,0 +1,15 @@
+Index: twisted/web2/dav/method/acl.py
+===================================================================
+--- twisted/web2/dav/method/acl.py (revision 17951)
++++ twisted/web2/dav/method/acl.py (working copy)
+@@ -85,7 +85,9 @@
+ #
+ # Do ACL merger
+ #
+- result = self.mergeAccessControlList(acl, request)
++ result = waitForDeferred(self.mergeAccessControlList(acl, request))
++ yield result
++ result = result.getResult()
+
+ #
+ # Return response
Deleted: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.mkcol.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.mkcol.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.mkcol.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,19 +0,0 @@
-Index: twisted/web2/dav/method/mkcol.py
-===================================================================
---- twisted/web2/dav/method/mkcol.py (revision 17951)
-+++ twisted/web2/dav/method/mkcol.py (working copy)
-@@ -62,14 +62,6 @@
- "Parent resource is not a collection."
- ))
-
-- if not self.fp.parent().isdir():
-- log.err("Attempt to create collection with no parent directory: %s"
-- % (self.fp.path,))
-- raise HTTPError(StatusResponse(
-- responsecode.INTERNAL_SERVER_ERROR,
-- "The requested resource is not backed by a parent directory."
-- ))
--
- #
- # Read request body
- #
Deleted: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,13 +0,0 @@
-Index: twisted/web2/dav/method/report_acl_principal_prop_set.py
-===================================================================
---- twisted/web2/dav/method/report_acl_principal_prop_set.py (revision 17951)
-+++ twisted/web2/dav/method/report_acl_principal_prop_set.py (working copy)
-@@ -90,7 +90,7 @@
- acl = acl.getResult()
-
- for ace in acl.children:
-- resolved = self.resolvePrincipal(ace.principal, request)
-+ resolved = self.resolvePrincipal(ace.principal.children[0], request)
- if resolved is not None and resolved not in principals:
- principals.append(resolved)
-
Deleted: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.static.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.static.patch 2006-08-28 14:04:34 UTC (rev 70)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.dav.static.patch 2006-08-28 14:18:16 UTC (rev 71)
@@ -1,13 +0,0 @@
-Index: twisted/web2/dav/static.py
-===================================================================
---- twisted/web2/dav/static.py (revision 17940)
-+++ twisted/web2/dav/static.py (working copy)
-@@ -139,7 +139,7 @@
- ),
- ),
- )
-- return DAVFile._supportedPrivilegeSet
-+ return succeed(DAVFile._supportedPrivilegeSet)
-
- ##
- # Workarounds for issues with File
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060828/7a7a9445/attachment.html
More information about the calendarserver-changes
mailing list