-/* Copyright 1993-95 by Carl Harris, Jr. Copyright 1996 by Eric S. Raymond
- * All rights reserved.
+/*
+ * pop3.c -- POP3 protocol methods
+ *
* For license terms, see the file COPYING in this directory.
*/
-/***********************************************************************
- module: pop3.c
- project: fetchmail
- programmer: Carl Harris, ceharris@mal.com
- Hacks and bug fixes by esr.
- description: POP3 client code.
-
- ***********************************************************************/
-
#include <config.h>
+
#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 "socket.h"
#include "fetchmail.h"
+#include "socket.h"
+
+#define PROTOCOL_ERROR {error(0, 0, "protocol error"); return(PS_ERROR);}
static int last;
-int pop3_ok (socket, argbuf)
+int pop3_ok (FILE *sockfp, char *argbuf)
/* parse command response */
-int socket;
-char *argbuf;
{
- int ok;
- char buf [POPBUFSIZE+1];
- char *bufp;
-
- if (SockGets(socket, buf, sizeof(buf)) >= 0) {
- if (outlevel == O_VERBOSE)
- fprintf(stderr,"%s\n",buf);
-
- bufp = buf;
- if (*bufp == '+' || *bufp == '-')
- bufp++;
- else
- return(PS_PROTOCOL);
-
- while (isalpha(*bufp))
- bufp++;
- *(bufp++) = '\0';
-
- if (strcmp(buf,"+OK") == 0)
- ok = 0;
- else if (strcmp(buf,"-ERR") == 0)
- ok = PS_ERROR;
- else
- ok = PS_PROTOCOL;
-
- if (argbuf != NULL)
- strcpy(argbuf,bufp);
- }
- else
- ok = PS_SOCKET;
+ 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);
+
+ bufp = buf;
+ if (*bufp == '+' || *bufp == '-')
+ bufp++;
+ else
+ return(PS_PROTOCOL);
+
+ while (isalpha(*bufp))
+ bufp++;
+ *(bufp++) = '\0';
+
+ if (strcmp(buf,"+OK") == 0)
+ ok = 0;
+ else if (strcmp(buf,"-ERR") == 0)
+ ok = PS_ERROR;
+ else
+ ok = PS_PROTOCOL;
+
+ if (argbuf != NULL)
+ strcpy(argbuf,bufp);
+ }
+ else
+ ok = PS_SOCKET;
- return(ok);
+ return(ok);
}
-int pop3_getauth(socket, queryctl, greeting)
+int pop3_getauth(FILE *sockfp, struct query *ctl, char *greeting)
/* apply for connection authorization */
-int socket;
-struct hostrec *queryctl;
-char *greeting;
{
- char buf [POPBUFSIZE+1];
-
/* build MD5 digest from greeting timestamp + password */
- if (queryctl->protocol == P_APOP)
+ if (ctl->protocol == P_APOP)
{
char *start,*end;
char *msg;
for (start = greeting; *start != 0 && *start != '<'; start++)
continue;
if (*start == 0) {
- fprintf(stderr,"Required APOP timestamp not found in greeting\n");
+ error(0, 0, "Required APOP timestamp not found in greeting");
return(PS_AUTHFAIL);
}
/* find end of timestamp */
for (end = start; *end != 0 && *end != '>'; end++)
continue;
- if (*end == 0 || (end - start - 1) == 1) {
- fprintf(stderr,"Timestamp syntax error in greeting\n");
+ if (*end == 0 || end == start + 1) {
+ error(0, 0, "Timestamp syntax error in greeting");
return(PS_AUTHFAIL);
}
+ else
+ *++end = '\0';
/* copy timestamp and password into digestion buffer */
- msg = (char *)xmalloc((end-start-1) + strlen(queryctl->password) + 1);
- *(++end) = 0;
+ msg = (char *)xmalloc((end-start+1) + strlen(ctl->password) + 1);
strcpy(msg,start);
- strcat(msg,queryctl->password);
+ strcat(msg,ctl->password);
- strcpy(queryctl->digest, MD5Digest(msg));
+ strcpy(ctl->digest, MD5Digest(msg));
free(msg);
}
- switch (queryctl->protocol) {
- case P_KPOP:
-#ifndef KERBEROS_V4
- strcat (buf, "KPOP support not compiled into this executable.\n");
- return(PS_ERROR);
-#endif
- /* fall through */
-
+ switch (ctl->protocol) {
case P_POP3:
- if ((gen_transact(socket,"USER %s", queryctl->remotename)) != 0)
- return(PS_ERROR);
+ if ((gen_transact(sockfp,"USER %s", ctl->remotename)) != 0)
+ PROTOCOL_ERROR
- if ((gen_transact(socket, "PASS %s", queryctl->password)) != 0)
- return(PS_ERROR);
+ if ((gen_transact(sockfp, "PASS %s", ctl->password)) != 0)
+ PROTOCOL_ERROR
break;
case P_APOP:
- if ((gen_transact(socket, "APOP %s %s",
- queryctl->remotename, queryctl->digest)) != 0)
- return(PS_ERROR);
+ if ((gen_transact(sockfp, "APOP %s %s",
+ ctl->remotename, ctl->digest)) != 0)
+ PROTOCOL_ERROR
break;
default:
- fprintf(stderr,"Undefined protocol request in POP3_auth\n");
+ error(0, 0, "Undefined protocol request in POP3_auth");
}
/* we're approved */
return(0);
}
-static pop3_getrange(socket, queryctl, countp)
+static int pop3_getrange(FILE *sockfp, struct query *ctl, int*countp, int*newp)
/* get range of messages to be fetched */
-int socket;
-struct hostrec *queryctl;
-int *countp;
{
int ok;
char buf [POPBUFSIZE+1];
+ /* Ensure that the new list is properly empty */
+ ctl->newsaved = (struct idlist *)NULL;
+
/* get the total message count */
- gen_send(socket, "STAT");
- ok = pop3_ok(socket, buf);
+ gen_send(sockfp, "STAT");
+ ok = pop3_ok(sockfp, buf);
if (ok == 0)
sscanf(buf,"%d %*d", countp);
else
/*
* Newer, RFC-1725-conformant POP servers may not have the LAST command.
+ * We work as hard as possible to hide this ugliness, but it makes
+ * counting new messages intrinsically quadratic in the worst case.
*/
last = 0;
- if (*countp > 0 && !queryctl->fetchall)
+ *newp = -1;
+ if (*countp > 0 && !ctl->fetchall)
{
char id [IDLEN+1];
- gen_send(socket,"LAST");
- ok = pop3_ok(socket, buf);
- if (ok == 0 && sscanf(buf, "%d", &last) == 0)
- return(PS_ERROR);
+ gen_send(sockfp,"LAST");
+ ok = pop3_ok(sockfp, buf);
+ if (ok == 0)
+ {
+ if (sscanf(buf, "%d", &last) == 0)
+ PROTOCOL_ERROR
+ *newp = (*countp - last);
+ }
+ else
+ {
+ /* grab the mailbox's UID list */
+ if ((ok = gen_transact(sockfp, "UIDL")) != 0)
+ PROTOCOL_ERROR
+ else
+ {
+ int num;
+
+ *newp = 0;
+ while (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 (buf[0] == '.')
+ break;
+ else if (sscanf(buf, "%d %s", &num, id) == 2)
+ {
+ save_str(&ctl->newsaved, num, id);
+
+ /* note: ID comparison is caseblind */
+ if (!str_in_list(&ctl->oldsaved, id))
+ (*newp)++;
+ }
+ }
+ }
+ }
}
return(0);
}
-static int pop3_is_old(socket, queryctl, num)
-int socket;
-struct hostrec *queryctl;
-int num;
+static int pop3_getsizes(FILE *sockfp, int count, int *sizes)
+/* capture the sizes of all messages */
+{
+ int ok;
+
+ if ((ok = gen_transact(sockfp, "LIST")) != 0)
+ return(ok);
+ else
+ {
+ char buf [POPBUFSIZE+1];
+
+ while (SockGets(buf, sizeof(buf), sockfp))
+ {
+ 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] = size;
+ else
+ sizes[num - 1] = -1;
+ }
+
+ return(0);
+ }
+}
+
+static int pop3_is_old(FILE *sockfp, struct query *ctl, int num)
+/* is the given message old? */
{
- return (num <= last);
+ if (!ctl->oldsaved)
+ return (num <= last);
+ else
+ /* note: ID comparison is caseblind */
+ return (str_in_list(&ctl->oldsaved,
+ str_find (&ctl->newsaved, num)));
}
-static int pop3_fetch(socket, number, lenp)
+static int pop3_fetch(FILE *sockfp, int number, int *lenp)
/* request nth message */
-int socket;
-int number;
-int *lenp;
{
int ok;
- char buf [POPBUFSIZE+1];
+ char buf [POPBUFSIZE+1], *cp;
- gen_send(socket, "RETR %d", number);
- if ((ok = pop3_ok(socket, buf)) != 0)
+ gen_send(sockfp, "RETR %d", number);
+ if ((ok = pop3_ok(sockfp, buf)) != 0)
return(ok);
- *lenp = atoi(buf);
+ /* look for "nnn octets" -- there may or may not be preceding cruft */
+ if ((cp = strstr(buf, " octets")) == (char *)NULL)
+ *lenp = 0;
+ else
+ {
+ while (--cp > buf && isdigit(*cp))
+ continue;
+ *lenp = atoi(cp);
+ }
return(0);
}
-static pop3_delete(socket, queryctl, number)
+static int pop3_delete(FILE *sockfp, struct query *ctl, int number)
/* delete a given message */
-int socket;
-struct hostrec *queryctl;
-int number;
{
- return(gen_transact(socket, "DELE %d", number));
+ return(gen_transact(sockfp, "DELE %d", number));
}
const static struct method pop3 =
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 message trailer */
"QUIT", /* the POP3 exit command */
};
-int doPOP3 (queryctl)
+int doPOP3 (struct query *ctl)
/* retrieve messages using POP3 */
-struct hostrec *queryctl;
{
- if (queryctl->mailbox[0]) {
+ if (ctl->mailbox[0]) {
fprintf(stderr,"Option --remote is not supported with POP3\n");
return(PS_SYNTAX);
}
- if (queryctl->protocol == P_KPOP)
- {
- struct method kpop_method = pop3;
- kpop_method.port = 1109;
- return(do_protocol(queryctl, &kpop_method));
- }
- return(do_protocol(queryctl, &pop3));
+ peek_capable = FALSE;
+ return(do_protocol(ctl, &pop3));
}
-
+/* pop3.c ends here */
projects / ~andy / fetchmail / blobdiff