Request 3248 (accepted)

You're not reviewing the full diff of request 3248 , but the diff to the superseded request 3229 (Show full diff)

Overview

Request 3248 (accepted)

cyrus-imapd 3.6.3

Created by mollekopf about 1 year ago
In state accepted
Supersedes 3229
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit cyrus-imapd-3

Submit package Kolab:16:Testing / cyrus-imapd-3 to package Kolab:16 / cyrus-imapd-3

cyrus-imapd.spec Changed

0001-Always-quote-SETMETADATA-values.patch Deleted

@@ -1,27 +0,0 @@
-From 2d3fd722e89d579cbbd1fe1006e7b8a7d19891a4 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Fri, 19 May 2023 10:58:27 +0200
-Subject: PATCH Always quote SETMETADATA values
-
-the value can be NUL, a quoted string or a literal, but NOT an atom.
-Per RFC and parsing implementation.
----
- imap/imap_proxy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
-index dd7c608b2..7d6dc4335 100644
---- a/imap/imap_proxy.c
-+++ b/imap/imap_proxy.c
-@@ -1497,7 +1497,7 @@ int annotate_store_proxy(const char *server, const char *mbox_pat,
-             /* Print the entry-value pair */
-             prot_printamap(be->out, entrybuf.s, entrybuf.len);
-             prot_putc(' ', be->out);
--            prot_printamap(be->out, av->value.s, av->value.len);
-+            prot_printmap(be->out, av->value.s, av->value.len);
- 
-             if (av->next) prot_putc(' ', be->out);
-         }
--- 
-2.40.0
-

0001-Backwards-compatibility-for-the-sync-protocol-withou.patch Deleted

