tests/functional wallace/module_resources.py

[Thomas Brüderli]

 tests/functional/test_wallace/test_005_resource_invitation.py |    3 ++-
 wallace/module_resources.py                                   |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 36ef0b35a936cc49e490d132d88922968c1eb471
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Aug 19 11:57:34 2014 -0400

    Set read ACLs for admin user before accessing resource calendars (#3428)

diff --git a/tests/functional/test_wallace/test_005_resource_invitation.py b/tests/functional/test_wallace/test_005_resource_invitation.py
index 0f05993..a4e1ebe 100644
--- a/tests/functional/test_wallace/test_005_resource_invitation.py
+++ b/tests/functional/test_wallace/test_005_resource_invitation.py
@@ -323,7 +323,8 @@ class TestResourceInvitation(unittest.TestCase):
         imap = IMAP()
         imap.connect()
 
-        imap.imap.m.select(u'"'+mailbox+'"')
+        imap.set_acl(mailbox, "cyrus-admin", "lrs")
+        imap.imap.m.select(imap.folder_quote(mailbox))
 
         found = None
         retries = 10
diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index c41413a..aa3c473 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -533,6 +533,9 @@ def read_resource_calendar(resource_rec, itip_events):
         level=9
     )
 
+    # set read ACLs for admin user
+    imap.set_acl(mailbox, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrs")
+
     # might raise an exception, let that bubble
     imap.imap.m.select(imap.folder_quote(mailbox))
     typ, data = imap.imap.m.search(None, 'ALL')
@@ -686,7 +689,7 @@ def save_resource_event(itip_event, resource, replace=False):
         if replace:
             delete_resource_event(itip_event['uid'], resource)
         else:
-            imap.imap.m.setacl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
+            imap.set_acl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
 
         result = imap.imap.m.append(
             targetfolder,
@@ -709,7 +712,7 @@ def delete_resource_event(uid, resource):
         Removes the IMAP object with the given UID from a resource's calendar folder
     """
     targetfolder = imap.folder_quote(resource['kolabtargetfolder'])
-    imap.imap.m.setacl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
+    imap.set_acl(targetfolder, conf.get(conf.get('kolab', 'imap_backend'), 'admin_login'), "lrswipkxtecda")
     imap.imap.m.select(targetfolder)
 
     typ, data = imap.imap.m.search(None, '(HEADER SUBJECT "%s")' % uid)