Support DPS with the ACL optimization.

txdav/dps/client.py

@@ -45,7 +45,7 @@
     StatsCommand, ExternalDelegatesCommand, ExpandedMemberUIDsCommand,
     AddMembersCommand, RemoveMembersCommand,
     UpdateRecordsCommand, ExpandedMembersCommand, FlushCommand,
-    SetAutoScheduleModeCommand
+    SetAutoScheduleModeCommand, ContainsUIDsCommand
 )
 from txdav.who.delegates import RecordType as DelegatesRecordType
 from txdav.who.directory import (
@@ -548,6 +548,24 @@ def expandedMemberUIDs(self):
         else:
             return succeed([])
 
+    def containsUID(self, uid):
+        """
+        Is the supplied UID an expanded member of this proxy group.
+
+        @param uid: UID to test
+        @type uid: L{str}
+
+        @return: result
+        @rtype: L{bool}
+        """
+        log.debug("DPS Client containsUID")
+        return self.service._call(
+            ContainsUIDsCommand,
+            lambda x: x['result'],
+            uid=self.uid.encode("utf-8"),
+            testUid=uid.encode("utf-8")
+        )
+
     def _convertAccess(self, results):
         access = results["access"].decode("utf-8")
         return txdav.who.wiki.WikiAccessLevel.lookupByName(access)

txdav/dps/commands.py

@@ -198,6 +198,16 @@ class ExpandedMemberUIDsCommand(amp.Command):
     ]
 
 
+class ContainsUIDsCommand(amp.Command):
+    arguments = [
+        ('uid', amp.String()),
+        ('testUid', amp.String()),
+    ]
+    response = [
+        ('result', amp.Boolean()),
+    ]
+
+
 class VerifyPlaintextPasswordCommand(amp.Command):
     arguments = [
         ('uid', amp.String()),

txdav/dps/server.py

@@ -44,7 +44,7 @@
     VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand,
     WikiAccessForUIDCommand, ContinuationCommand,
     ExternalDelegatesCommand, StatsCommand, ExpandedMemberUIDsCommand,
-    AddMembersCommand, RemoveMembersCommand,
+    ContainsUIDsCommand, AddMembersCommand, RemoveMembersCommand,
     UpdateRecordsCommand, FlushCommand, SetAutoScheduleModeCommand,
     # RemoveRecordsCommand,
 )
@@ -498,6 +498,22 @@ def setMembers(self, uid, memberUIDs):
         # log.debug("Responding with: {response}", response=response)
         returnValue(response)
 
+    @ContainsUIDsCommand.responder
+    @inlineCallbacks
+    def containsUID(self, uid, testUid):
+        uid = uid.decode("utf-8")
+        testUid = testUid.decode("utf-8")
+        log.debug("ContainsUID: {u} {t}", u=uid, t=testUid)
+        record = (yield self._directory.recordWithUID(uid))
+        result = False
+        if record is not None:
+            result = yield record.containsUID(testUid)
+        response = {
+            "result": result,
+        }
+        # log.debug("Responding with: {response}", response=response)
+        returnValue(response)
+
     @UpdateRecordsCommand.responder
     @inlineCallbacks
     def updateRecords(self, uids, create):