From a8eb059203ffbe41ea9519d28cee916eb5e02790 Mon Sep 17 00:00:00 2001 From: Jiri Hruska Date: Tue, 26 Feb 2013 22:12:24 +0100 Subject: 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. --- lib/imap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/imap.c') diff --git a/lib/imap.c b/lib/imap.c index b7c92ef58..9f0e6cb95 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; } -- cgit v1.2.3