From: Jiri Hruska <jirka@fud.cz>
Date: Tue, 26 Feb 2013 21:12:24 +0000 (+0100)
Subject: imap: Added verification of UIDVALIDITY mailbox attribute
X-Git-Tag: curl-7_30_0~252
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8eb059203ffbe41ea9519d28cee916eb5e02790;p=thirdparty%2Fcurl.git

imap: Added verification of UIDVALIDITY mailbox attribute

Added support for checking the UIDVALIDITY, and aborting the request, if
it has been specified in the URL and the server response is different.
---

diff --git a/lib/imap.c b/lib/imap.c
index b7c92ef585..9f0e6cb95d 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1216,6 +1216,7 @@ static CURLcode imap_state_select_resp(struct connectdata *conn,
 {
   CURLcode result = CURLE_OK;
   struct SessionHandle *data = conn->data;
+  struct IMAP *imap = conn->data->state.proto.imap;
   struct imap_conn *imapc = &conn->proto.imapc;
   const char *line = data->state.buffer;
   char tmp[20];
@@ -1233,8 +1234,16 @@ static CURLcode imap_state_select_resp(struct connectdata *conn,
     failf(data, "Select failed");
     result = CURLE_LOGIN_DENIED;
   }
-  else
-    result = imap_fetch(conn);
+  else {
+    /* Check if the UIDVALIDITY has been specified and matches */
+    if(imap->uidvalidity && imapc->mailbox_uidvalidity &&
+       strcmp(imap->uidvalidity, imapc->mailbox_uidvalidity)) {
+      failf(conn->data, "Mailbox UIDVALIDITY has changed");
+      result = CURLE_REMOTE_FILE_NOT_FOUND;
+    }
+    else
+      result = imap_fetch(conn);
+  }
 
   return result;
 }