jmap_contact: do not set "urn:uuid:" twice in UID

Signed-off-by: Robert Stepanek <[email protected]>
cyrusimap · Aug 10, 2023 · 2f2928a · 2f2928a
1 parent 4bb5d40
commit 2f2928a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/cassandane/tiny-tests/JMAPContacts/cardgroup-set-create b/cassandane/tiny-tests/JMAPContacts/cardgroup-set-create
@@ -55,7 +55,7 @@ sub test_cardgroup_set_create
     $self->assert_matches(qr/KIND:GROUP/, $card);
     $self->assert_matches(qr/UID:$id/, $card);
     $self->assert_matches(qr/FN:$name/, $card);
-    $self->assert_matches(qr/MEMBER:urn:uuid:$member1/, $card);
-    $self->assert_matches(qr/MEMBER:urn:uuid:$member2/, $card);
+    $self->assert_matches(qr/MEMBER:$member1/, $card);
+    $self->assert_matches(qr/MEMBER:$member2/, $card);
     $self->assert_does_not_match(qr/N:;/, $card);
 }
diff --git a/imap/jmap_contact.c b/imap/jmap_contact.c
@@ -1906,7 +1906,12 @@ static int _add_group_entries(struct jmap_req *req,
             buf_reset(&buf);
             continue;
         }
-        buf_setcstr(&buf, "urn:uuid:");
+
+        buf_reset(&buf);
+        if (strncmpsafe("urn:uuid:", uid, 9)) {
+            buf_setcstr(&buf, "urn:uuid:");
+        }
+
         buf_appendcstr(&buf, uid);
         vparse_add_entry(card, NULL, group_propname, buf_cstring(&buf));
         buf_reset(&buf);
@@ -1936,7 +1941,12 @@ static int _add_othergroup_entries(struct jmap_req *req,
                 buf_reset(&buf);
                 continue;
             }
-            buf_setcstr(&buf, "urn:uuid:");
+
+            buf_reset(&buf);
+            if (strncmpsafe("urn:uuid:", uid, 9)) {
+                buf_setcstr(&buf, "urn:uuid:");
+            }
+
             buf_appendcstr(&buf, uid);
             struct vparse_entry *entry =
                 vparse_add_entry(card, NULL,
@@ -8311,7 +8321,11 @@ static unsigned _jsmultikey_to_card(struct jmap_parser *parser, json_t *jval,
             vcardproperty_set_value(prop, vcardvalue_new_textlist(text));
         }
         else if (pkind == VCARD_MEMBER_PROPERTY) {
-            buf_setcstr(&buf, "urn:uuid:");
+            buf_reset(&buf);
+            if (strncmpsafe("urn:uuid:", id, 9)) {
+                buf_setcstr(&buf, "urn:uuid:");
+            }
+
             buf_appendcstr(&buf, id);
             vcardproperty_set_value_from_string(prop, buf_cstring(&buf), "NO");
         }