X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpopsbr.c;h=2d03efdc1a4bda5106354fc04251d863dcee66d6;hp=d1bbafcfde0feeae7d2985a5d3f34dd09db0d5d5;hb=05b7f957ba42e79f49b3a62aea2502168c9abf7a;hpb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2 diff --git a/uip/popsbr.c b/uip/popsbr.c index d1bbafc..2d03efd 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -1,8 +1,6 @@ /* * popsbr.c -- POP client subroutines * - * $Id$ - * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. @@ -11,21 +9,6 @@ #include #include -extern int client(char *args, char *protocol, char *service, int rproto, - char *response, int len_response); - -#if defined(NNTP) && !defined(PSHSBR) -# undef NNTP -#endif - -#ifdef NNTP /* building pshsbr.o from popsbr.c */ -# include -#endif /* NNTP */ - -#if !defined(NNTP) && defined(APOP) -# include -#endif - #ifdef CYRUS_SASL # include # include @@ -47,21 +30,6 @@ char response[BUFSIZ]; static FILE *input; static FILE *output; -#define targ_t char * - -#if !defined(NNTP) && defined(MPOP) -# define command pop_command -# define multiline pop_multiline -#endif - -#ifdef NNTP -# ifdef BPOP /* stupid */ -static int xtnd_last = -1; -static int xtnd_first = 0; -static char xtnd_name[512]; /* INCREDIBLE HACK!! */ -# endif -#endif /* NNTP */ - #ifdef CYRUS_SASL static sasl_conn_t *conn; /* SASL connection state */ static int sasl_complete = 0; /* Has sasl authentication succeeded? */ @@ -81,6 +49,8 @@ static sasl_callback_t callbacks[] = { #define POP_SASL_CB_N_PASS 1 { SASL_CB_LOG, NULL, NULL }, { SASL_CB_LIST_END, NULL, NULL }, + +#define SASL_BUFFER_SIZE 262144 }; #else /* CYRUS_SASL */ # define sasl_fgetc fgetc @@ -89,71 +59,21 @@ static sasl_callback_t callbacks[] = { /* * static prototypes */ -#if !defined(NNTP) && defined(APOP) -static char *pop_auth (char *, char *); -#endif -#if defined(NNTP) || !defined(MPOP) -/* otherwise they are not static functions */ static int command(const char *, ...); static int multiline(void); -#endif #ifdef CYRUS_SASL static int pop_auth_sasl(char *, char *, char *); static int sasl_fgetc(FILE *); #endif /* CYRUS_SASL */ -static int traverse (int (*)(), const char *, ...); +static int traverse (int (*)(char *), const char *, ...); static int vcommand(const char *, va_list); -static int getline (char *, int, FILE *); +static int sasl_getline (char *, int, FILE *); static int putline (char *, FILE *); -#if !defined(NNTP) && defined(APOP) -static char * -pop_auth (char *user, char *pass) -{ - int len, buflen; - char *cp, *lp; - unsigned char *dp, *ep, digest[16]; - MD5_CTX mdContext; - static char buffer[BUFSIZ]; - - if ((cp = strchr (response, '<')) == NULL - || (lp = strchr (cp, '>')) == NULL) { - snprintf (buffer, sizeof(buffer), "APOP not available: %s", response); - strncpy (response, buffer, sizeof(response)); - return NULL; - } - - *(++lp) = '\0'; - snprintf (buffer, sizeof(buffer), "%s%s", cp, pass); - - MD5Init (&mdContext); - MD5Update (&mdContext, (unsigned char *) buffer, - (unsigned int) strlen (buffer)); - MD5Final (digest, &mdContext); - - cp = buffer; - buflen = sizeof(buffer); - - snprintf (cp, buflen, "%s ", user); - len = strlen (cp); - cp += len; - buflen -= len; - - for (ep = (dp = digest) + sizeof(digest) / sizeof(digest[0]); dp < ep; ) { - snprintf (cp, buflen, "%02x", *dp++ & 0xff); - cp += 2; - buflen -= 2; - } - *cp = '\0'; - - return buffer; -} -#endif /* !NNTP && APOP */ - #ifdef CYRUS_SASL /* * This function implements the AUTH command for various SASL mechanisms @@ -255,7 +175,7 @@ pop_auth_sasl(char *user, char *host, char *mech) */ memset(&secprops, 0, sizeof(secprops)); - secprops.maxbufsize = BUFSIZ; + secprops.maxbufsize = SASL_BUFFER_SIZE; secprops.max_ssf = UINT_MAX; result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops); @@ -384,7 +304,8 @@ pop_auth_sasl(char *user, char *host, char *mech) } /* - * Limit this to what we can deal with. + * Limit this to what we can deal with. Shouldn't matter much because + * this is only outgoing data (which should be small) */ if (maxoutbuf == 0 || maxoutbuf > BUFSIZ) @@ -455,11 +376,11 @@ parse_proxy(char *proxy, char *host) int pargc = 2; int hlen = strlen(host); int plen = 1; - char *cur, *pro; + unsigned char *cur, *pro; char *c; /* skip any initial space */ - for (pro = proxy; isspace(*pro); pro++) + for (pro = (unsigned char *) proxy; isspace(*pro); pro++) continue; /* calculate required size for argument array */ @@ -492,19 +413,12 @@ parse_proxy(char *proxy, char *host) } int -pop_init (char *host, char *user, char *pass, char *proxy, int snoop, - int rpop, int kpop, int sasl, char *mech) +pop_init (char *host, char *port, char *user, char *pass, char *proxy, + int snoop, int sasl, char *mech) { int fd1, fd2; char buffer[BUFSIZ]; -#ifdef APOP - int apop; - - if ((apop = rpop) < 0) - rpop = 0; -#endif - if (proxy && *proxy) { int pid; int inpipe[2]; /* for reading from the server */ @@ -548,32 +462,15 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop, /* we read on fd1 */ fd1=inpipe[0]; - /* and write on fd2 */ fd2=outpipe[1]; } else { -#ifndef NNTP - if ( kpop ) { -# ifdef KPOP - snprintf (buffer, sizeof(buffer), "%s/%s", KPOP_PRINCIPAL, "kpop"); - if ((fd1 = client (host, "tcp", buffer, 0, response, sizeof(response))) == NOTOK) { - return NOTOK; - } -# else /* KPOP */ - snprintf (response, sizeof(response), "this version of nmh compiled without KPOP support"); + if ((fd1 = client (host, port ? port : "pop3", response, + sizeof(response), snoop)) == NOTOK) { return NOTOK; -# endif /* KPOP */ - } else { - if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK) { - return NOTOK; - } } -#else /* NNTP */ - if ((fd1 = client (host, "tcp", "nntp", rpop, response, sizeof(response))) == NOTOK) - return NOTOK; -#endif if ((fd2 = dup (fd1)) == NOTOK) { char *s; @@ -588,31 +485,16 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop, return NOTOK; } } -#ifndef NNTP if (pop_set (fd1, fd2, snoop) == NOTOK) -#else /* NNTP */ - if (pop_set (fd1, fd2, snoop, (char *)0) == NOTOK) -#endif /* NNTP */ return NOTOK; SIGNAL (SIGPIPE, SIG_IGN); - switch (getline (response, sizeof response, input)) { + switch (sasl_getline (response, sizeof response, input)) { case OK: if (poprint) fprintf (stderr, "<--- %s\n", response); -#ifndef NNTP if (*response == '+') { -# ifndef KPOP -# ifdef APOP - if (apop < 0) { - char *cp = pop_auth (user, pass); - - if (cp && command ("APOP %s", cp) != NOTOK) - return OK; - } - else -# endif /* APOP */ # ifdef CYRUS_SASL if (sasl) { if (pop_auth_sasl(user, host, mech) != NOTOK) @@ -620,21 +502,10 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop, } else # endif /* CYRUS_SASL */ if (command ("USER %s", user) != NOTOK - && command ("%s %s", rpop ? "RPOP" : (pophack++, "PASS"), + && command ("%s %s", (pophack++, "PASS"), pass) != NOTOK) return OK; -# else /* KPOP */ - if (command ("USER %s", user) != NOTOK - && command ("PASS %s", pass) != NOTOK) - return OK; -# endif } -#else /* NNTP */ - if (*response < CHAR_ERR) { - command ("MODE READER"); - return OK; - } -#endif strncpy (buffer, response, sizeof(buffer)); command ("QUIT"); strncpy (response, buffer, sizeof(response)); @@ -652,22 +523,10 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop, return NOTOK; /* NOTREACHED */ } -#ifdef NNTP -int -pop_set (int in, int out, int snoop, char *myname) -#else int pop_set (int in, int out, int snoop) -#endif { -#ifdef NNTP - if (myname && *myname) { - /* interface from bbc to msh */ - strncpy (xtnd_name, myname, sizeof(xtnd_name)); - } -#endif /* NNTP */ - if ((input = fdopen (in, "r")) == NULL || (output = fdopen (out, "w")) == NULL) { strncpy (response, "fdopen failed on connection descriptor", sizeof(response)); @@ -702,69 +561,24 @@ pop_fd (char *in, int inlen, char *out, int outlen) int pop_stat (int *nmsgs, int *nbytes) { -#ifdef NNTP - char **ap; -#endif /* NNTP */ -#ifndef NNTP if (command ("STAT") == NOTOK) return NOTOK; *nmsgs = *nbytes = 0; sscanf (response, "+OK %d %d", nmsgs, nbytes); -#else /* NNTP */ - if (xtnd_last < 0) { /* in msh, xtnd_name is set from myname */ - if (command("GROUP %s", xtnd_name) == NOTOK) - return NOTOK; - - ap = brkstring (response, " ", "\n"); /* "211 nart first last ggg" */ - xtnd_first = atoi (ap[2]); - xtnd_last = atoi (ap[3]); - } - - /* nmsgs is not the real nart, but an incredible simuation */ - if (xtnd_last > 0) - *nmsgs = xtnd_last - xtnd_first + 1; /* because of holes... */ - else - *nmsgs = 0; - *nbytes = xtnd_first; /* for subtracting offset in msh() */ -#endif /* NNTP */ - return OK; } -#ifdef NNTP -int -pop_exists (int (*action)()) -{ -#ifdef XMSGS /* hacked into NNTP 1.5 */ - if (traverse (action, "XMSGS %d-%d", (targ_t) xtnd_first, (targ_t) xtnd_last) == OK) - return OK; -#endif - /* provided by INN 1.4 */ - if (traverse (action, "LISTGROUP") == OK) - return OK; - return traverse (action, "XHDR NONAME %d-%d", (targ_t) xtnd_first, (targ_t) xtnd_last); -} -#endif /* NNTP */ - -#ifdef BPOP -int -pop_list (int msgno, int *nmsgs, int *msgs, int *bytes, int *ids) -#else int pop_list (int msgno, int *nmsgs, int *msgs, int *bytes) -#endif { int i; -#ifndef BPOP int *ids = NULL; -#endif if (msgno) { -#ifndef NNTP if (command ("LIST %d", msgno) == NOTOK) return NOTOK; *msgs = *bytes = 0; @@ -774,18 +588,9 @@ pop_list (int msgno, int *nmsgs, int *msgs, int *bytes) } else sscanf (response, "+OK %d %d", msgs, bytes); -#else /* NNTP */ - *msgs = *bytes = 0; - if (command ("STAT %d", msgno) == NOTOK) - return NOTOK; - if (ids) { - *ids = msgno; - } -#endif /* NNTP */ return OK; } -#ifndef NNTP if (command ("LIST") == NOTOK) return NOTOK; @@ -816,25 +621,18 @@ pop_list (int msgno, int *nmsgs, int *msgs, int *bytes) case OK: break; } -#else /* NNTP */ - return NOTOK; -#endif /* NNTP */ } int -pop_retr (int msgno, int (*action)()) +pop_retr (int msgno, int (*action)(char *)) { -#ifndef NNTP - return traverse (action, "RETR %d", (targ_t) msgno); -#else /* NNTP */ - return traverse (action, "ARTICLE %d", (targ_t) msgno); -#endif /* NNTP */ + return traverse (action, "RETR %d", msgno); } static int -traverse (int (*action)(), const char *fmt, ...) +traverse (int (*action)(char *), const char *fmt, ...) { int result; va_list ap; @@ -878,15 +676,6 @@ pop_noop (void) } -#if defined(MPOP) && !defined(NNTP) -int -pop_last (void) -{ - return command ("LAST"); -} -#endif - - int pop_rset (void) { @@ -895,76 +684,10 @@ pop_rset (void) int -pop_top (int msgno, int lines, int (*action)()) +pop_top (int msgno, int lines, int (*action)(char *)) { -#ifndef NNTP - return traverse (action, "TOP %d %d", (targ_t) msgno, (targ_t) lines); -#else /* NNTP */ - return traverse (action, "HEAD %d", (targ_t) msgno); -#endif /* NNTP */ -} - - -#ifdef BPOP -int -pop_xtnd (int (*action)(), char *fmt, ...) -{ - int result; - va_list ap; - char buffer[BUFSIZ]; - -#ifdef NNTP - char **ap; -#endif - - va_start(ap, fmt); -#ifndef NNTP - /* needs to be fixed... va_end needs to be added */ - snprintf (buffer, sizeof(buffer), "XTND %s", fmt); - result = traverse (action, buffer, a, b, c, d); - va_end(ap); - return result; -#else /* NNTP */ - snprintf (buffer, sizeof(buffer), fmt, a, b, c, d); - ap = brkstring (buffer, " ", "\n"); /* a hack, i know... */ - - if (!strcasecmp(ap[0], "x-bboards")) { /* XTND "X-BBOARDS group */ - /* most of these parameters are meaningless under NNTP. - * bbc.c was modified to set AKA and LEADERS as appropriate, - * the rest are left blank. - */ - return OK; - } - if (!strcasecmp (ap[0], "archive") && ap[1]) { - snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */ - xtnd_last = 0; - xtnd_first = 1; /* setup to fail in pop_stat */ - return OK; - } - if (!strcasecmp (ap[0], "bboards")) { - - if (ap[1]) { /* XTND "BBOARDS group" */ - snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */ - if (command("GROUP %s", xtnd_name) == NOTOK) - return NOTOK; - - /* action must ignore extra args */ - strncpy (buffer, response, sizeof(buffer)); - ap = brkstring (response, " ", "\n");/* "211 nart first last g" */ - xtnd_first = atoi (ap[2]); - xtnd_last = atoi (ap[3]); - - (*action) (buffer); - return OK; - - } else { /* XTND "BBOARDS" */ - return traverse (action, "LIST", a, b, c, d); - } - } - return NOTOK; /* unknown XTND command */ -#endif /* NNTP */ + return traverse (action, "TOP %d %d", msgno, lines); } -#endif /* BPOP */ int @@ -993,9 +716,6 @@ pop_done (void) } -#if !defined(MPOP) || defined(NNTP) -static -#endif int command(const char *fmt, ...) { @@ -1041,15 +761,11 @@ vcommand (const char *fmt, va_list ap) fprintf(stderr, "(decrypted) "); #endif /* CYRUS_SASL */ - switch (getline (response, sizeof response, input)) { + switch (sasl_getline (response, sizeof response, input)) { case OK: if (poprint) fprintf (stderr, "<--- %s\n", response); -#ifndef NNTP return (*response == '+' ? OK : NOTOK); -#else /* NNTP */ - return (*response < CHAR_ERR ? OK : NOTOK); -#endif /* NNTP */ case NOTOK: case DONE: @@ -1062,17 +778,12 @@ vcommand (const char *fmt, va_list ap) } -#if defined(MPOP) && !defined(NNTP) int multiline (void) -#else -static int -multiline (void) -#endif { char buffer[BUFSIZ + TRMLEN]; - if (getline (buffer, sizeof buffer, input) != OK) + if (sasl_getline (buffer, sizeof buffer, input) != OK) return NOTOK; #ifdef DEBUG if (poprint) { @@ -1101,9 +812,9 @@ multiline (void) */ static int -getline (char *s, int n, FILE *iop) +sasl_getline (char *s, int n, FILE *iop) { - int c; + int c = -2; char *p; p = s; @@ -1186,7 +897,7 @@ sasl_fgetc(FILE *f) static int cnt = 0; unsigned int retbufsize = 0; int cc, result; - char *retbuf, tmpbuf[BUFSIZ]; + char *retbuf, tmpbuf[SASL_BUFFER_SIZE]; /* * If we have some leftover data, return that @@ -1238,12 +949,7 @@ sasl_fgetc(FILE *f) } if (retbufsize > size) { - buffer = realloc(buffer, retbufsize); - if (!buffer) { - snprintf(response, sizeof(response), "Error during realloc in " - "read routine: %s", strerror(errno)); - return -2; - } + buffer = mh_xrealloc(buffer, retbufsize); size = retbufsize; }