@@ -1,43 +0,0 @@
-From d45b77b5d13108009c4ecd09bc15c032b527fdba Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Wed, 17 May 2023 18:16:09 +0200
-Subject: PATCH Backwards compatibility for the sync protocol without MODSEQ
-
-Required after 9d4d5069230d699c34e9c8410f0bd1df9ae3040a
----
- imap/sync_support.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/imap/sync_support.c b/imap/sync_support.c
-index f2699108a..0b43f15d0 100755
---- a/imap/sync_support.c
-+++ b/imap/sync_support.c
-@@ -1420,8 +1420,11 @@ int decode_annotations(/*const*/struct dlist *annots,
-             return IMAP_PROTOCOL_BAD_PARAMETERS;
-         if (!dlist_getatom(aa, "USERID", &userid))
-             return IMAP_PROTOCOL_BAD_PARAMETERS;
--        if (!dlist_getnum64(aa, "MODSEQ", &modseq))
--            return IMAP_PROTOCOL_BAD_PARAMETERS;
-+        if (!dlist_getnum64(aa, "MODSEQ", &modseq)) {
-+            // Backwards compat for cyrus 2.5
-+            modseq = 0;
-+            //return IMAP_PROTOCOL_BAD_PARAMETERS;
-+        }
-         if (!dlist_getbuf(aa, "VALUE", &value))
-             return IMAP_PROTOCOL_BAD_PARAMETERS;
-         if (!strcmp(entry, IMAP_ANNOT_NS "thrid") &&
-@@ -2997,9 +3000,9 @@ int sync_apply_mailbox(struct dlist *kin,
-     /* take all mailbox (not message) annotations - aka metadata,
-      * they're not versioned either */
-     if (ka)
--        decode_annotations(ka, &mannots, mailbox, NULL);
-+        r = decode_annotations(ka, &mannots, mailbox, NULL);
- 
--    r = read_annotations(mailbox, NULL, &rannots, 0, 0);
-+    if (!r) r = read_annotations(mailbox, NULL, &rannots, 0, 0);
-     if (!r) r = apply_annotations(mailbox, NULL, rannots, mannots, 0, NULL);
- 
-     if (r) {
--- 
-2.40.0
-

0001-Correctly-proxy-GETMETADATA-with-DEPTH-0.patch Deleted

@@ -1,75 +0,0 @@
-From 572a42859211d810af65fb4e40962115831b21fa Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Thu, 7 Sep 2023 22:04:38 +0200
-Subject: PATCH Correctly proxy GETMETADATA with DEPTH != 0
-
-Not that the backend handles DEPTH infinity correctly, but we try.
----
- imap/imap_proxy.c | 40 ++++++++++++++++++++++++++++++++++------
- 1 file changed, 34 insertions(+), 6 deletions(-)
-
-diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
-index 7d6dc4335..aca1ab4df 100644
---- a/imap/imap_proxy.c
-+++ b/imap/imap_proxy.c
-@@ -1409,7 +1409,7 @@ int annotate_fetch_proxy(const char *server, const char *mbox_pat,
-                          const strarray_t *attribute_pat)
- {
-     struct backend *be;
--    int i;
-+    int i, increment;
-     char mytag128;
- 
-     assert(server && mbox_pat && entry_pat && attribute_pat);
-@@ -1421,15 +1421,43 @@ int annotate_fetch_proxy(const char *server, const char *mbox_pat,
- 
-     /* Send command to remote */
-     proxy_gentag(mytag, sizeof(mytag));
--    prot_printf(be->out, "%s GETMETADATA \"%s\" (", mytag, mbox_pat);
-+    prot_printf(be->out, "%s GETMETADATA (", mytag);
-+
-+    //For depth infinity/1 we get an extra entry (per pattern), with a suffix we can check (* for infinity, % for 1).
-+    // entry /vendor/kolab/folder-type
-+    // entry /vendor/kolab/folder-type/*
-+    //
-+    // We only check the first, because there is just one depth in GETMETADATA
-+    // FIXME: we completely ignore other options
-+    if (entry_pat->count == attribute_pat->count) {
-+        prot_printf(be->out, "DEPTH 0) \"%s\" (", mbox_pat);
-+    } else if (entry_pat->count > 1) {
-+        const char *entry = strarray_nth(entry_pat, 1);
-+        const char suffix = entrystrlen(entry) - 1;
-+        if (suffix == '%') {
-+            prot_printf(be->out, "DEPTH 1) \"%s\" (", mbox_pat);
-+        } else if (suffix == '*') {
-+            prot_printf(be->out, "DEPTH infinity) \"%s\" (", mbox_pat);
-+        } else {
-+            syslog(LOG_ERR, "Unknown entry suffix %s %c", entry, suffix);
-+            return IMAP_INTERNAL;
-+        }
-+    }
- 
--    if (entry_pat->count != attribute_pat->count) {
--        syslog(LOG_ERR, "Number of scopes and entries must match");
-+    //With DEPTH 0, we get one entry pattern. With DEPTH infinity an extra pattern with /*, and with DEPTH 1 and extra pattern of /%
-+    if (entry_pat->count == attribute_pat->count) {
-+        increment = 1;
-+    } else {
-+        increment = 2;
-+    }
-+    //The count matches if depth = 0, otherwise we have twice the number of entries.
-+    if ((entry_pat->count / increment) != attribute_pat->count) {
-+        syslog(LOG_ERR, "Number of scopes and entries must match %i %i", entry_pat->count, attribute_pat->count);
-         return IMAP_INTERNAL;
-     }
- 
--    for (i = 0; i < entry_pat->count; i++) {
--        const char *entry = strarray_nth(entry_pat, i);
-+    for (i = 0; (i * increment) < entry_pat->count; i++) {
-+        const char *entry = strarray_nth(entry_pat, i * increment);
-         const char *scope, *attr = strarray_nth(attribute_pat, i);
-         if (!strcmp(attr, "value.shared")) {
-             scope = "/shared";
--- 
-2.41.0
-

0001-For-metadata-proxying-we-expect-to-have-as-maniy-ent.patch Deleted

@@ -1,52 +0,0 @@
-From c8fb932617612efb224d0c589082969be92f5018 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Fri, 19 May 2023 14:06:42 +0200
-Subject: PATCH For metadata proxying we expect to have as maniy entries in
- the attributes as for the values.
-
-This might break metadata support in LIST, don't think the codepath is
-used elsewhere.
----
- imap/imapd.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/imap/imapd.c b/imap/imapd.c
-index 4abcd27dc..e57c7bfb6 100644
---- a/imap/imapd.c
-+++ b/imap/imapd.c
-@@ -10374,8 +10374,6 @@ static int _metadata_to_annotate(const strarray_t *entries,
-                                  const char *tag, int depth)
- {
-     int i;
--    int have_shared = 0;
--    int have_private = 0;
- 
-     /* we need to rewrite the entries and attribs to match the way that
-      * the old annotation system works. */
-@@ -10390,12 +10388,12 @@ static int _metadata_to_annotate(const strarray_t *entries,
-         if (!strncmp(ent, "/private", 8) &&
-             (ent8 == '\0' || ent8 == '/')) {
-             xstrncpy(entry, ent + 8, MAX_MAILBOX_NAME);
--            have_private = 1;
-+            strarray_append(newa, "value.priv");
-         }
-         else if (!strncmp(ent, "/shared", 7) &&
-                  (ent7 == '\0' || ent7 == '/')) {
-             xstrncpy(entry, ent + 7, MAX_MAILBOX_NAME);
--            have_shared = 1;
-+            strarray_append(newa, "value.shared");
-         }
-         else {
-             if (tag)
-@@ -10415,8 +10413,6 @@ static int _metadata_to_annotate(const strarray_t *entries,
-         }
-     }
- 
--    if (have_private) strarray_append(newa, "value.priv");
--    if (have_shared) strarray_append(newa, "value.shared");
- 
-     return 0;
- }
--- 
-2.40.0
-

0002-Fixed-GETMETADATA-parsing.patch Deleted

@@ -1,72 +0,0 @@
-From 9a27d175b594f5315437ad7701f87bb643ec82fc Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Thu, 18 May 2023 14:52:04 +0200
-Subject: PATCH 2/2 Fixed GETMETADATA parsing
-
-THe previous implementation broken when requesting multiple metadata
-items (/shared/vendor/foo /private/vendor/foo).
-I assume this breaks GETANNOTATION and it may not work in the cases that
-the parsing in imap.c handles, but at least the basics work.
----
- imap/imap_proxy.c | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
-index 14de79732..4e0db8821 100644
---- a/imap/imap_proxy.c
-+++ b/imap/imap_proxy.c
-@@ -1409,7 +1409,7 @@ int annotate_fetch_proxy(const char *server, const char *mbox_pat,
-                          const strarray_t *attribute_pat)
- {
-     struct backend *be;
--    int i, j;
-+    int i;
-     char mytag128;
- 
-     assert(server && mbox_pat && entry_pat && attribute_pat);
-@@ -1422,24 +1422,28 @@ int annotate_fetch_proxy(const char *server, const char *mbox_pat,
-     /* Send command to remote */
-     proxy_gentag(mytag, sizeof(mytag));
-     prot_printf(be->out, "%s GETMETADATA \"%s\" (", mytag, mbox_pat);
-+
-+    if (entry_pat->count != attribute_pat->count) {
-+        syslog(LOG_ERR, "Number of scopes and entries must match");
-+        return IMAP_INTERNAL;
-+    }
-+
-     for (i = 0; i < entry_pat->count; i++) {
-         const char *entry = strarray_nth(entry_pat, i);
--
--        for (j = 0; j < attribute_pat->count; j++) {
--            const char *scope, *attr = strarray_nth(attribute_pat, j);
--            if (!strcmp(attr, "value.shared")) {
--                scope = "/shared";
--            }
--            else if (!strcmp(attr, "value.priv")) {
--                scope = "/private";
--            }
--            else {
--                syslog(LOG_ERR, "won't get deprecated annotation attribute %s", attr);
--                continue;
--            }
--            prot_printf(be->out, "%s%s%s", i ? " " : "", scope, entry);
-+        const char *scope, *attr = strarray_nth(attribute_pat, i);
-+        if (!strcmp(attr, "value.shared")) {
-+            scope = "/shared";
-         }
-+        else if (!strcmp(attr, "value.priv")) {
-+            scope = "/private";
-+        }
-+        else {
-+            syslog(LOG_ERR, "won't get deprecated annotation attribute %s", attr);
-+            continue;
-+        }
-+        prot_printf(be->out, "%s%s%s", i ? " " : "", scope, entry);
-     }
-+
-     prot_printf(be->out, ")\r\n");
-     prot_flush(be->out);
- 
--- 
-2.40.0
-

Build Results
RPM Lint

Refresh

Comments for request 3248 0

Request History

mollekopf created request about 1 year ago

cyrus-imapd 3.6.3

mollekopf accepted request about 1 year ago