From: Timo Sirainen <tss@iki.fi>
Date: Mon, 21 Jan 2013 14:52:49 +0000 (+0200)
Subject: dsync: Verify messages' GUIDs better.
X-Git-Tag: 2.2.beta2~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd70f7aec3bf49147fa80b77dd7ede7d7697202e;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Verify messages' GUIDs better.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 3af60dc064..d70fd8dcaf 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -432,6 +432,22 @@ dsync_import_set_mail(struct dsync_mailbox_importer *importer,
 	return TRUE;
 }
 
+static bool dsync_check_cur_guid(struct dsync_mailbox_importer *importer,
+				 const struct dsync_mail_change *change)
+{
+	if (change->guid == NULL || *change->guid == '\0')
+		return TRUE;
+	if (strcmp(importer->cur_guid, change->guid) != 0) {
+		i_error("Mailbox %s: Unexpected GUID mismatch for "
+			"UID=%u: %s != %s", mailbox_get_vname(importer->box),
+			change->uid, importer->cur_guid, change->guid);
+		importer->last_common_uid = 1;
+		importer->failed = TRUE;
+		return FALSE;
+	}
+	return TRUE;
+}
+
 static void
 merge_flags(uint32_t local_final, uint32_t local_add, uint32_t local_remove,
 	    uint32_t remote_final, uint32_t remote_add, uint32_t remote_remove,
@@ -718,9 +734,11 @@ dsync_mailbox_import_flag_change(struct dsync_mailbox_importer *importer,
 	i_assert((change->add_flags & change->remove_flags) == 0);
 
 	if (importer->cur_mail != NULL &&
-	    importer->cur_mail->uid == change->uid)
+	    importer->cur_mail->uid == change->uid) {
+		if (!dsync_check_cur_guid(importer, change))
+			return;
 		mail = importer->cur_mail;
-	else {
+	} else {
 		if (!dsync_import_set_mail(importer, change))
 			return;
 		mail = importer->mail;
@@ -833,7 +851,8 @@ dsync_mailbox_import_expunge(struct dsync_mailbox_importer *importer,
 	} else if (change->uid == importer->last_common_uid) {
 		/* already verified that the GUID matches */
 		i_assert(importer->cur_mail->uid == change->uid);
-		mail_expunge(importer->cur_mail);
+		if (dsync_check_cur_guid(importer, change))
+			mail_expunge(importer->cur_mail);
 	} else {
 		/* we don't know yet if we should expunge this
 		   message or not. queue it until we do. */