* For license terms, see the file COPYING in this directory.
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <string.h>
#include "fetchmail.h"
#include "socket.h"
+#if HAVE_LIBOPIE
+#include <opie.h>
+#endif /* HAVE_LIBOPIE */
+
#define PROTOCOL_ERROR {error(0, 0, "protocol error"); return(PS_ERROR);}
+#define LOCKBUSY_ERROR {error(0, 0, "lock busy! Is another session active?"); return(PS_LOCKBUSY);}
+
extern char *strstr(); /* needed on sysV68 R3V7.1. */
static int last;
-int pop3_ok (FILE *sockfp, char *argbuf)
+#if HAVE_LIBOPIE
+static char lastok[POPBUFSIZE+1];
+#endif /* HAVE_LIBOPIE */
+
+int pop3_ok (int sock, char *argbuf)
/* parse command response */
{
int ok;
char buf [POPBUFSIZE+1];
char *bufp;
- if (SockGets(buf, sizeof(buf), sockfp)) {
- if (buf[strlen(buf)-1] == '\n')
- buf[strlen(buf)-1] = '\0';
- if (buf[strlen(buf)-1] == '\r')
- buf[strlen(buf)-1] = '\r';
- if (outlevel == O_VERBOSE)
- error(0, 0, "POP3< %s", buf);
-
+ if ((ok = gen_recv(sock, buf, sizeof(buf))) == 0)
+ {
bufp = buf;
if (*bufp == '+' || *bufp == '-')
bufp++;
*(bufp++) = '\0';
if (strcmp(buf,"+OK") == 0)
+ {
+#if HAVE_LIBOPIE
+ strcpy(lastok, bufp);
+#endif /* HAVE_LIBOPIE */
ok = 0;
+ }
else if (strcmp(buf,"-ERR") == 0)
- ok = PS_ERROR;
+ {
+ /*
+ * We're checking for "lock busy", "unable to lock",
+ * "already locked" etc. here. This indicates that we
+ * have to wait for the server to clean up before we
+ * can poll again.
+ *
+ * PS_LOCKBUSY check empirically verified with two recent
+ * versions the Berkeley popper; QPOP (version 2.2) and
+ * QUALCOMM Pop server derived from UCB (version 2.1.4-R3)
+ */
+ if (strstr(bufp,"lock")||strstr(bufp,"Lock")||strstr(bufp,"LOCK"))
+ ok = PS_LOCKBUSY;
+ else
+ ok = PS_ERROR;
+ }
else
ok = PS_PROTOCOL;
if (argbuf != NULL)
strcpy(argbuf,bufp);
}
- else
- ok = PS_SOCKET;
return(ok);
}
-int pop3_getauth(FILE *sockfp, struct query *ctl, char *greeting)
+int pop3_getauth(int sock, struct query *ctl, char *greeting)
/* apply for connection authorization */
{
+ int ok;
+#if HAVE_LIBOPIE
+ char *challenge;
+#endif /* HAVE_LIBOPIE */
+
/* build MD5 digest from greeting timestamp + password */
if (ctl->server.protocol == P_APOP)
{
for (start = greeting; *start != 0 && *start != '<'; start++)
continue;
if (*start == 0) {
- error(0, 0, "Required APOP timestamp not found in greeting");
+ error(0, -1, "Required APOP timestamp not found in greeting");
return(PS_AUTHFAIL);
}
for (end = start; *end != 0 && *end != '>'; end++)
continue;
if (*end == 0 || end == start + 1) {
- error(0, 0, "Timestamp syntax error in greeting");
+ error(0, -1, "Timestamp syntax error in greeting");
return(PS_AUTHFAIL);
}
else
switch (ctl->server.protocol) {
case P_POP3:
- if ((gen_transact(sockfp,"USER %s", ctl->remotename)) != 0)
+ if ((gen_transact(sock, "USER %s", ctl->remotename)) != 0)
PROTOCOL_ERROR
- if ((gen_transact(sockfp, "PASS %s", ctl->password)) != 0)
+#if defined(HAVE_LIBOPIE) && defined(OPIE_ENABLE)
+ /* see RFC1938: A One-Time Password System */
+ if (challenge = strstr(lastok, "otp-"))
+ {
+ char response[OPIE_RESPONSE_MAX+1];
+
+ /*
+ * Special case in case we're running Craig Metz's
+ * OPIE daemon. Code in opiegenerator() will detect this.
+ */
+ if (ctl->password && !strcmp(ctl->password, "opie"))
+ {
+ if (ok = opiegenerator(challenge, "", response))
+ if (ok != 2)
+ PROTOCOL_ERROR
+ }
+ else if (opiegenerator(challenge, ctl->password, response))
+ PROTOCOL_ERROR
+
+ ok = gen_transact(sock, "PASS %s", response);
+ }
+ else
+#endif /* defined(HAVE_LIBOPIE) && defined(OPIE_ENABLE) */
+ /* ordinary validation, no one-time password */
+ ok = gen_transact(sock, "PASS %s", ctl->password);
+
+ if (ok != 0)
+ {
+ if (ok == PS_LOCKBUSY)
+ LOCKBUSY_ERROR
PROTOCOL_ERROR
+ }
+
+ /*
+ * Empirical experience shows some server/OS combinations
+ * may need a brief pause even after any lockfiles on the
+ * server are released, to give the server time to finish
+ * copying back very large mailfolders from the temp-file...
+ * this is only ever an issue with extremely large mailboxes.
+ */
+ sleep(3); /* to be _really_ safe, probably need sleep(5)! */
break;
case P_APOP:
- if ((gen_transact(sockfp, "APOP %s %s",
+ if ((gen_transact(sock, "APOP %s %s",
ctl->remotename, ctl->digest)) != 0)
PROTOCOL_ERROR
break;
+ case P_RPOP:
+ if ((gen_transact(sock,"USER %s", ctl->remotename)) != 0)
+ PROTOCOL_ERROR
+
+ if ((gen_transact(sock, "RPOP %s", ctl->password)) != 0)
+ PROTOCOL_ERROR
+ break;
+
default:
error(0, 0, "Undefined protocol request in POP3_auth");
}
return(0);
}
-static int pop3_getrange(FILE *sockfp, struct query *ctl, int*countp, int*newp)
+static int pop3_getrange(int sock,
+ struct query *ctl,
+ const char *folder,
+ int *countp, int *newp)
/* get range of messages to be fetched */
{
int ok;
ctl->newsaved = (struct idlist *)NULL;
/* get the total message count */
- gen_send(sockfp, "STAT");
- ok = pop3_ok(sockfp, buf);
+ gen_send(sock, "STAT");
+ ok = pop3_ok(sock, buf);
if (ok == 0)
sscanf(buf,"%d %*d", countp);
else
{
char id [IDLEN+1];
- gen_send(sockfp,"LAST");
- ok = pop3_ok(sockfp, buf);
+ if (!ctl->server.uidl) {
+ gen_send(sock, "LAST");
+ ok = pop3_ok(sock, buf);
+ } else
+ ok = 1;
if (ok == 0)
{
if (sscanf(buf, "%d", &last) == 0)
else
{
/* grab the mailbox's UID list */
- if ((ok = gen_transact(sockfp, "UIDL")) != 0)
+ if ((ok = gen_transact(sock, "UIDL")) != 0)
PROTOCOL_ERROR
else
{
int num;
*newp = 0;
- while (SockGets(buf, sizeof(buf), sockfp))
+ while ((ok = gen_recv(sock, buf, sizeof(buf))) == 0)
{
- if (buf[strlen(buf)-1] == '\n')
- buf[strlen(buf)-1] = '\0';
- if (buf[strlen(buf)-1] == '\r')
- buf[strlen(buf)-1] = '\r';
- if (outlevel == O_VERBOSE)
- error(0, 0, "POP3< %s", buf);
if (buf[0] == '.')
break;
else if (sscanf(buf, "%d %s", &num, id) == 2)
return(0);
}
-static int pop3_getsizes(FILE *sockfp, int count, int *sizes)
+static int pop3_getsizes(int sock, int count, int *sizes)
/* capture the sizes of all messages */
{
int ok;
- if ((ok = gen_transact(sockfp, "LIST")) != 0)
+ if ((ok = gen_transact(sock, "LIST")) != 0)
return(ok);
else
{
char buf [POPBUFSIZE+1];
- while (SockGets(buf, sizeof(buf), sockfp))
+ while ((ok = gen_recv(sock, buf, sizeof(buf))) == 0)
{
int num, size;
- if (buf[strlen(buf)-1] == '\n')
- buf[strlen(buf)-1] = '\0';
- if (buf[strlen(buf)-1] == '\r')
- buf[strlen(buf)-1] = '\r';
- if (outlevel == O_VERBOSE)
- error(0, 0, "POP3< %s", buf);
if (buf[0] == '.')
break;
else if (sscanf(buf, "%d %d", &num, &size) == 2)
sizes[num - 1] = -1;
}
- return(0);
+ return(ok);
}
}
-static int pop3_is_old(FILE *sockfp, struct query *ctl, int num)
+static int pop3_is_old(int sock, struct query *ctl, int num)
/* is the given message old? */
{
if (!ctl->oldsaved)
str_find (&ctl->newsaved, num)));
}
-static int pop3_fetch(FILE *sockfp, struct query *ctl, int number, int *lenp)
+static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
/* request nth message */
{
int ok;
char buf [POPBUFSIZE+1], *cp;
- gen_send(sockfp, "RETR %d", number);
- if ((ok = pop3_ok(sockfp, buf)) != 0)
+ gen_send(sock, "RETR %d", number);
+ if ((ok = pop3_ok(sock, buf)) != 0)
return(ok);
- /* look for "nnn octets" -- there may or may not be preceding cruft */
+
+ /*
+ * Look for "nnn octets" -- there may or may not be preceding cruft.
+ * It's OK to punt and pass back -1 as a failure indication here, as
+ * long as the force_getsizes flag has forced sizes to be preloaded.
+ */
if ((cp = strstr(buf, " octets")) == (char *)NULL)
- *lenp = 0;
+ *lenp = -1;
else
{
- while (--cp > buf && isdigit(*cp))
+ while (--cp >= buf && isdigit(*cp))
continue;
- *lenp = atoi(cp);
+ *lenp = atoi(++cp);
}
+
return(0);
}
-static int pop3_delete(FILE *sockfp, struct query *ctl, int number)
+static int pop3_delete(int sock, struct query *ctl, int number)
/* delete a given message */
{
- return(gen_transact(sockfp, "DELE %d", number));
+ return(gen_transact(sock, "DELE %d", number));
}
const static struct method pop3 =
{
"POP3", /* Post Office Protocol v3 */
110, /* standard POP3 port */
- 0, /* this is not a tagged protocol */
- 1, /* this uses a message delimiter */
+ FALSE, /* this is not a tagged protocol */
+ TRUE, /* this uses a message delimiter */
+ TRUE, /* RFC 1725 doesn't require a size field in fetch */
pop3_ok, /* parse command response */
pop3_getauth, /* get authorization */
pop3_getrange, /* query range of messages */
pop3_getsizes, /* we can get a list of sizes */
pop3_is_old, /* how do we tell a message is old? */
pop3_fetch, /* request given message */
+ NULL, /* no way to fetch body alone */
NULL, /* no message trailer */
pop3_delete, /* how to delete a message */
"QUIT", /* the POP3 exit command */
int doPOP3 (struct query *ctl)
/* retrieve messages using POP3 */
{
- if (ctl->mailbox) {
+ if (ctl->mailboxes->id) {
fprintf(stderr,"Option --remote is not supported with POP3\n");
return(PS_SYNTAX);
}
projects / ~andy / fetchmail / blobdiff