[CalendarServer-changes] [916] CalendarServer/branches/users/dreid/sudoers-2

[source_changes at macosforge.org]

Revision: 916
          http://trac.macosforge.org/projects/calendarserver/changeset/916
Author:   dreid at apple.com
Date:     2007-01-04 12:43:30 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Remove canproxy support from SQLDB, add principalForShortName to TestPrincipalsCollection

Modified Paths:
--------------
    CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch
    CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
    CalendarServer/branches/users/dreid/sudoers-2/twistedcaldav/directory/sqldb.py

Modified: CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch	2007-01-04 16:51:06 UTC (rev 915)
+++ CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch	2007-01-04 20:43:30 UTC (rev 916)
@@ -10,7 +10,7 @@
  from twisted.web2.dav.util import davXMLFromStream
  from twisted.web2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
  
-@@ -38,6 +39,11 @@
+@@ -38,6 +39,22 @@
  from twisted.web2.dav.test.util import Site, serialize
  from twisted.web2.dav.test.test_resource import TestResource, TestDAVPrincipalResource
  
@@ -18,11 +18,22 @@
 +    def __init__(self, url, children):
 +        DAVPrincipalCollectionResource.__init__(self, url)
 +        TestResource.__init__(self, url, children, principalCollections=(self,))
++    
++    def principalForUser(self, user):
++        return self.principalForShortName('users', user)
 +
++    def principalForShortName(self, type, shortName):
++        typeResource = self.children.get(type, None)
++        user = None
++        if typeResource:
++            user = typeResource.children.get(shortName, None)
++
++        return user
++
  class ACL(twisted.web2.dav.test.util.TestCase):
      """
      RFC 3744 (WebDAV ACL) tests.
-@@ -46,8 +52,14 @@
+@@ -46,8 +63,14 @@
          if not hasattr(self, "docroot"):
              self.docroot = self.mktemp()
              os.mkdir(self.docroot)
@@ -38,7 +49,7 @@
              portal = Portal(DavRealm())
              portal.registerChecker(TwistedPropertyChecker())
  
-@@ -56,26 +68,14 @@
+@@ -56,26 +79,14 @@
              loginInterfaces = (IPrincipal,)
  
              self.site = Site(AuthenticationWrapper(

Modified: CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch	2007-01-04 16:51:06 UTC (rev 915)
+++ CalendarServer/branches/users/dreid/sudoers-2/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch	2007-01-04 20:43:30 UTC (rev 916)
@@ -54,12 +54,11 @@
          else:
              return davxml.Principal(davxml.Unauthenticated())
  
-@@ -400,17 +398,23 @@
+@@ -399,18 +397,21 @@
+ 
      def accessControlList(self, request, **kwargs):
          return succeed(self.acl)
-     
-+    def principalForUser(self, user):
-+        return self.children[user]
+-    
  
  class AuthAllResource (TestResource):
 -    """Give Authenticated principals all privileges deny everything else

Modified: CalendarServer/branches/users/dreid/sudoers-2/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/branches/users/dreid/sudoers-2/twistedcaldav/directory/sqldb.py	2007-01-04 16:51:06 UTC (rev 915)
+++ CalendarServer/branches/users/dreid/sudoers-2/twistedcaldav/directory/sqldb.py	2007-01-04 20:43:30 UTC (rev 916)
@@ -25,7 +25,7 @@
 
 User Database:
 
-ROW: RECORD_TYPE, SHORT_NAME (unique), PASSWORD, NAME, CAN_PROXY
+ROW: RECORD_TYPE, SHORT_NAME (unique), PASSWORD, NAME
 
 Group Database:
 
@@ -161,13 +161,12 @@
         shortName = record.shortName
         password = record.password
         name = record.name
-        canproxy = ('F', 'T')[record.canproxy]
 
         self._db_execute(
             """
-            insert into ACCOUNTS (RECORD_TYPE, SHORT_NAME, PASSWORD, NAME, CAN_PROXY)
-            values (:1, :2, :3, :4, :5)
-            """, recordType, shortName, password, name, canproxy
+            insert into ACCOUNTS (RECORD_TYPE, SHORT_NAME, PASSWORD, NAME)
+            values (:1, :2, :3, :4)
+            """, recordType, shortName, password, name
         )
         
         # Check for members
@@ -224,8 +223,7 @@
                 RECORD_TYPE  text,
                 SHORT_NAME   text,
                 PASSWORD     text,
-                NAME         text,
-                CAN_PROXY    text(1)
+                NAME         text
             )
             """
         )

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070104/c6a5107b/attachment.html