#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#if defined(HAVE_UNISTD_H)
#include <unistd.h>
-#endif
-#if defined(STDC_HEADERS)
#include <stdlib.h>
-#endif
#include <errno.h>
#include "fetchmail.h"
#include "socket.h"
-#include "i18n.h"
+#include "gettext.h"
+#include "uid_db.h"
#ifdef OPIE_ENABLE
#ifdef __cplusplus
#endif /* OPIE_ENABLE */
/* session variables initialized in capa_probe() or pop3_getauth() */
+flag done_capa = FALSE;
#if defined(GSSAPI)
flag has_gssapi = FALSE;
#endif /* defined(GSSAPI) */
-#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
+#if defined(KERBEROS_V5)
flag has_kerberos = FALSE;
-#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
+#endif /* defined(KERBEROS_V5) */
static flag has_cram = FALSE;
#ifdef OPIE_ENABLE
flag has_otp = FALSE;
#endif /* OPIE_ENABLE */
+#ifdef NTLM_ENABLE
+flag has_ntlm = FALSE;
+#endif /* NTLM_ENABLE */
#ifdef SSL_ENABLE
-static flag has_ssl = FALSE;
+static flag has_stls = FALSE;
#endif /* SSL_ENABLE */
/* mailbox variables initialized in pop3_getrange() */
static int do_pop3_ntlm(int sock, struct query *ctl,
int msn_instead /** if true, send AUTH MSN, else send AUTH NTLM */)
{
- tSmbNtlmAuthRequest request;
- tSmbNtlmAuthChallenge challenge;
- tSmbNtlmAuthResponse response;
+ char msgbuf[POPBUFSIZE+1];
+ int result;
- char msgbuf[2048];
- int result,len;
-
gen_send(sock, msn_instead ? "AUTH MSN" : "AUTH NTLM");
- if ((result = gen_recv(sock, msgbuf, sizeof msgbuf)))
- return result;
-
- if (msgbuf[0] != '+')
- return PS_AUTHFAIL;
-
- buildSmbNtlmAuthRequest(&request,ctl->remotename,NULL);
-
- if (outlevel >= O_DEBUG)
- dumpSmbNtlmAuthRequest(stdout, &request);
-
- memset(msgbuf,0,sizeof msgbuf);
- to64frombits (msgbuf, &request, SmbLength(&request));
-
- if (outlevel >= O_MONITOR)
- report(stdout, "POP3> %s\n", msgbuf);
-
- strcat(msgbuf,"\r\n");
- SockWrite (sock, msgbuf, strlen (msgbuf));
-
- if ((gen_recv(sock, msgbuf, sizeof msgbuf)))
+ if ((result = ntlm_helper(sock, ctl, "POP3")))
return result;
-
- len = from64tobits (&challenge, msgbuf, sizeof(msgbuf));
-
- if (outlevel >= O_DEBUG)
- dumpSmbNtlmAuthChallenge(stdout, &challenge);
-
- buildSmbNtlmAuthResponse(&challenge, &response,ctl->remotename,ctl->password);
-
- if (outlevel >= O_DEBUG)
- dumpSmbNtlmAuthResponse(stdout, &response);
-
- memset(msgbuf,0,sizeof msgbuf);
- to64frombits (msgbuf, &response, SmbLength(&response));
-
- if (outlevel >= O_MONITOR)
- report(stdout, "POP3> %s\n", msgbuf);
-
- strcat(msgbuf,"\r\n");
- SockWrite (sock, msgbuf, strlen (msgbuf));
-
+
if ((result = gen_recv (sock, msgbuf, sizeof msgbuf)))
return result;
-
+
if (strstr (msgbuf, "OK"))
return PS_SUCCESS;
else
{
int ok;
+ if (done_capa) {
+ return PS_SUCCESS;
+ }
#if defined(GSSAPI)
has_gssapi = FALSE;
#endif /* defined(GSSAPI) */
-#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
+#if defined(KERBEROS_V5)
has_kerberos = FALSE;
-#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
+#endif /* defined(KERBEROS_V5) */
has_cram = FALSE;
#ifdef OPIE_ENABLE
has_otp = FALSE;
#endif /* OPIE_ENABLE */
+#ifdef NTLM_ENABLE
+ has_ntlm = FALSE;
+#endif /* NTLM_ENABLE */
ok = gen_transact(sock, "CAPA");
if (ok == PS_SUCCESS)
{
if (DOTLINE(buffer))
break;
+
#ifdef SSL_ENABLE
if (strstr(buffer, "STLS"))
- has_ssl = TRUE;
+ has_stls = TRUE;
#endif /* SSL_ENABLE */
+
#if defined(GSSAPI)
if (strstr(buffer, "GSSAPI"))
has_gssapi = TRUE;
#endif /* defined(GSSAPI) */
-#if defined(KERBEROS_V4)
- if (strstr(buffer, "KERBEROS_V4"))
- has_kerberos = TRUE;
-#endif /* defined(KERBEROS_V4) */
+
#ifdef OPIE_ENABLE
if (strstr(buffer, "X-OTP"))
has_otp = TRUE;
#endif /* OPIE_ENABLE */
+
+#ifdef NTLM_ENABLE
+ if (strstr(buffer, "NTLM"))
+ has_ntlm = TRUE;
+#endif /* NTLM_ENABLE */
+
if (strstr(buffer, "CRAM-MD5"))
has_cram = TRUE;
}
}
+ done_capa = TRUE;
return(ok);
}
* we have a means of reliably tracking which mail we need to
* refetch should the connection abort in the middle.
* fetchall forces RETR, as does keep without UIDL */
- peek_capable = !ctl->fetchall && (!ctl->keep || ctl->server.uidl);
+ peek_capable = !ctl->fetchall;
}
static int pop3_getauth(int sock, struct query *ctl, char *greeting)
char *challenge;
#endif /* OPIE_ENABLE */
#ifdef SSL_ENABLE
- flag did_stls = FALSE;
+ flag connection_may_have_tls_errors = FALSE;
#endif /* SSL_ENABLE */
+ done_capa = FALSE;
#if defined(GSSAPI)
has_gssapi = FALSE;
#endif /* defined(GSSAPI) */
-#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
+#if defined(KERBEROS_V5)
has_kerberos = FALSE;
-#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
+#endif /* defined(KERBEROS_V5) */
has_cram = FALSE;
#ifdef OPIE_ENABLE
has_otp = FALSE;
#endif /* OPIE_ENABLE */
#ifdef SSL_ENABLE
- has_ssl = FALSE;
+ has_stls = FALSE;
#endif /* SSL_ENABLE */
/* Set this up before authentication quits early. */
set_peek_capable(ctl);
+
+ /* Hack: allow user to force RETR. */
+ if (peek_capable && getenv("FETCHMAIL_POP3_FORCE_RETR")) {
+ peek_capable = 0;
+ }
+
/*
* The "Maillennium POP3/PROXY server" deliberately truncates
* TOP replies after c. 64 or 80 kByte (we have varying reports), so
ctl->server.sdps = TRUE;
#endif /* SDPS_ENABLE */
-#ifdef NTLM_ENABLE
- /* MSN servers require the use of NTLM (MSN) authentication */
- if (!strcasecmp(ctl->server.pollname, "pop3.email.msn.com") ||
- ctl->server.authenticate == A_MSN)
- return (do_pop3_ntlm(sock, ctl, 1) == 0) ? PS_SUCCESS : PS_AUTHFAIL;
- if (ctl->server.authenticate == A_NTLM)
- return (do_pop3_ntlm(sock, ctl, 0) == 0) ? PS_SUCCESS : PS_AUTHFAIL;
-#else
- if (ctl->server.authenticate == A_NTLM || ctl->server.authenticate == A_MSN)
- {
- report(stderr,
- GT_("Required NTLM capability not compiled into fetchmail\n"));
- }
-#endif
-
- switch (ctl->server.protocol) {
+ switch (ctl->server.protocol) {
case P_POP3:
#ifdef RPA_ENABLE
/* XXX FIXME: AUTH probing (RFC1734) should become global */
/*
* CAPA command may return a list including available
- * authentication mechanisms. if it doesn't, no harm done, we
- * just fall back to a plain login. Note that this code
- * latches the server's authentication type, so that in daemon mode
- * the CAPA check only needs to be done once at start of run.
+ * authentication mechanisms and STLS capability.
+ *
+ * If it doesn't, no harm done, we just fall back to a plain
+ * login -- if the user allows it.
*
- * If CAPA fails, then force the authentication method to PASSORD
- * and repoll immediately.
+ * Note that this code latches the server's authentication type,
+ * so that in daemon mode the CAPA check only needs to be done
+ * once at start of run.
*
- * These authentication methods are blessed by RFC1734,
- * describing the POP3 AUTHentication command.
+ * If CAPA fails, then force the authentication method to
+ * PASSWORD, switch off opportunistic and repoll immediately.
+ * If TLS is mandatory, fail up front.
*/
if ((ctl->server.authenticate == A_ANY) ||
- (ctl->server.authenticate == A_GSSAPI) ||
- (ctl->server.authenticate == A_KERBEROS_V4) ||
- (ctl->server.authenticate == A_OTP) ||
- (ctl->server.authenticate == A_CRAM_MD5))
+ (ctl->server.authenticate == A_GSSAPI) ||
+ (ctl->server.authenticate == A_KERBEROS_V5) ||
+ (ctl->server.authenticate == A_OTP) ||
+ (ctl->server.authenticate == A_CRAM_MD5) ||
+ maybe_tls(ctl))
{
if ((ok = capa_probe(sock)) != PS_SUCCESS)
- /* we are in STAGE_GETAUTH! */
+ /* we are in STAGE_GETAUTH => failure is PS_AUTHFAIL! */
if (ok == PS_AUTHFAIL ||
/* Some servers directly close the socket. However, if we
* have already authenticated before, then a previous CAPA
*/
(ok == PS_SOCKET && !ctl->wehaveauthed))
{
- ctl->server.authenticate = A_PASSWORD;
- /* repoll immediately */
- ok = PS_REPOLL;
- break;
+#ifdef SSL_ENABLE
+ if (must_tls(ctl)) {
+ /* fail with mandatory STLS without repoll */
+ report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n"));
+ report(stderr, GT_("The CAPA command is however necessary for TLS.\n"));
+ return ok;
+ } else if (maybe_tls(ctl)) {
+ /* defeat opportunistic STLS */
+ xfree(ctl->sslproto);
+ ctl->sslproto = xstrdup("");
+ }
+#endif
+ /* If strong authentication was opportunistic, retry without, else fail. */
+ switch (ctl->server.authenticate) {
+ case A_ANY:
+ ctl->server.authenticate = A_PASSWORD;
+ /* FALLTHROUGH */
+ case A_PASSWORD: /* this should only happen with TLS enabled */
+ return PS_REPOLL;
+ default:
+ return PS_AUTHFAIL;
+ }
}
}
#ifdef SSL_ENABLE
- if (has_ssl
- && !ctl->use_ssl
- && (!ctl->sslproto || !strcmp(ctl->sslproto,"tls1")))
- {
- char *realhost;
+ if (maybe_tls(ctl)) {
+ char *commonname;
- realhost = ctl->server.via ? ctl->server.via : ctl->server.pollname;
- ok = gen_transact(sock, "STLS");
+ commonname = ctl->server.pollname;
+ if (ctl->server.via)
+ commonname = ctl->server.via;
+ if (ctl->sslcommonname)
+ commonname = ctl->sslcommonname;
- /* We use "tls1" instead of ctl->sslproto, as we want STLS,
- * not other SSL protocols
- */
- if (ok == PS_SUCCESS &&
- SSLOpen(sock,ctl->sslcert,ctl->sslkey,"tls1",ctl->sslcertck, ctl->sslcertpath,ctl->sslfingerprint,realhost,ctl->server.pollname) == -1)
+ if (has_stls
+ || must_tls(ctl)) /* if TLS is mandatory, ignore capabilities */
{
- if (!ctl->sslproto && !ctl->wehaveauthed)
+ /* Use "tls1" rather than ctl->sslproto because tls1 is the only
+ * protocol that will work with STARTTLS. Don't need to worry
+ * whether TLS is mandatory or opportunistic unless SSLOpen() fails
+ * (see below). */
+ if (gen_transact(sock, "STLS") == PS_SUCCESS
+ && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck,
+ ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname,
+ ctl->server.pollname, &ctl->remotename)) != -1)
{
- ctl->sslproto = xstrdup("");
- /* repoll immediately */
- return(PS_REPOLL);
+ /*
+ * RFC 2595 says this:
+ *
+ * "Once TLS has been started, the client MUST discard cached
+ * information about server capabilities and SHOULD re-issue the
+ * CAPABILITY command. This is necessary to protect against
+ * man-in-the-middle attacks which alter the capabilities list prior
+ * to STARTTLS. The server MAY advertise different capabilities
+ * after STARTTLS."
+ *
+ * Now that we're confident in our TLS connection we can
+ * guarantee a secure capability re-probe.
+ */
+ set_timeout(0);
+ done_capa = FALSE;
+ ok = capa_probe(sock);
+ if (ok != PS_SUCCESS) {
+ return ok;
+ }
+ if (outlevel >= O_VERBOSE)
+ {
+ report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname);
+ }
+ } else if (must_tls(ctl)) {
+ /* Config required TLS but we couldn't guarantee it, so we must
+ * stop. */
+ set_timeout(0);
+ report(stderr, GT_("%s: upgrade to TLS failed.\n"), commonname);
+ return PS_SOCKET;
+ } else {
+ /* We don't know whether the connection is usable, and there's
+ * no command we can reasonably issue to test it (NOOP isn't
+ * allowed til post-authentication), so leave it in an unknown
+ * state, mark it as such, and check more carefully if things
+ * go wrong when we try to authenticate. */
+ set_timeout(0);
+ connection_may_have_tls_errors = TRUE;
+ if (outlevel >= O_VERBOSE)
+ {
+ report(stdout, GT_("%s: opportunistic upgrade to TLS failed, trying to continue.\n"), commonname);
+ }
}
- report(stderr,
- GT_("SSL connection failed.\n"));
- return PS_SOCKET;
- }
- did_stls = TRUE;
-
- /*
- * RFC 2595 says this:
- *
- * "Once TLS has been started, the client MUST discard cached
- * information about server capabilities and SHOULD re-issue the
- * CAPABILITY command. This is necessary to protect against
- * man-in-the-middle attacks which alter the capabilities list prior
- * to STARTTLS. The server MAY advertise different capabilities
- * after STARTTLS."
- */
- capa_probe(sock);
- }
+ }
+ } /* maybe_tls() */
#endif /* SSL_ENABLE */
/*
* OK, we have an authentication type now.
*/
-#if defined(KERBEROS_V4)
- /*
- * Servers doing KPOP have to go through a dummy login sequence
- * rather than doing SASL.
- */
- if (has_kerberos &&
- ctl->server.service && (strcmp(ctl->server.service, KPOP_PORT)!=0)
- && (ctl->server.authenticate == A_KERBEROS_V4
- || ctl->server.authenticate == A_KERBEROS_V5
- || ctl->server.authenticate == A_ANY))
- {
- ok = do_rfc1731(sock, "AUTH", ctl->server.truename);
- if (ok == PS_SUCCESS || ctl->server.authenticate != A_ANY)
- break;
- }
-#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */
#if defined(GSSAPI)
if (has_gssapi &&
(ctl->server.authenticate == A_GSSAPI ||
- ctl->server.authenticate == A_ANY))
+ (ctl->server.authenticate == A_ANY
+ && check_gss_creds("pop", ctl->server.truename) == PS_SUCCESS)))
{
ok = do_gssauth(sock,"AUTH","pop",ctl->server.truename,ctl->remotename);
if (ok == PS_SUCCESS || ctl->server.authenticate != A_ANY)
}
#endif /* OPIE_ENABLE */
- if (ctl->server.authenticate == A_CRAM_MD5 ||
+#ifdef NTLM_ENABLE
+ /* MSN servers require the use of NTLM (MSN) authentication */
+ if (!strcasecmp(ctl->server.pollname, "pop3.email.msn.com") ||
+ ctl->server.authenticate == A_MSN)
+ return (do_pop3_ntlm(sock, ctl, 1) == 0) ? PS_SUCCESS : PS_AUTHFAIL;
+ if (ctl->server.authenticate == A_NTLM || (has_ntlm && ctl->server.authenticate == A_ANY)) {
+ ok = do_pop3_ntlm(sock, ctl, 0);
+ if (ok == 0 || ctl->server.authenticate != A_ANY)
+ break;
+ }
+#else
+ if (ctl->server.authenticate == A_NTLM || ctl->server.authenticate == A_MSN)
+ {
+ report(stderr,
+ GT_("Required NTLM capability not compiled into fetchmail\n"));
+ }
+#endif
+
+ if (ctl->server.authenticate == A_CRAM_MD5 ||
(has_cram && ctl->server.authenticate == A_ANY))
{
ok = do_cram_md5(sock, "AUTH", ctl, NULL);
}
#endif /* OPIE_ENABLE */
- strlcpy(shroud, ctl->password, sizeof(shroud));
- ok = gen_transact(sock, "PASS %s", ctl->password);
- shroud[0] = '\0';
-#ifdef SSL_ENABLE
- /* this is for servers which claim to support TLS, but actually
- * don't! */
- if (did_stls && ok == PS_SOCKET && !ctl->sslproto && !ctl->wehaveauthed)
+ /* KPOP uses out-of-band authentication and does not check what
+ * we send here, so send some random fixed string, to avoid
+ * users switching *to* KPOP accidentally revealing their
+ * password */
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_KERBEROS_V5)
+ && (ctl->server.service != NULL
+ && strcmp(ctl->server.service, KPOP_PORT) == 0))
{
- ctl->sslproto = xstrdup("");
- /* repoll immediately */
- ok = PS_REPOLL;
+ ok = gen_transact(sock, "PASS krb_ticket");
+ break;
}
-#endif
+
+ /* check if we are actually allowed to send the password */
+ if (ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_PASSWORD) {
+ strlcpy(shroud, ctl->password, sizeof(shroud));
+ ok = gen_transact(sock, "PASS %s", ctl->password);
+ } else {
+ report(stderr, GT_("We've run out of allowed authenticators and cannot continue.\n"));
+ ok = PS_AUTHFAIL;
+ }
+ memset(shroud, 0x55, sizeof(shroud));
+ shroud[0] = '\0';
break;
case P_APOP:
else
*++end = '\0';
+ /* SECURITY: 2007-03-17
+ * Strictly validating the presented challenge for RFC-822
+ * conformity (it must be a msg-id in terms of that standard) is
+ * supposed to make attacks against the MD5 implementation
+ * harder[1]
+ *
+ * [1] "Security vulnerability in APOP authentication",
+ * Gaëtan Leurent, fetchmail-devel, 2007-03-17 */
+ if (!rfc822_valid_msgid((unsigned char *)start)) {
+ report(stderr,
+ GT_("Invalid APOP timestamp.\n"));
+ return PS_AUTHFAIL;
+ }
+
/* copy timestamp and password into digestion buffer */
- msg = xmalloc((end-start+1) + strlen(ctl->password) + 1);
+ msg = (char *)xmalloc((end-start+1) + strlen(ctl->password) + 1);
strcpy(msg,start);
strcat(msg,ctl->password);
- strcpy(ctl->digest, MD5Digest((unsigned char *)msg));
+ strcpy((char *)ctl->digest, MD5Digest((unsigned char *)msg));
free(msg);
- ok = gen_transact(sock, "APOP %s %s", ctl->remotename, ctl->digest);
- break;
-
- case P_RPOP:
- if ((ok = gen_transact(sock,"USER %s", ctl->remotename)) == 0)
- ok = gen_transact(sock, "RPOP %s", ctl->password);
+ ok = gen_transact(sock, "APOP %s %s", ctl->remotename, (char *)ctl->digest);
break;
default:
ok = PS_ERROR;
}
+#ifdef SSL_ENABLE
+ /* this is for servers which claim to support TLS, but actually
+ * don't! */
+ if (connection_may_have_tls_errors
+ && (ok == PS_SOCKET || ok == PS_PROTOCOL))
+ {
+ xfree(ctl->sslproto);
+ ctl->sslproto = xstrdup("");
+ /* repoll immediately without TLS */
+ ok = PS_REPOLL;
+ }
+#endif
+
if (ok != 0)
{
/* maybe we detected a lock-busy condition? */
s[0] = '\0';
}
-/* XXX FIXME: using the Message-ID is unsafe, some messages (spam,
- * broken messages) do not have Message-ID headers, and messages without
- * those appear to break this code and cause fetchmail (at least version
- * 6.2.3) to not delete such messages properly after retrieval.
- * See Sourceforge Bug #780933.
- *
- * The other problem is that the TOP command itself is optional, too... */
-static int pop3_gettopid(int sock, int num , char *id, size_t idsize)
-{
- int ok;
- int got_it;
- char buf [POPBUFSIZE+1];
- snprintf(buf, sizeof(buf), "TOP %d 1", num);
- if ((ok = gen_transact(sock, buf )) != 0)
- return ok;
- got_it = 0;
- while ((ok = gen_recv(sock, buf, sizeof(buf))) == 0)
- {
- if (DOTLINE(buf))
- break;
- if (!got_it && 0 == strncasecmp("Message-Id:", buf, 11)) {
- char *p = buf + 11;
- got_it = 1;
- p += strspn(p, POSIX_space);
- strlcpy(id, p, idsize);
- trim(id);
- }
- }
- /* XXX FIXME: do not return success here if no Message-ID header was
- * found. */
- return 0;
-}
-
/** Parse the UID response (leading +OK must have been
* stripped off) in buf, store the number in gotnum, and store the ID
* into the caller-provided buffer "id" of size "idsize".
last_nr = count + 1;
while (first_nr < last_nr - 1)
{
- struct idlist *newl;
+ struct uid_db_record *rec;
try_nr = (first_nr + last_nr) / 2;
if ((ok = pop3_getuidl(sock, try_nr, id, sizeof(id))) != 0)
return ok;
- if ((newl = str_in_list(&ctl->oldsaved, id, FALSE)))
+ if ((rec = find_uid_by_id(&ctl->oldsaved, id)))
{
- flag mark = newl->val.status.mark;
+ flag mark = rec->status;
if (mark == UID_DELETED || mark == UID_EXPUNGED)
{
if (outlevel >= O_VERBOSE)
- report(stderr, GT_("id=%s (num=%d) was deleted, but is still present!\n"), id, try_nr);
+ report(stderr, GT_("id=%s (num=%u) was deleted, but is still present!\n"), id, try_nr);
/* just mark it as seen now! */
- newl->val.status.mark = mark = UID_SEEN;
+ rec->status = mark = UID_SEEN;
}
/* narrow the search region! */
first_nr = try_nr;
/* save the number */
- newl->val.status.num = try_nr;
+ set_uid_db_num(&ctl->oldsaved, rec, try_nr);
}
else
{
last_nr = try_nr;
/* save it */
- newl = save_str(&ctl->oldsaved, id, UID_UNSEEN);
- newl->val.status.num = try_nr;
+ rec = uid_db_insert(&ctl->oldsaved, id, UID_UNSEEN);
+ set_uid_db_num(&ctl->oldsaved, rec, try_nr);
}
}
if (outlevel >= O_DEBUG && last_nr <= count)
return 0;
}
-static int pop3_slowuidl( int sock, struct query *ctl, int *countp, int *newp)
-{
- /* XXX FIXME: this code is severely broken. A Cc:d mailing list
- * message will arrive twice with the same Message-ID, so this
- * slowuidl code will break. Same goes for messages without
- * Message-ID headers at all. This code would best be removed. */
- /* This approach tries to get the message headers from the
- * remote hosts and compares the message-id to the already known
- * ones:
- * + if the first message containes a new id, all messages on
- * the server will be new
- * + if the first is known, try to estimate the last known message
- * on the server and check. If this works you know the total number
- * of messages to get.
- * + Otherwise run a binary search to determine the last known message
- */
- int ok, nolinear = 0;
- int first_nr, list_len, try_id, try_nr, add_id;
- int num;
- char id [IDLEN+1];
-
- if ((ok = pop3_gettopid(sock, 1, id, sizeof(id))) != 0)
- return ok;
-
- if( ( first_nr = str_nr_in_list(&ctl->oldsaved, id) ) == -1 ) {
- /* the first message is unknown -> all messages are new */
- *newp = *countp;
- return 0;
- }
-
- /* check where we expect the latest known message */
- list_len = count_list( &ctl->oldsaved );
- try_id = list_len - first_nr; /* -1 + 1 */
- if( try_id > 1 ) {
- if( try_id <= *countp ) {
- if ((ok = pop3_gettopid(sock, try_id, id, sizeof(id))) != 0)
- return ok;
-
- try_nr = str_nr_last_in_list(&ctl->oldsaved, id);
- } else {
- try_id = *countp+1;
- try_nr = -1;
- }
- if( try_nr != list_len -1 ) {
- /* some messages inbetween have been deleted... */
- if( try_nr == -1 ) {
- nolinear = 1;
-
- for( add_id = 1<<30; add_id > try_id-1; add_id >>= 1 )
- ;
- for( ; add_id; add_id >>= 1 ) {
- if( try_nr == -1 ) {
- if( try_id - add_id <= 1 ) {
- continue;
- }
- try_id -= add_id;
- } else
- try_id += add_id;
-
- if ((ok = pop3_gettopid(sock, try_id, id, sizeof(id))) != 0)
- return ok;
- try_nr = str_nr_in_list(&ctl->oldsaved, id);
- }
- if( try_nr == -1 ) {
- try_id--;
- }
- } else {
- report(stderr,
- GT_("Messages inserted into list on server. Cannot handle this.\n"));
- return -1;
- }
- }
- }
- /* the first try_id messages are known -> copy them to the newsaved list */
- for( num = first_nr; num < list_len; num++ )
- {
- struct idlist *newl = save_str(&ctl->newsaved,
- str_from_nr_list(&ctl->oldsaved, num),
- UID_UNSEEN);
- newl->val.status.num = num - first_nr + 1;
- }
-
- if( nolinear ) {
- free_str_list(&ctl->oldsaved);
- ctl->oldsaved = 0;
- last = try_id;
- }
-
- *newp = *countp - try_id;
- return 0;
-}
-
static int pop3_getrange(int sock,
struct query *ctl,
const char *folder,
(void)folder;
/* Ensure that the new list is properly empty */
- ctl->newsaved = (struct idlist *)NULL;
+ clear_uid_db(&ctl->newsaved);
#ifdef MBOX
/* Alain Knaff suggests this, but it's not RFC standard */
/* get the total message count */
gen_send(sock, "STAT");
ok = pop3_ok(sock, buf);
- if (ok == 0)
- sscanf(buf,"%d %d", countp, bytes);
- else
+ if (ok == 0) {
+ int asgn;
+
+ asgn = sscanf(buf,"%d %d", countp, bytes);
+ if (asgn != 2)
+ return PS_PROTOCOL;
+ } else
return(ok);
- /*
- * Newer, RFC-1725/1939-conformant POP servers may not have the LAST
- * command. We work as hard as possible to hide this, but it makes
- * counting new messages intrinsically quadratic in the worst case.
- */
+ /* unless fetching all mail, get UID list (UIDL) */
last = 0;
*newp = -1;
- /* if there are messages, and UIDL is desired, use UIDL
- * also use UIDL if fetchall is unset */
- if (*countp > 0 && (!ctl->fetchall || ctl->server.uidl))
+ if (*countp > 0)
{
int fastuidl;
char id [IDLEN+1];
+ set_uid_db_num_pos_0(&ctl->oldsaved, *countp);
+ set_uid_db_num_pos_0(&ctl->newsaved, *countp);
+
/* should we do fast uidl this time? */
fastuidl = ctl->fastuidl;
if (*countp > 7 && /* linear search is better if there are few mails! */
else
dofastuidl = 0;
- if (!ctl->server.uidl) {
- gen_send(sock, "LAST");
- ok = pop3_ok(sock, buf);
- } else
- ok = 1;
-
- if (ok == 0)
- {
- /* scan LAST reply */
- if (sscanf(buf, "%d", &last) == 0)
- {
- report(stderr, GT_("protocol error\n"));
- return(PS_ERROR);
- }
- *newp = (*countp - last);
- }
- else
{
/* do UIDL */
if (dofastuidl)
return(pop3_fastuidl( sock, ctl, *countp, newp));
/* grab the mailbox's UID list */
- if ((ok = gen_transact(sock, "UIDL")) != 0)
+ if (gen_transact(sock, "UIDL") != 0)
{
- /* don't worry, yet! do it the slow way */
- if ((ok = pop3_slowuidl(sock, ctl, countp, newp)))
- {
+ if (!ctl->fetchall) {
report(stderr, GT_("protocol error while fetching UIDLs\n"));
return(PS_ERROR);
}
unsigned long unum;
*newp = 0;
- while ((ok = gen_recv(sock, buf, sizeof(buf))) == PS_SUCCESS)
+ while (gen_recv(sock, buf, sizeof(buf)) == PS_SUCCESS)
{
if (DOTLINE(buf))
break;
if (parseuid(buf, &unum, id, sizeof(id)) == PS_SUCCESS)
{
- struct idlist *old, *newl;
+ struct uid_db_record *old_rec, *new_rec;
- newl = save_str(&ctl->newsaved, id, UID_UNSEEN);
- newl->val.status.num = unum;
+ new_rec = uid_db_insert(&ctl->newsaved, id, UID_UNSEEN);
- if ((old = str_in_list(&ctl->oldsaved, id, FALSE)))
+ if ((old_rec = find_uid_by_id(&ctl->oldsaved, id)))
{
- flag mark = old->val.status.mark;
+ flag mark = old_rec->status;
if (mark == UID_DELETED || mark == UID_EXPUNGED)
{
/* XXX FIXME: switch 3 occurrences from
if (outlevel >= O_VERBOSE)
report(stderr, GT_("id=%s (num=%d) was deleted, but is still present!\n"), id, (int)unum);
/* just mark it as seen now! */
- old->val.status.mark = mark = UID_SEEN;
+ old_rec->status = mark = UID_SEEN;
}
- newl->val.status.mark = mark;
+ new_rec->status = mark;
if (mark == UID_UNSEEN)
{
(*newp)++;
* swap the lists (say, due to socket error),
* the same mail will not be downloaded again.
*/
- old = save_str(&ctl->oldsaved, id, UID_UNSEEN);
- old->val.status.num = unum;
+ old_rec = uid_db_insert(&ctl->oldsaved, id, UID_UNSEEN);
+
+ }
+ /*
+ * save the number if it will be needed later on
+ * (messsage will either be fetched or deleted)
+ */
+ if (new_rec->status == UID_UNSEEN || ctl->flush) {
+ set_uid_db_num(&ctl->oldsaved, old_rec, unum);
+ set_uid_db_num(&ctl->newsaved, new_rec, unum);
}
} else
return PS_ERROR;
static int pop3_is_old(int sock, struct query *ctl, int num)
/* is the given message old? */
{
- struct idlist *newl;
- if (!ctl->oldsaved)
+ struct uid_db_record *rec;
+
+ if (!uid_db_n_records(&ctl->oldsaved))
return (num <= last);
else if (dofastuidl)
{
return(TRUE);
/* in fast uidl, we manipulate the old list only! */
-
- if ((newl = id_find(&ctl->oldsaved, num)))
+ if ((rec = find_uid_by_num(&ctl->oldsaved, num)))
{
/* we already have the id! */
- return(newl->val.status.mark != UID_UNSEEN);
+ return(rec->status != UID_UNSEEN);
}
/* get the uidl first! */
if (pop3_getuidl(sock, num, id, sizeof(id)) != PS_SUCCESS)
return(TRUE);
- if ((newl = str_in_list(&ctl->oldsaved, id, FALSE))) {
+ if ((rec = find_uid_by_id(&ctl->oldsaved, id))) {
/* we already have the id! */
- newl->val.status.num = num;
- return(newl->val.status.mark != UID_UNSEEN);
+ set_uid_db_num(&ctl->oldsaved, rec, num);
+ return(rec->status != UID_UNSEEN);
}
/* save it */
- newl = save_str(&ctl->oldsaved, id, UID_UNSEEN);
- newl->val.status.num = num;
+ rec = uid_db_insert(&ctl->oldsaved, id, UID_UNSEEN);
+ set_uid_db_num(&ctl->oldsaved, rec, num);
+
return(FALSE);
+ } else {
+ rec = find_uid_by_num(&ctl->newsaved, num);
+ return !rec || rec->status != UID_UNSEEN;
}
- else
- return ((newl = id_find(&ctl->newsaved, num)) != NULL &&
- newl->val.status.mark != UID_UNSEEN);
}
-#ifdef UNUSED
-/*
- * We could use this to fetch headers only as we do for IMAP. The trouble
- * is that there's no way to fetch the body only. So the following RETR
- * would have to re-fetch the header. Enough messages have longer headers
- * than bodies to make this a net loss.
- */
-static int pop_fetch_headers(int sock, struct query *ctl,int number,int *lenp)
-/* request headers of nth message */
-{
- int ok;
- char buf[POPBUFSIZE+1];
-
- gen_send(sock, "TOP %d 0", number);
- if ((ok = pop3_ok(sock, buf)) != 0)
- return(ok);
-
- *lenp = -1; /* we got sizes from the LIST response */
-
- return(PS_SUCCESS);
-}
-#endif /* UNUSED */
-
static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
/* request nth message */
{
* as a workaround. */
if (strspn(buf, " \t") == strlen(buf))
strcpy(buf, "<>");
- sdps_envfrom = xmalloc(strlen(buf)+1);
+ sdps_envfrom = (char *)xmalloc(strlen(buf)+1);
strcpy(sdps_envfrom,buf);
break;
case 5:
/* Wrap address with To: <> so nxtaddr() likes it */
- sdps_envto = xmalloc(strlen(buf)+7);
+ sdps_envto = (char *)xmalloc(strlen(buf)+7);
sprintf(sdps_envto,"To: <%s>",buf);
break;
}
static void mark_uid_seen(struct query *ctl, int number)
/* Tell the UID code we've seen this. */
{
- struct idlist *sdp;
+ struct uid_db_record *rec;
- if ((sdp = id_find(&ctl->newsaved, number)))
- sdp->val.status.mark = UID_SEEN;
+ if ((rec = find_uid_by_num(&ctl->newsaved, number)))
+ rec->status = UID_SEEN;
/* mark it as seen in oldsaved also! In case, we do not swap the lists
* (say, due to socket error), the same mail will not be downloaded
* again.
*/
- if ((sdp = id_find(&ctl->oldsaved, number)))
- sdp->val.status.mark = UID_SEEN;
+ if ((rec = find_uid_by_num(&ctl->oldsaved, number)))
+ rec->status = UID_SEEN;
}
static int pop3_delete(int sock, struct query *ctl, int number)
/* delete a given message */
{
+ struct uid_db_record *rec;
int ok;
mark_uid_seen(ctl, number);
/* actually, mark for deletion -- doesn't happen until QUIT time */
ok = gen_transact(sock, "DELE %d", number);
if (ok != PS_SUCCESS)
return(ok);
- delete_str(dofastuidl ? &ctl->oldsaved : &ctl->newsaved, number);
+
+ rec = find_uid_by_num(dofastuidl ? &ctl->oldsaved : &ctl->newsaved, number);
+ rec->status = UID_DELETED;
return(PS_SUCCESS);
}
{
int ok;
-#ifdef __UNUSED__
- /*
- * We used to do this in case the server marks messages deleted when seen.
- * (Yes, this has been reported, in the MercuryP/NLM server.
- * It's even legal under RFC 1939 (section 8) as a site policy.)
- * It interacted badly with UIDL, though. Thomas Zajic wrote:
- * "Running 'fetchmail -F -v' and checking the logs, I found out
- * that fetchmail did in fact flush my mailbox properly, but sent
- * a RSET just before sending QUIT to log off. This caused the
- * POP3 server to undo/forget about the previous DELEs, resetting
- * my mailbox to its original (ie. unflushed) state. The
- * ~/.fetchids file did get flushed though, so the next time
- * fetchmail was run it saw all the old messages as new ones ..."
- */
- if (ctl->keep)
- gen_transact(sock, "RSET");
-#endif /* __UNUSED__ */
-
ok = gen_transact(sock, "QUIT");
if (!ok)
expunge_uids(ctl);