[CalendarServer-changes] [3518] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 3518
          http://trac.macosforge.org/projects/calendarserver/changeset/3518
Author:   wsanchez at apple.com
Date:     2008-12-12 11:16:31 -0800 (Fri, 12 Dec 2008)
Log Message:
-----------
Ignore system records

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-12-12 02:54:41 UTC (rev 3517)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-12-12 19:16:31 UTC (rev 3518)
@@ -474,6 +474,11 @@
                                % (recordType, recordShortName, recordNodeName))
                 continue
 
+            if recordGUID.lower().startswith("ffffeeee-dddd-cccc-bbbb-aaaa"):
+                self.log_debug("Ignoring system record (%s)%s in node %s."
+                               % (recordType, recordShortName, recordNodeName))
+                continue
+
             # Determine enabled state
             enabledForCalendaring = True
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py	2008-12-12 02:54:41 UTC (rev 3517)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectoryrecords.py	2008-12-12 19:16:31 UTC (rev 3518)
@@ -232,6 +232,27 @@
             self._verifyRecords(DirectoryService.recordType_users, ("user01", "user02", "user03"))
             self._verifyDisabledRecords(DirectoryService.recordType_users, (), ())
 
+        def test_noGUID(self):
+            self._service.fakerecords = {
+                DirectoryService.recordType_users: [
+                    fakeODRecord("User 01", guid=""),
+                ],
+            }
+            self._service.reloadCache(DirectoryService.recordType_users)
+            self._verifyRecords(DirectoryService.recordType_users, ())
+
+        def test_systemRecord(self):
+            self._service.fakerecords = {
+                DirectoryService.recordType_users: [
+                    fakeODRecord("root",   guid="FFFFEEEE-DDDD-CCCC-BBBB-AAAA00000000"),
+                    fakeODRecord("daemon", guid="FFFFEEEE-DDDD-CCCC-BBBB-AAAA00000001"),
+                    fakeODRecord("uucp",   guid="ffffeeee-dddd-cccc-bbbb-aaaa00000004"), # Try lowercase also
+                    fakeODRecord("nobody", guid="ffffeeee-dddd-cccc-bbbb-aaaafffffffe"),
+                ],
+            }
+            self._service.reloadCache(DirectoryService.recordType_users)
+            self._verifyRecords(DirectoryService.recordType_users, ())
+
         def test_duplicateEmail(self):
             self._service.fakerecords = {
                 DirectoryService.recordType_users: [
@@ -265,7 +286,6 @@
             self._verifyDisabledRecords(DirectoryService.recordType_users, (), ())
             self._verifyDisabledRecords(DirectoryService.recordType_users, (), ())
 
-
         def test_duplicateName(self):
             self._service.fakerecords = {
                 DirectoryService.recordType_users: [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081212/c6463f37/attachment.html>