[CalendarServer-changes] [5312] CalendarServer/trunk/twistedcaldav/directory
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 15 18:10:27 PDT 2010
Revision: 5312
http://trac.macosforge.org/projects/calendarserver/changeset/5312
Author: sagen at apple.com
Date: 2010-03-15 18:10:24 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Fixes updateProxyDb, allowing multiple proxies
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py
CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
CalendarServer/trunk/twistedcaldav/directory/test/augments.xml
CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml
CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxyloader.py 2010-03-16 01:10:24 UTC (rev 5312)
@@ -134,7 +134,5 @@
db = calendaruserproxy.ProxyDBService
for item in self.items:
guid, write_proxies, read_proxies = item
- for proxy in write_proxies:
- yield db.setGroupMembers("%s#%s" % (guid, "calendar-proxy-write"), (proxy,))
- for proxy in read_proxies:
- yield db.setGroupMembers("%s#%s" % (guid, "calendar-proxy-read"), (proxy,))
+ yield db.setGroupMembers("%s#%s" % (guid, "calendar-proxy-write"), write_proxies)
+ yield db.setGroupMembers("%s#%s" % (guid, "calendar-proxy-read"), read_proxies)
Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2010-03-16 01:10:24 UTC (rev 5312)
@@ -60,6 +60,27 @@
<name>No Calendar</name>
<email-address>nocalendar at example.com</email-address>
</user>
+ <user>
+ <uid>usera</uid>
+ <guid>7423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
+ <password>a</password>
+ <name>a</name>
+ <email-address>a at example.com</email-address>
+ </user>
+ <user>
+ <uid>userb</uid>
+ <guid>8A985493-EE2C-4665-94CF-4DFEA3A89500</guid>
+ <password>b</password>
+ <name>b</name>
+ <email-address>b at example.com</email-address>
+ </user>
+ <user>
+ <uid>userc</uid>
+ <guid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</guid>
+ <password>c</password>
+ <name>c</name>
+ <email-address>c at example.com</email-address>
+ </user>
<user repeat="2">
<uid>user%02d</uid>
<guid>user%02d</guid>
@@ -159,7 +180,7 @@
<uid>mercury</uid>
<guid>mercury</guid>
<password>mercury</password>
- <name>Mecury Seven</name>
+ <name>Mercury Seven</name>
<email-address>mercury at example.com</email-address>
</location>
<location>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2010-03-16 01:10:24 UTC (rev 5312)
@@ -139,4 +139,19 @@
<enable-calendar>true</enable-calendar>
<enable-addressbook>true</enable-addressbook>
</record>
+ <record>
+ <uid>7423F94A-6B76-4A3A-815B-D52CFD77935D</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ </record>
+ <record>
+ <uid>8A985493-EE2C-4665-94CF-4DFEA3A89500</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ </record>
+ <record>
+ <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ </record>
</augments>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2010-03-16 01:10:24 UTC (rev 5312)
@@ -52,4 +52,11 @@
<member>recursive2_coasts</member>
</read-only-proxies>
</record>
+ <record>
+ <guid>7423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
+ <proxies>
+ <member>8A985493-EE2C-4665-94CF-4DFEA3A89500</member>
+ <member>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2</member>
+ </proxies>
+ </record>
</proxies>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-03-16 01:10:24 UTC (rev 5312)
@@ -248,15 +248,41 @@
def lookupMethod(obj, compound, casei, recordType, attributes, count=0):
if dsattributes.kDSStdRecordTypeUsers in recordType:
return [
- ('morgen', {'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users', 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1', 'dsAttrTypeStandard:RecordName': ['morgen', 'Morgen Sagen'], 'dsAttrTypeStandard:FirstName': 'Morgen', 'dsAttrTypeStandard:GeneratedUID': '83479230-821E-11DE-B6B0-DBB02C6D659D', 'dsAttrTypeStandard:LastName': 'Sagen', 'dsAttrTypeStandard:EMailAddress': 'morgen at example.com', 'dsAttrTypeStandard:RealName': 'Morgen Sagen'}),
- ('morehouse', {'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users', 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1', 'dsAttrTypeStandard:RecordName': ['morehouse', 'Joe Morehouse'], 'dsAttrTypeStandard:FirstName': 'Joe', 'dsAttrTypeStandard:GeneratedUID': '98342930-90DC-11DE-A842-A29601FB13E8', 'dsAttrTypeStandard:LastName': 'Morehouse', 'dsAttrTypeStandard:EMailAddress': 'morehouse at example.com', 'dsAttrTypeStandard:RealName': 'Joe Morehouse'}),
+ ('morgen',
+ {
+ 'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users',
+ 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1',
+ 'dsAttrTypeStandard:RecordName': ['morgen', 'Morgen Sagen'],
+ 'dsAttrTypeStandard:FirstName': 'Morgen',
+ 'dsAttrTypeStandard:GeneratedUID': '83479230-821E-11DE-B6B0-DBB02C6D659D',
+ 'dsAttrTypeStandard:LastName': 'Sagen',
+ 'dsAttrTypeStandard:EMailAddress': 'morgen at example.com',
+ 'dsAttrTypeStandard:RealName': 'Morgen Sagen'
+ }),
+ ('morehouse',
+ {
+ 'dsAttrTypeStandard:RecordType': 'dsRecTypeStandard:Users',
+ 'dsAttrTypeStandard:AppleMetaNodeLocation': '/LDAPv3/127.0.0.1',
+ 'dsAttrTypeStandard:RecordName': ['morehouse', 'Joe Morehouse'],
+ 'dsAttrTypeStandard:FirstName': 'Joe',
+ 'dsAttrTypeStandard:GeneratedUID': '98342930-90DC-11DE-A842-A29601FB13E8',
+ 'dsAttrTypeStandard:LastName': 'Morehouse',
+ 'dsAttrTypeStandard:EMailAddress': 'morehouse at example.com',
+ 'dsAttrTypeStandard:RealName': 'Joe Morehouse'
+ }),
]
else:
return []
- fields = [('fullName', 'mor', True, u'starts-with'), ('emailAddresses', 'mor', True, u'starts-with'), ('firstName', 'mor', True, u'starts-with'), ('lastName', 'mor', True, u'starts-with')]
+ fields = [
+ ('fullName', 'mor', True, u'starts-with'),
+ ('emailAddresses', 'mor', True, u'starts-with'),
+ ('firstName', 'mor', True, u'starts-with'),
+ ('lastName', 'mor', True, u'starts-with')
+ ]
- results = (yield self.service().recordsMatchingFields(fields, lookupMethod=lookupMethod))
+ results = (yield self.service().recordsMatchingFields(fields,
+ lookupMethod=lookupMethod))
results = list(results)
self.assertEquals(len(results), 2)
for record in results:
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2010-03-15 20:23:44 UTC (rev 5311)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2010-03-16 01:10:24 UTC (rev 5312)
@@ -131,6 +131,19 @@
proxies = sorted([principal.displayName() for principal in proxies])
self.assertEquals(proxies, sorted(expectedProxies))
+ @inlineCallbacks
+ def test_multipleProxyAssignmentsAtOnce(self):
+ yield self._proxyForTest(
+ DirectoryService.recordType_users, "userb",
+ ('a',),
+ True
+ )
+ yield self._proxyForTest(
+ DirectoryService.recordType_users, "userc",
+ ('a',),
+ True
+ )
+
def test_groupMembersRegular(self):
"""
DirectoryPrincipalResource.expandedGroupMembers()
@@ -321,7 +334,7 @@
return self._proxyForTest(
DirectoryService.recordType_users, "wsanchez",
- ("Mecury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
+ ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
True
)
@@ -336,7 +349,7 @@
yield self._proxyForTest(
DirectoryService.recordType_users, "wsanchez",
- ("Mecury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
+ ("Mercury Seven", "Gemini Twelve", "Apollo Eleven", "Orion", ),
True
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100315/2f2e5aab/attachment-0001.html>
More information about the calendarserver-changes
mailing list