acl: Move attribute rights checking to its own function

diff --git a/src/plugins/acl/acl-attributes.c b/src/plugins/acl/acl-attributes.c
index f0d3177de49fca4b0a020b4aaeff3b91a01c8dcf..515ff422616fba3b40420fa0b003a469150b5bdc 100644 (file)
--- a/src/plugins/acl/acl-attributes.c
+++ b/src/plugins/acl/acl-attributes.c
@@ -111,13 +111,6 @@ static int acl_have_attribute_rights(struct mailbox *box)
                return 1;
        }
 
-       /* RFC 5464:
-
-          When the ACL extension [RFC4314] is present, users can only set and
-          retrieve private or shared mailbox annotations on a mailbox on which
-          they have the "l" right and any one of the "r", "s", "w", "i", or "p"
-          rights.
-       */
        ret = acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_LOOKUP);
        if (ret <= 0) {
                if (ret < 0)
@@ -127,17 +120,7 @@ static int acl_have_attribute_rights(struct mailbox *box)
                return -1;
        }
 
-       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_READ) > 0)
-               return 0;
-       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_WRITE_SEEN) > 0)
-               return 0;
-       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_WRITE) > 0)
-               return 0;
-       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_INSERT) > 0)
-               return 0;
-       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_POST) > 0)
-               return 0;
-       return -1;
+       return acl_mailbox_have_extra_attribute_rights(box) ? 0 : -1;
 }
 
 int acl_attribute_set(struct mailbox_transaction_context *t,

diff --git a/src/plugins/acl/acl-mailbox.c b/src/plugins/acl/acl-mailbox.c
index 13ba0557d7475e6a4daf29634f68ae17f58599c3..fabaa06410825a954ad0b4008b76b2689adbe0e0 100644 (file)
--- a/src/plugins/acl/acl-mailbox.c
+++ b/src/plugins/acl/acl-mailbox.c
@@ -487,6 +487,28 @@ static int acl_mailbox_exists(struct mailbox *box, bool auto_boxes,
        return 0;
 }
 
+bool acl_mailbox_have_extra_attribute_rights(struct mailbox *box)
+{
+       /* RFC 5464:
+
+          When the ACL extension [RFC4314] is present, users can only set and
+          retrieve private or shared mailbox annotations on a mailbox on which
+          they have the "l" right and any one of the "r", "s", "w", "i", or "p"
+          rights.
+       */
+       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_READ) > 0)
+               return TRUE;
+       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_WRITE_SEEN) > 0)
+               return TRUE;
+       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_WRITE) > 0)
+               return TRUE;
+       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_INSERT) > 0)
+               return TRUE;
+       if (acl_mailbox_right_lookup(box, ACL_STORAGE_RIGHT_POST) > 0)
+               return TRUE;
+       return FALSE;
+}
+
 static int acl_mailbox_open_check_acl(struct mailbox *box)
 {
        struct acl_mailbox *abox = ACL_CONTEXT_REQUIRE(box);

diff --git a/src/plugins/acl/acl-storage.h b/src/plugins/acl/acl-storage.h
index 5f7df621720d29e4bd21be30eae18587eb3ef51a..8be4c269b4b00ca0a6d6496ab68498ffcff19ec3 100644 (file)
--- a/src/plugins/acl/acl-storage.h
+++ b/src/plugins/acl/acl-storage.h
@@ -28,6 +28,10 @@ struct acl_object *acl_mailbox_get_aclobj(struct mailbox *box);
    sets storage error. */
 int acl_mailbox_right_lookup(struct mailbox *box, unsigned int right_idx);
 
+/* Returns TRUE if mailbox has the necessary extra ACL for accessing
+   attributes. The caller must have checked the LOOKUP right already. */
+bool acl_mailbox_have_extra_attribute_rights(struct mailbox *box);
+
 int acl_mailbox_update_acl(struct mailbox_transaction_context *t,
                           const struct acl_rights_update *update);