[CalendarServer-changes] [10897] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 12 10:26:27 PDT 2013
Revision: 10897
http://trac.calendarserver.org//changeset/10897
Author: sagen at apple.com
Date: 2013-03-12 10:26:27 -0700 (Tue, 12 Mar 2013)
Log Message:
-----------
Fixes a problem where groups were being ignored in the proxy db
Modified Paths:
--------------
CalendarServer/trunk/conf/auth/resources-test.xml
CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml
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_directory.py
CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
Modified: CalendarServer/trunk/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/resources-test.xml 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/conf/auth/resources-test.xml 2013-03-12 17:26:27 UTC (rev 10897)
@@ -35,7 +35,7 @@
<uid>mercury</uid>
<guid>mercury</guid>
<password>test</password>
- <name>Mecury Conference Room, Building 1, 2nd Floor</name>
+ <name>Mercury Conference Room, Building 1, 2nd Floor</name>
</location>
<location>
<uid>venus</uid>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts-modified.xml 2013-03-12 17:26:27 UTC (rev 10897)
@@ -115,6 +115,35 @@
<name>佐藤佐藤佐藤</name>
<email-address>nonascii at example.com</email-address>
</user>
+ <user>
+ <uid>delegator</uid>
+ <guid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
+ <password>a</password>
+ <name>Calendar Delegator</name>
+ <email-address>calendardelegator at example.com</email-address>
+ </user>
+ <user>
+ <uid>occasionaldelegate</uid>
+ <guid>EC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
+ <password>a</password>
+ <name>Occasional Delegate</name>
+ <email-address>occasional at example.com</email-address>
+ </user>
+ <user>
+ <uid>delegateviagroup</uid>
+ <guid>46D9D716-CBEE-490F-907A-66FA6C3767FF</guid>
+ <password>a</password>
+ <name>Delegate Via Group</name>
+ <email-address>delegateviagroup at example.com</email-address>
+ </user>
+ <group>
+ <uid>delegategroup</uid>
+ <guid>00599DAF-3E75-42DD-9DB7-52617E79943F</guid>
+ <name>Delegate Group</name>
+ <members>
+ <member type="users">delegateviagroup</member>
+ </members>
+ </group>
<user repeat="2">
<uid>user%02d</uid>
<guid>user%02d</guid>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2013-03-12 17:26:27 UTC (rev 10897)
@@ -124,6 +124,21 @@
<name>Occasional Delegate</name>
<email-address>occasional at example.com</email-address>
</user>
+ <user>
+ <uid>delegateviagroup</uid>
+ <guid>46D9D716-CBEE-490F-907A-66FA6C3767FF</guid>
+ <password>a</password>
+ <name>Delegate Via Group</name>
+ <email-address>delegateviagroup at example.com</email-address>
+ </user>
+ <group>
+ <uid>delegategroup</uid>
+ <guid>00599DAF-3E75-42DD-9DB7-52617E79943F</guid>
+ <name>Delegate Group</name>
+ <members>
+ <member type="users">delegateviagroup</member>
+ </members>
+ </group>
<user repeat="2">
<uid>user%02d</uid>
<guid>user%02d</guid>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments.xml 2013-03-12 17:26:27 UTC (rev 10897)
@@ -186,4 +186,10 @@
<enable-calendar>true</enable-calendar>
<enable-login>true</enable-login>
</record>
+ <record>
+ <uid>00599DAF-3E75-42DD-9DB7-52617E79943F</uid>
+ <enable>true</enable>
+ <enable-calendar>false</enable-calendar>
+ <enable-login>false</enable-login>
+ </record>
</augments>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/proxies.xml 2013-03-12 17:26:27 UTC (rev 10897)
@@ -63,6 +63,7 @@
<guid>FC465590-E9E9-4746-ACE8-6C756A49FE4D</guid>
<proxies>
<member>EC465590-E9E9-4746-ACE8-6C756A49FE4D</member>
+ <member>00599DAF-3E75-42DD-9DB7-52617E79943F</member>
</proxies>
</record>
</proxies>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_directory.py 2013-03-12 17:26:27 UTC (rev 10897)
@@ -220,6 +220,8 @@
self.assertEquals(
groups,
{
+ '00599DAF-3E75-42DD-9DB7-52617E79943F':
+ set(['46D9D716-CBEE-490F-907A-66FA6C3767FF']),
'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1':
set(['8B4288F6-CC82-491D-8EF9-642EF4F3E7D0']),
'admin':
@@ -250,6 +252,8 @@
self.assertEquals(
aliases,
{
+ '00599DAF-3E75-42DD-9DB7-52617E79943F':
+ '00599DAF-3E75-42DD-9DB7-52617E79943F',
'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1':
'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1',
'admin': 'admin',
@@ -286,7 +290,7 @@
# Allow an update by unlocking the cache
yield cache.releaseLock()
- self.assertEquals((False, 8, 8), (yield updater.updateCache()))
+ self.assertEquals((False, 9, 9), (yield updater.updateCache()))
# Verify cache is populated:
self.assertTrue((yield cache.isPopulated()))
@@ -382,7 +386,7 @@
# that wsanchez is only a proxy for gemini (since that assignment does not involve groups)
self.directoryService.xmlFile = dirTest.child("accounts-modified.xml")
self.directoryService._alwaysStat = True
- self.assertEquals((False, 7, 1), (yield updater.updateCache()))
+ self.assertEquals((False, 8, 1), (yield updater.updateCache()))
delegate = self._getPrincipalByShortName(DirectoryService.recordType_users, "wsanchez")
proxyFor = (yield delegate.proxyFor(True))
self.assertEquals(
@@ -689,8 +693,8 @@
self.assertFalse((yield cache.isPopulated()))
fast, numMembers, numChanged = (yield updater.updateCache(fast=True))
self.assertEquals(fast, False)
- self.assertEquals(numMembers, 8)
- self.assertEquals(numChanged, 8)
+ self.assertEquals(numMembers, 9)
+ self.assertEquals(numChanged, 9)
self.assertTrue(snapshotFile.exists())
self.assertTrue((yield cache.isPopulated()))
@@ -708,7 +712,7 @@
# Try an update which faults in from the directory (fast=False)
fast, numMembers, numChanged = (yield updater.updateCache(fast=False))
self.assertEquals(fast, False)
- self.assertEquals(numMembers, 8)
+ self.assertEquals(numMembers, 9)
self.assertEquals(numChanged, 0)
# Verify the snapshot contains the pickled dictionary we expect
@@ -716,6 +720,10 @@
self.assertEquals(
members,
{
+ "46D9D716-CBEE-490F-907A-66FA6C3767FF":
+ set([
+ u"00599DAF-3E75-42DD-9DB7-52617E79943F",
+ ]),
"5A985493-EE2C-4665-94CF-4DFEA3A89500":
set([
u"non_calendar_group",
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2013-03-12 17:26:08 UTC (rev 10896)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2013-03-12 17:26:27 UTC (rev 10897)
@@ -462,7 +462,17 @@
"""
self.assertEquals(
set((yield calendaruserproxy.ProxyDBService.getAllMembers())), #@UndefinedVariable
- set([u'6423F94A-6B76-4A3A-815B-D52CFD77935D', u'8A985493-EE2C-4665-94CF-4DFEA3A89500', u'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2', u'both_coasts', u'left_coast', u'non_calendar_group', u'recursive1_coasts', u'recursive2_coasts', u'EC465590-E9E9-4746-ACE8-6C756A49FE4D'])
+ set([
+ u'00599DAF-3E75-42DD-9DB7-52617E79943F',
+ u'6423F94A-6B76-4A3A-815B-D52CFD77935D',
+ u'8A985493-EE2C-4665-94CF-4DFEA3A89500',
+ u'9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD2',
+ u'both_coasts',
+ u'left_coast',
+ u'non_calendar_group',
+ u'recursive1_coasts',
+ u'recursive2_coasts',
+ u'EC465590-E9E9-4746-ACE8-6C756A49FE4D'])
)
@@ -470,6 +480,7 @@
def test_hideDisabledDelegates(self):
"""
Delegates who are not enabledForLogin are "hidden" from the delegate lists
+ (but groups *are* allowed)
"""
record = self.directoryService.recordWithGUID("EC465590-E9E9-4746-ACE8-6C756A49FE4D")
@@ -477,19 +488,19 @@
record.enabledForLogin = True
yield self._groupMembersTest(
DirectoryService.recordType_users, "delegator", "calendar-proxy-write",
- ("Occasional Delegate",),
+ ("Occasional Delegate", "Delegate Via Group", "Delegate Group"),
)
# Login disabled -- no longer shown as a delegate
record.enabledForLogin = False
yield self._groupMembersTest(
DirectoryService.recordType_users, "delegator", "calendar-proxy-write",
- [],
+ ("Delegate Via Group", "Delegate Group"),
)
# Login re-enabled -- once again a delegate (it wasn't not removed from proxydb)
record.enabledForLogin = True
yield self._groupMembersTest(
DirectoryService.recordType_users, "delegator", "calendar-proxy-write",
- ("Occasional Delegate",),
+ ("Occasional Delegate", "Delegate Via Group", "Delegate Group"),
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130312/80a79289/attachment-0001.html>
More information about the calendarserver-changes
mailing list