#include <ctype.h>
#if defined(STDC_HEADERS)
#include <stdlib.h>
+#include <limits.h>
#endif
#include "fetchmail.h"
#include "socket.h"
-#ifdef KERBEROS_V4
-#ifdef KERBEROS_V5
-#include <kerberosIV/des.h>
-#include <kerberosIV/krb.h>
-#else
-#if defined (__bsdi__)
-#include <des.h>
-#define krb_get_err_text(e) (krb_err_txt[e])
-#endif
-#if defined(__NetBSD__) || (__FreeBSD__) || defined(__linux__)
-#define krb_get_err_text(e) (krb_err_txt[e])
-#endif
-#include <krb.h>
-#endif
-#endif /* KERBEROS_V4 */
-
-#ifdef GSSAPI
-#ifdef HAVE_GSSAPI_H
-#include <gssapi.h>
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#endif
-#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#endif
-#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#endif
-#endif
-
#include "i18n.h"
#if OPIE_ENABLE
-#include <opie.h>
#endif /* OPIE_ENABLE */
#ifndef strstr /* glibc-2.1 declares this as a macro */
#define IMAP4 0 /* IMAP4 rev 0, RFC1730 */
#define IMAP4rev1 1 /* IMAP4 rev 1, RFC2060 */
-static int count, unseen, deletions, imap_version, preauth;
-static int expunged, expunge_period, saved_timeout;
+static int count = 0, recentcount = 0, unseen = 0, deletions = 0;
+static int expunged, expunge_period, saved_timeout = 0;
+static int imap_version, preauth;
static flag do_idle;
static char capabilities[MSGBUFSIZE+1];
static unsigned int *unseen_messages;
-int imap_ok(int sock, char *argbuf)
+static int imap_ok(int sock, char *argbuf)
/* parse command response */
{
char buf[MSGBUFSIZE+1];
else if (strstr(buf, "EXISTS"))
{
count = atoi(buf+2);
+ /*
+ * Don't trust the message count passed by the server.
+ * Without this check, it might be possible to do a
+ * DNS-spoofing attack that would pass back a ridiculous
+ * count, and allocate a malloc area that would overlap
+ * a portion of the stack.
+ */
+ if (count > INT_MAX/sizeof(int))
+ {
+ report(stderr, "bogus message count!");
+ return(PS_PROTOCOL);
+ }
+
/*
* Nasty kluge to handle RFC2177 IDLE. If we know we're idling
* we can't wait for the tag matching the IDLE; we have to tell the
stage = STAGE_FETCH;
}
}
+ else if (strstr(buf, "RECENT"))
+ {
+ recentcount = atoi(buf+2);
+ }
else if (strstr(buf, "PREAUTH"))
preauth = TRUE;
+ /*
+ * The server may decide to make the mailbox read-only,
+ * which causes fetchmail to go into a endless loop
+ * fetching the same message over and over again.
+ *
+ * However, for check_only, we use EXAMINE which will
+ * mark the mailbox read-only as per the RFC.
+ *
+ * This checks for the condition and aborts if
+ * the mailbox is read-only.
+ *
+ * See RFC 2060 section 6.3.1 (SELECT).
+ * See RFC 2060 section 6.3.2 (EXAMINE).
+ */
+ else if (!check_only && strstr(buf, "[READ-ONLY]"))
+ return(PS_LOCKBUSY);
} while
(tag[0] != '\0' && strncmp(buf, tag, strlen(tag)));
}
}
-#if OPIE_ENABLE
-static int do_otp(int sock, struct query *ctl)
-{
- int i, rval;
- char buffer[128];
- char challenge[OPIE_CHALLENGE_MAX+1];
- char response[OPIE_RESPONSE_MAX+1];
-
- gen_send(sock, "AUTHENTICATE X-OTP");
-
- if (rval = gen_recv(sock, buffer, sizeof(buffer)))
- return rval;
-
- if ((i = from64tobits(challenge, buffer)) < 0) {
- report(stderr, _("Could not decode initial BASE64 challenge\n"));
- return PS_AUTHFAIL;
- };
-
-
- to64frombits(buffer, ctl->remotename, strlen(ctl->remotename));
-
- if (outlevel >= O_MONITOR)
- report(stdout, "IMAP> %s\n", buffer);
-
- /* best not to count on the challenge code handling multiple writes */
- strcat(buffer, "\r\n");
- SockWrite(sock, buffer, strlen(buffer));
-
- if (rval = gen_recv(sock, buffer, sizeof(buffer)))
- return rval;
-
- if ((i = from64tobits(challenge, buffer)) < 0) {
- report(stderr, _("Could not decode OTP challenge\n"));
- return PS_AUTHFAIL;
- };
-
- rval = opiegenerator(challenge, !strcmp(ctl->password, "opie") ? "" : ctl->password, response);
- if ((rval == -2) && !run.poll_interval) {
- char secret[OPIE_SECRET_MAX+1];
- fprintf(stderr, _("Secret pass phrase: "));
- if (opiereadpass(secret, sizeof(secret), 0))
- rval = opiegenerator(challenge, secret, response);
- memset(secret, 0, sizeof(secret));
- };
-
- if (rval)
- return(PS_AUTHFAIL);
-
- to64frombits(buffer, response, strlen(response));
-
- if (outlevel >= O_MONITOR)
- report(stdout, "IMAP> %s\n", buffer);
- strcat(buffer, "\r\n");
- SockWrite(sock, buffer, strlen(buffer));
-
- if (rval = gen_recv(sock, buffer, sizeof(buffer)))
- return rval;
-
- if (strstr(buffer, "OK"))
- return PS_SUCCESS;
- else
- return PS_AUTHFAIL;
-};
-#endif /* OPIE_ENABLE */
-
-#ifdef KERBEROS_V4
-#if SIZEOF_INT == 4
-typedef int int32;
-#elif SIZEOF_SHORT == 4
-typedef short int32;
-#elif SIZEOF_LONG == 4
-typedef long int32;
-#else
-#error Cannot deduce a 32-bit-type
-#endif
-
-static int do_rfc1731(int sock, char *truename)
-/* authenticate as per RFC1731 -- note 32-bit integer requirement here */
-{
- int result = 0, len;
- char buf1[4096], buf2[4096];
- union {
- int32 cint;
- char cstr[4];
- } challenge1, challenge2;
- char srvinst[INST_SZ];
- char *p;
- char srvrealm[REALM_SZ];
- KTEXT_ST authenticator;
- CREDENTIALS credentials;
- char tktuser[MAX_K_NAME_SZ+1+INST_SZ+1+REALM_SZ+1];
- char tktinst[INST_SZ];
- char tktrealm[REALM_SZ];
- des_cblock session;
- des_key_schedule schedule;
-
- gen_send(sock, "AUTHENTICATE KERBEROS_V4");
-
- /* The data encoded in the first ready response contains a random
- * 32-bit number in network byte order. The client should respond
- * with a Kerberos ticket and an authenticator for the principal
- * "imap.hostname@realm", where "hostname" is the first component
- * of the host name of the server with all letters in lower case
- * and where "realm" is the Kerberos realm of the server. The
- * encrypted checksum field included within the Kerberos
- * authenticator should contain the server provided 32-bit number
- * in network byte order.
- */
-
- if (result = gen_recv(sock, buf1, sizeof buf1)) {
- return result;
- }
-
- len = from64tobits(challenge1.cstr, buf1);
- if (len < 0) {
- report(stderr, _("could not decode initial BASE64 challenge\n"));
- return PS_AUTHFAIL;
- }
-
- /* this patch by Dan Root <dar@thekeep.org> solves an endianess
- * problem. */
- {
- char tmp[4];
-
- *(int *)tmp = ntohl(*(int *) challenge1.cstr);
- memcpy(challenge1.cstr, tmp, sizeof(tmp));
- }
-
- /* Client responds with a Kerberos ticket and an authenticator for
- * the principal "imap.hostname@realm" where "hostname" is the
- * first component of the host name of the server with all letters
- * in lower case and where "realm" is the Kerberos realm of the
- * server. The encrypted checksum field included within the
- * Kerberos authenticator should contain the server-provided
- * 32-bit number in network byte order.
- */
-
- strncpy(srvinst, truename, (sizeof srvinst)-1);
- srvinst[(sizeof srvinst)-1] = '\0';
- for (p = srvinst; *p; p++) {
- if (isupper(*p)) {
- *p = tolower(*p);
- }
- }
-
- strncpy(srvrealm, (char *)krb_realmofhost(srvinst), (sizeof srvrealm)-1);
- srvrealm[(sizeof srvrealm)-1] = '\0';
- if (p = strchr(srvinst, '.')) {
- *p = '\0';
- }
-
- result = krb_mk_req(&authenticator, "imap", srvinst, srvrealm, 0);
- if (result) {
- report(stderr, "krb_mq_req: %s\n", krb_get_err_text(result));
- return PS_AUTHFAIL;
- }
-
- result = krb_get_cred("imap", srvinst, srvrealm, &credentials);
- if (result) {
- report(stderr, "krb_get_cred: %s\n", krb_get_err_text(result));
- return PS_AUTHFAIL;
- }
-
- memcpy(session, credentials.session, sizeof session);
- memset(&credentials, 0, sizeof credentials);
- des_key_sched(session, schedule);
-
- result = krb_get_tf_fullname(TKT_FILE, tktuser, tktinst, tktrealm);
- if (result) {
- report(stderr, "krb_get_tf_fullname: %s\n", krb_get_err_text(result));
- return PS_AUTHFAIL;
- }
-
-#ifdef __UNUSED__
- /*
- * Andrew H. Chatham <andrew.chatham@duke.edu> alleges that this check
- * is not necessary and has consistently been messing him up.
- */
- if (strcmp(tktuser, user) != 0) {
- report(stderr,
- _("principal %s in ticket does not match -u %s\n"), tktuser,
- user);
- return PS_AUTHFAIL;
- }
-#endif /* __UNUSED__ */
-
- if (tktinst[0]) {
- report(stderr,
- _("non-null instance (%s) might cause strange behavior\n"),
- tktinst);
- strcat(tktuser, ".");
- strcat(tktuser, tktinst);
- }
-
- if (strcmp(tktrealm, srvrealm) != 0) {
- strcat(tktuser, "@");
- strcat(tktuser, tktrealm);
- }
-
- result = krb_mk_req(&authenticator, "imap", srvinst, srvrealm,
- challenge1.cint);
- if (result) {
- report(stderr, "krb_mq_req: %s\n", krb_get_err_text(result));
- return PS_AUTHFAIL;
- }
-
- to64frombits(buf1, authenticator.dat, authenticator.length);
- if (outlevel >= O_MONITOR) {
- report(stdout, "IMAP> %s\n", buf1);
- }
- strcat(buf1, "\r\n");
- SockWrite(sock, buf1, strlen(buf1));
-
- /* Upon decrypting and verifying the ticket and authenticator, the
- * server should verify that the contained checksum field equals
- * the original server provided random 32-bit number. Should the
- * verification be successful, the server must add one to the
- * checksum and construct 8 octets of data, with the first four
- * octets containing the incremented checksum in network byte
- * order, the fifth octet containing a bit-mask specifying the
- * protection mechanisms supported by the server, and the sixth
- * through eighth octets containing, in network byte order, the
- * maximum cipher-text buffer size the server is able to receive.
- * The server must encrypt the 8 octets of data in the session key
- * and issue that encrypted data in a second ready response. The
- * client should consider the server authenticated if the first
- * four octets the un-encrypted data is equal to one plus the
- * checksum it previously sent.
- */
-
- if (result = gen_recv(sock, buf1, sizeof buf1))
- return result;
-
- /* The client must construct data with the first four octets
- * containing the original server-issued checksum in network byte
- * order, the fifth octet containing the bit-mask specifying the
- * selected protection mechanism, the sixth through eighth octets
- * containing in network byte order the maximum cipher-text buffer
- * size the client is able to receive, and the following octets
- * containing a user name string. The client must then append
- * from one to eight octets so that the length of the data is a
- * multiple of eight octets. The client must then PCBC encrypt the
- * data with the session key and respond to the second ready
- * response with the encrypted data. The server decrypts the data
- * and verifies the contained checksum. The username field
- * identifies the user for whom subsequent IMAP operations are to
- * be performed; the server must verify that the principal
- * identified in the Kerberos ticket is authorized to connect as
- * that user. After these verifications, the authentication
- * process is complete.
- */
-
- len = from64tobits(buf2, buf1);
- if (len < 0) {
- report(stderr, _("could not decode BASE64 ready response\n"));
- return PS_AUTHFAIL;
- }
-
- des_ecb_encrypt((des_cblock *)buf2, (des_cblock *)buf2, schedule, 0);
- memcpy(challenge2.cstr, buf2, 4);
- if (ntohl(challenge2.cint) != challenge1.cint + 1) {
- report(stderr, _("challenge mismatch\n"));
- return PS_AUTHFAIL;
- }
-
- memset(authenticator.dat, 0, sizeof authenticator.dat);
-
- result = htonl(challenge1.cint);
- memcpy(authenticator.dat, &result, sizeof result);
-
- /* The protection mechanisms and their corresponding bit-masks are as
- * follows:
- *
- * 1 No protection mechanism
- * 2 Integrity (krb_mk_safe) protection
- * 4 Privacy (krb_mk_priv) protection
- */
- authenticator.dat[4] = 1;
-
- len = strlen(tktuser);
- strncpy(authenticator.dat+8, tktuser, len);
- authenticator.length = len + 8 + 1;
- while (authenticator.length & 7) {
- authenticator.length++;
- }
- des_pcbc_encrypt((des_cblock *)authenticator.dat,
- (des_cblock *)authenticator.dat, authenticator.length, schedule,
- &session, 1);
-
- to64frombits(buf1, authenticator.dat, authenticator.length);
- if (outlevel >= O_MONITOR) {
- report(stdout, "IMAP> %s\n", buf1);
- }
-
- strcat(buf1, "\r\n");
- SockWrite(sock, buf1, strlen(buf1));
-
- if (result = gen_recv(sock, buf1, sizeof buf1))
- return result;
-
- if (strstr(buf1, "OK")) {
- return PS_SUCCESS;
- }
- else {
- return PS_AUTHFAIL;
- }
-}
-#endif /* KERBEROS_V4 */
-
-#ifdef GSSAPI
-#define GSSAUTH_P_NONE 1
-#define GSSAUTH_P_INTEGRITY 2
-#define GSSAUTH_P_PRIVACY 4
-
-static int do_gssauth(int sock, char *hostname, char *username)
-{
- gss_buffer_desc request_buf, send_token;
- gss_buffer_t sec_token;
- gss_name_t target_name;
- gss_ctx_id_t context;
- gss_OID mech_name;
- gss_qop_t quality;
- int cflags;
- OM_uint32 maj_stat, min_stat;
- char buf1[8192], buf2[8192], server_conf_flags;
- unsigned long buf_size;
- int result;
-
- /* first things first: get an imap ticket for host */
- sprintf(buf1, "imap@%s", hostname);
- request_buf.value = buf1;
- request_buf.length = strlen(buf1) + 1;
- maj_stat = gss_import_name(&min_stat, &request_buf, GSS_C_NT_HOSTBASED_SERVICE,
- &target_name);
- if (maj_stat != GSS_S_COMPLETE) {
- report(stderr, _("Couldn't get service name for [%s]\n"), buf1);
- return PS_AUTHFAIL;
- }
- else if (outlevel >= O_DEBUG) {
- maj_stat = gss_display_name(&min_stat, target_name, &request_buf,
- &mech_name);
- report(stderr, _("Using service name [%s]\n"),request_buf.value);
- maj_stat = gss_release_buffer(&min_stat, &request_buf);
- }
-
- gen_send(sock, "AUTHENTICATE GSSAPI");
-
- /* upon receipt of the GSSAPI authentication request, server returns
- * null data ready response. */
- if (result = gen_recv(sock, buf1, sizeof buf1)) {
- return result;
- }
-
- /* now start the security context initialisation loop... */
- sec_token = GSS_C_NO_BUFFER;
- context = GSS_C_NO_CONTEXT;
- if (outlevel >= O_VERBOSE)
- report(stdout, _("Sending credentials\n"));
- do {
- send_token.length = 0;
- send_token.value = NULL;
- maj_stat = gss_init_sec_context(&min_stat,
- GSS_C_NO_CREDENTIAL,
- &context,
- target_name,
- GSS_C_NO_OID,
- GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG,
- 0,
- GSS_C_NO_CHANNEL_BINDINGS,
- sec_token,
- NULL,
- &send_token,
- NULL,
- NULL);
- if (maj_stat!=GSS_S_COMPLETE && maj_stat!=GSS_S_CONTINUE_NEEDED) {
- report(stderr, _("Error exchanging credentials\n"));
- gss_release_name(&min_stat, &target_name);
- /* wake up server and await NO response */
- SockWrite(sock, "\r\n", 2);
- if (result = gen_recv(sock, buf1, sizeof buf1))
- return result;
- return PS_AUTHFAIL;
- }
- to64frombits(buf1, send_token.value, send_token.length);
- gss_release_buffer(&min_stat, &send_token);
- strcat(buf1, "\r\n");
- SockWrite(sock, buf1, strlen(buf1));
- if (outlevel >= O_MONITOR)
- report(stdout, "IMAP> %s\n", buf1);
- if (maj_stat == GSS_S_CONTINUE_NEEDED) {
- if (result = gen_recv(sock, buf1, sizeof buf1)) {
- gss_release_name(&min_stat, &target_name);
- return result;
- }
- request_buf.length = from64tobits(buf2, buf1 + 2);
- request_buf.value = buf2;
- sec_token = &request_buf;
- }
- } while (maj_stat == GSS_S_CONTINUE_NEEDED);
- gss_release_name(&min_stat, &target_name);
-
- /* get security flags and buffer size */
- if (result = gen_recv(sock, buf1, sizeof buf1)) {
- return result;
- }
- request_buf.length = from64tobits(buf2, buf1 + 2);
- request_buf.value = buf2;
-
- maj_stat = gss_unwrap(&min_stat, context, &request_buf, &send_token,
- &cflags, &quality);
- if (maj_stat != GSS_S_COMPLETE) {
- report(stderr, _("Couldn't unwrap security level data\n"));
- gss_release_buffer(&min_stat, &send_token);
- return PS_AUTHFAIL;
- }
- if (outlevel >= O_DEBUG)
- report(stdout, _("Credential exchange complete\n"));
- /* first octet is security levels supported. We want none, for now */
- server_conf_flags = ((char *)send_token.value)[0];
- if ( !(((char *)send_token.value)[0] & GSSAUTH_P_NONE) ) {
- report(stderr, _("Server requires integrity and/or privacy\n"));
- gss_release_buffer(&min_stat, &send_token);
- return PS_AUTHFAIL;
- }
- ((char *)send_token.value)[0] = 0;
- buf_size = ntohl(*((long *)send_token.value));
- /* we don't care about buffer size if we don't wrap data */
- gss_release_buffer(&min_stat, &send_token);
- if (outlevel >= O_DEBUG) {
- report(stdout, _("Unwrapped security level flags: %s%s%s\n"),
- server_conf_flags & GSSAUTH_P_NONE ? "N" : "-",
- server_conf_flags & GSSAUTH_P_INTEGRITY ? "I" : "-",
- server_conf_flags & GSSAUTH_P_PRIVACY ? "C" : "-");
- report(stdout, _("Maximum GSS token size is %ld\n"),buf_size);
- }
-
- /* now respond in kind (hack!!!) */
- buf_size = htonl(buf_size); /* do as they do... only matters if we do enc */
- memcpy(buf1, &buf_size, 4);
- buf1[0] = GSSAUTH_P_NONE;
- strcpy(buf1+4, username); /* server decides if princ is user */
- request_buf.length = 4 + strlen(username) + 1;
- request_buf.value = buf1;
- maj_stat = gss_wrap(&min_stat, context, 0, GSS_C_QOP_DEFAULT, &request_buf,
- &cflags, &send_token);
- if (maj_stat != GSS_S_COMPLETE) {
- report(stderr, _("Error creating security level request\n"));
- return PS_AUTHFAIL;
- }
- to64frombits(buf1, send_token.value, send_token.length);
- if (outlevel >= O_DEBUG) {
- report(stdout, _("Requesting authorization as %s\n"), username);
- report(stdout, "IMAP> %s\n",buf1);
- }
- strcat(buf1, "\r\n");
- SockWrite(sock, buf1, strlen(buf1));
-
- /* we should be done. Get status and finish up */
- do {
- if (result = gen_recv(sock, buf1, sizeof buf1))
- return result;
- } while(strncmp(buf1, tag, strlen(tag)) != 0);
- if (strstr(buf1, "OK")) {
- /* flush security context */
- if (outlevel >= O_DEBUG)
- report(stdout, _("Releasing GSS credentials\n"));
- maj_stat = gss_delete_sec_context(&min_stat, &context, &send_token);
- if (maj_stat != GSS_S_COMPLETE) {
- report(stderr, _("Error releasing credentials\n"));
- return PS_AUTHFAIL;
- }
- /* send_token may contain a notification to the server to flush
- * credentials. RFC 1731 doesn't specify what to do, and since this
- * support is only for authentication, we'll assume the server
- * knows enough to flush its own credentials */
- gss_release_buffer(&min_stat, &send_token);
- return PS_SUCCESS;
- }
-
- return PS_AUTHFAIL;
-}
-#endif /* GSSAPI */
-
#if NTLM_ENABLE
#include "ntlm.h"
if ((gen_recv(sock, msgbuf, sizeof msgbuf)))
return result;
- len = from64tobits ((unsigned char*)&challenge, msgbuf);
+ len = from64tobits ((unsigned char*)&challenge, msgbuf, sizeof(msgbuf));
if (outlevel >= O_DEBUG)
dumpSmbNtlmAuthChallenge(stdout, &challenge);
report(stdout, "IMAP> %s\n", msgbuf);
strcat(msgbuf,"\r\n");
-
SockWrite (sock, msgbuf, strlen (msgbuf));
if ((result = gen_recv (sock, msgbuf, sizeof msgbuf)))
}
#endif /* NTLM */
-int imap_canonicalize(char *result, char *raw, int maxlen)
+static int imap_canonicalize(char *result, char *raw, int maxlen)
/* encode an IMAP password as per RFC1730's quoting conventions */
{
int i, j;
return(i);
}
-int imap_getauth(int sock, struct query *ctl, char *greeting)
+static int imap_getauth(int sock, struct query *ctl, char *greeting)
/* apply for connection authorization */
{
int ok = 0;
capabilities[0] = '\0';
if ((ok = gen_transact(sock, "CAPABILITY")) == PS_SUCCESS)
{
- /* UW-IMAP server 10.173 notifies in all caps */
+ char *cp;
+
+ /* capability checks are supposed to be caseblind */
+ for (cp = capabilities; *cp; cp++)
+ *cp = toupper(*cp);
+
+ /* UW-IMAP server 10.173 notifies in all caps, but RFC2060 says we
+ should expect a response in mixed-case */
if (strstr(capabilities, "IMAP4REV1"))
{
imap_version = IMAP4rev1;
if (outlevel >= O_DEBUG)
- report(stdout, _("Protocol identified as IMAP4 rev 1\n"));
+ report(stdout, GT_("Protocol identified as IMAP4 rev 1\n"));
}
else
{
imap_version = IMAP4;
if (outlevel >= O_DEBUG)
- report(stdout, _("Protocol identified as IMAP4 rev 0\n"));
+ report(stdout, GT_("Protocol identified as IMAP4 rev 0\n"));
}
}
else if (ok == PS_ERROR)
{
imap_version = IMAP2;
if (outlevel >= O_DEBUG)
- report(stdout, _("Protocol identified as IMAP2 or IMAP2BIS\n"));
+ report(stdout, GT_("Protocol identified as IMAP2 or IMAP2BIS\n"));
}
else
return(ok);
{
do_idle = TRUE;
if (outlevel >= O_VERBOSE)
- report(stdout, _("will idle after poll\n"));
+ report(stdout, GT_("will idle after poll\n"));
}
/*
* If either (a) we saw a PREAUTH token in the greeting, or
* (b) the user specified ssh preauthentication, then we're done.
*/
- if (preauth || ctl->server.preauthenticate == A_SSH)
+ if (preauth || ctl->server.authenticate == A_SSH)
{
preauth = FALSE; /* reset for the next session */
return(PS_SUCCESS);
}
-#if OPIE_ENABLE
- if ((ctl->server.protocol == P_IMAP) && strstr(capabilities, "AUTH=X-OTP"))
- {
- if (outlevel >= O_DEBUG)
- report(stdout, _("OTP authentication is supported\n"));
- if (do_otp(sock, ctl) == PS_SUCCESS)
- return(PS_SUCCESS);
- };
-#endif /* OPIE_ENABLE */
+ /*
+ * Time to authenticate the user.
+ * Try the protocol variants that don't require passwords first.
+ */
+ ok = PS_AUTHFAIL;
#ifdef GSSAPI
- if (strstr(capabilities, "AUTH=GSSAPI"))
- {
- if (ctl->server.protocol == P_IMAP_GSS)
- {
- if (outlevel >= O_DEBUG)
- report(stdout, _("GSS authentication is supported\n"));
- return do_gssauth(sock, ctl->server.truename, ctl->remotename);
- }
- }
- else if (ctl->server.protocol == P_IMAP_GSS)
- {
- report(stderr,
- _("Required GSS capability not supported by server\n"));
- return(PS_AUTHFAIL);
- }
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_GSSAPI)
+ && strstr(capabilities, "AUTH=GSSAPI"))
+ if(ok = do_gssauth(sock, "AUTHENTICATE", ctl->server.truename, ctl->remotename))
+ {
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
+ }
+ else
+ return ok;
#endif /* GSSAPI */
#ifdef KERBEROS_V4
- if (strstr(capabilities, "AUTH=KERBEROS_V4"))
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_KERBEROS_V4
+ || ctl->server.authenticate == A_KERBEROS_V5)
+ && strstr(capabilities, "AUTH=KERBEROS_V4"))
{
- if (outlevel >= O_DEBUG)
- report(stdout, _("KERBEROS_V4 authentication is supported\n"));
-
- if (ctl->server.protocol == P_IMAP_K4)
+ if ((ok = do_rfc1731(sock, "AUTHENTICATE", ctl->server.truename)))
{
- if ((ok = do_rfc1731(sock, ctl->server.truename)))
- /* SASL cancellation of authentication */
- gen_send(sock, "*");
-
- return(ok);
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
}
- /* else fall through to ordinary AUTH=LOGIN case */
- }
- else if (ctl->server.protocol == P_IMAP_K4)
- {
- report(stderr,
- _("Required KERBEROS_V4 capability not supported by server\n"));
- return(PS_AUTHFAIL);
+ else
+ return ok;
}
#endif /* KERBEROS_V4 */
- if (strstr(capabilities, "AUTH=CRAM-MD5"))
+ /*
+ * No such luck. OK, now try the variants that mask your password
+ * in a challenge-response.
+ */
+
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_CRAM_MD5)
+ && strstr(capabilities, "AUTH=CRAM-MD5"))
{
- if (outlevel >= O_DEBUG)
- report (stdout, _("CRAM-MD5 authentication is supported\n"));
- if (ctl->server.protocol != P_IMAP_LOGIN)
- {
- if ((ok = do_cram_md5 (sock, ctl)))
- /* SASL cancellation of authentication */
- gen_send(sock, "*");
-
- return(ok);
- }
+ if ((ok = do_cram_md5 (sock, "AUTHENTICATE", ctl, NULL)))
+ {
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
+ }
+ else
+ return ok;
}
- else if (ctl->server.protocol == P_IMAP_CRAM_MD5)
+
+#if OPIE_ENABLE
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_OTP)
+ && strstr(capabilities, "AUTH=X-OTP"))
+ if ((ok = do_otp(sock, "AUTHENTICATE", ctl)))
+ {
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
+ }
+ else
+ return ok;
+#else
+ if (ctl->server.authenticate == A_OTP)
{
- report(stderr,
- _("Required CRAM-MD5 capability not supported by server\n"));
- return(PS_AUTHFAIL);
+ report(stderr,
+ GT_("Required OTP capability not compiled into fetchmail\n"));
}
+#endif /* OPIE_ENABLE */
#ifdef NTLM_ENABLE
- if (strstr (capabilities, "AUTH=NTLM"))
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_NTLM)
+ && strstr (capabilities, "AUTH=NTLM")) {
+ if ((ok = do_imap_ntlm(sock, ctl)))
+ {
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
+ }
+ else
+ return(ok);
+ }
+#else
+ if (ctl->server.authenticate == A_NTLM)
{
- if (outlevel >= O_DEBUG)
- report (stdout, _("NTLM authentication is supported\n"));
- return do_imap_ntlm (sock, ctl);
+ report(stderr,
+ GT_("Required NTLM capability not compiled into fetchmail\n"));
}
#endif /* NTLM_ENABLE */
#ifdef __UNUSED__ /* The Cyrus IMAP4rev1 server chokes on this */
/* this handles either AUTH=LOGIN or AUTH-LOGIN */
- if ((imap_version >= IMAP4rev1) && (!strstr(capabilities, "LOGIN"))) {
- report(stderr,
- _("Required LOGIN capability not supported by server\n"));
- return PS_AUTHFAIL;
- };
+ if ((imap_version >= IMAP4rev1) && (!strstr(capabilities, "LOGIN")))
+ {
+ report(stderr,
+ GT_("Required LOGIN capability not supported by server\n"));
+ }
#endif /* __UNUSED__ */
+ /* we're stuck with sending the password en clair */
+ if ((ctl->server.authenticate == A_ANY
+ || ctl->server.authenticate == A_PASSWORD)
+ && !strstr (capabilities, "LOGINDISABLED"))
{
/* these sizes guarantee no buffer overflow */
char remotename[NAMELEN*2+1], password[PASSWORDLEN*2+1];
imap_canonicalize(remotename, ctl->remotename, NAMELEN);
imap_canonicalize(password, ctl->password, PASSWORDLEN);
+
+ strcpy(shroud, password);
ok = gen_transact(sock, "LOGIN \"%s\" \"%s\"", remotename, password);
+ shroud[0] = '\0';
+ if (ok)
+ {
+ /* SASL cancellation of authentication */
+ gen_send(sock, "*");
+ if(ctl->server.authenticate != A_ANY)
+ return ok;
+ }
+ else
+ return(ok);
}
- if (ok)
- return(ok);
-
- return(PS_SUCCESS);
+ return(ok);
}
static int internal_expunge(int sock)
* just after deletion.
*/
ok = 0;
- if (deletions && expunge_period != 1)
+ if (deletions) {
ok = internal_expunge(sock);
- count = -1;
- if (do_idle)
- ok = imap_idle(sock);
- if (ok || gen_transact(sock, "NOOP"))
- {
- report(stderr, _("re-poll failed\n"));
- return(ok);
+ if (ok)
+ {
+ report(stderr, GT_("expunge failed\n"));
+ return(ok);
+ }
}
- else if (count == -1) /* no EXISTS response to NOOP/IDLE */
- {
- count = 0;
+
+ /*
+ * recentcount is already set here by the last imap command which
+ * returned RECENT on detecting new mail. if recentcount is 0, wait
+ * for new mail.
+ */
+
+ /* this is a while loop because imap_idle() might return on other
+ * mailbox changes also */
+ while (recentcount == 0 && do_idle) {
+ smtp_close(ctl, 1);
+ ok = imap_idle(sock);
+ if (ok)
+ {
+ report(stderr, GT_("re-poll failed\n"));
+ return(ok);
+ }
}
+ /* if recentcount is 0, return no mail */
+ if (recentcount == 0)
+ count = 0;
if (outlevel >= O_DEBUG)
- report(stdout, _("%d messages waiting after re-poll\n"), count);
+ report(stdout, GT_("%d messages waiting after re-poll\n"), count);
}
else
{
+ count = 0;
ok = gen_transact(sock,
check_only ? "EXAMINE \"%s\"" : "SELECT \"%s\"",
folder ? folder : "INBOX");
if (ok != 0)
{
- report(stderr, _("mailbox selection failed\n"));
+ report(stderr, GT_("mailbox selection failed\n"));
return(ok);
}
else if (outlevel >= O_DEBUG)
- report(stdout, _("%d messages waiting after first poll\n"), count);
+ report(stdout, GT_("%d messages waiting after first poll\n"), count);
/* no messages? then we may need to idle until we get some */
- if (count == 0 && do_idle)
- imap_idle(sock);
+ while (count == 0 && do_idle) {
+ ok = imap_idle(sock);
+ if (ok)
+ {
+ report(stderr, GT_("re-poll failed\n"));
+ return(ok);
+ }
+ }
+
+ /*
+ * We should have an expunge here to
+ * a) avoid fetching deleted mails during 'fetchall'
+ * b) getting a wrong count of mails during 'no fetchall'
+ */
+ if (!check_only && !ctl->keep && count > 0)
+ {
+ ok = internal_expunge(sock);
+ if (ok)
+ {
+ report(stderr, GT_("expunge failed\n"));
+ return(ok);
+ }
+ if (outlevel >= O_DEBUG)
+ report(stdout, GT_("%d messages waiting after expunge\n"), count);
+ }
}
*countp = count;
+ recentcount = 0;
/* OK, now get a count of unseen messages and their indices */
if (!ctl->fetchall && count > 0)
ok = gen_recv(sock, buf, sizeof(buf));
if (ok != 0)
{
- report(stderr, _("search for unseen messages failed\n"));
+ report(stderr, GT_("search for unseen messages failed\n"));
return(PS_PROTOCOL);
}
else if ((cp = strstr(buf, "* SEARCH")))
if (outlevel >= O_DEBUG)
report(stdout,
- _("%u is unseen\n"),
+ GT_("%u is unseen\n"),
unseen_messages[unseen]);
unseen++;
}
} while
(tag[0] != '\0' && strncmp(buf, tag, strlen(tag)));
- }
+ } else
+ unseen = -1;
*newp = unseen;
+ count = 0;
expunged = 0;
+ deletions = 0;
return(PS_SUCCESS);
}
* known-bad size value.
*/
if (count == 1)
- gen_send(sock, "FETCH 1 RFC822.SIZE", count);
+ gen_send(sock, "FETCH 1 RFC822.SIZE");
else
gen_send(sock, "FETCH 1:%d RFC822.SIZE", count);
for (;;)
{
- int num, size, ok;
+ unsigned int num, size;
+ int ok;
if ((ok = gen_recv(sock, buf, sizeof(buf))))
return(ok);
else if (strstr(buf, "OK") || strstr(buf, "NO"))
break;
- else if (sscanf(buf, "* %d FETCH (RFC822.SIZE %d)", &num, &size) == 2)
- sizes[num - 1] = size;
+ else if (sscanf(buf, "* %u FETCH (RFC822.SIZE %u)", &num, &size) == 2) {
+ if (num > 0 && num <= count)
+ sizes[num - 1] = size;
+ else
+ report(stderr, "Warning: ignoring bogus data for message sizes returned by the server.\n");
+ }
}
return(PS_SUCCESS);
return(seen);
}
+static char *skip_token(char *ptr)
+{
+ while(isspace(*ptr)) ptr++;
+ while(!isspace(*ptr) && !iscntrl(*ptr)) ptr++;
+ while(isspace(*ptr)) ptr++;
+ return(ptr);
+}
+
static int imap_fetch_headers(int sock, struct query *ctl,int number,int *lenp)
/* request headers of nth message */
{
gen_send(sock, "FETCH %d RFC822.HEADER", number);
/* looking for FETCH response */
- do {
+ for (;;)
+ {
int ok;
+ char *ptr;
if ((ok = gen_recv(sock, buf, sizeof(buf))))
return(ok);
- } while
- (sscanf(buf+2, "%d FETCH (%*s {%d}", &num, lenp) != 2);
+ ptr = skip_token(buf); /* either "* " or "AXXXX " */
+ if (sscanf(ptr, "%d FETCH (%*s {%d}", &num, lenp) == 2)
+ break;
+ /* try to recover from chronically fucked-up M$ Exchange servers */
+ else if (!strncmp(ptr, "NO", 2))
+ return(PS_TRANSIENT);
+ else if (!strncmp(ptr, "BAD", 3))
+ return(PS_TRANSIENT);
+ }
if (num != number)
return(PS_ERROR);
TRUE, /* this is a tagged protocol */
FALSE, /* no message delimiter */
imap_ok, /* parse command response */
- imap_canonicalize, /* deal with embedded slashes and spaces */
imap_getauth, /* get authorization */
imap_getrange, /* query range of messages */
imap_getsizes, /* get sizes of messages (used for ESMTP SIZE option) */
projects / ~andy / fetchmail / blobdiff