X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpopsbr.c;h=363f925bd73f7989ec401330032728a0d440b467;hp=685489a13f4ed1c92f88c2f38ed4cba0f231ad5f;hb=d2f12554a254e814dcdafb3828fc0d9936154eef;hpb=557d33aeabe46e9a0411959703f721c5b9ce2ae9 diff --git a/uip/popsbr.c b/uip/popsbr.c index 685489a..363f925 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -9,6 +9,7 @@ */ #include +#include extern int client(char *args, char *protocol, char *service, int rproto, char *response, int len_response); @@ -26,8 +27,8 @@ extern int client(char *args, char *protocol, char *service, int rproto, #endif #ifdef CYRUS_SASL -# include -# include +# include +# include #endif /* CYRUS_SASL */ #include @@ -432,10 +433,7 @@ sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret) len = strlen(pass); - *psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len); - - if (! *psecret) - return SASL_NOMEM; + *psecret = (sasl_secret_t *) mh_xmalloc(sizeof(sasl_secret_t) + len); (*psecret)->len = len; strcpy((char *) (*psecret)->data, pass); @@ -444,9 +442,58 @@ sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret) } #endif /* CYRUS_SASL */ + +/* + * Split string containing proxy command into an array of arguments + * suitable for passing to exec. Returned array must be freed. Shouldn't + * be possible to call this with host set to NULL. + */ +char ** +parse_proxy(char *proxy, char *host) +{ + char **pargv, **p; + int pargc = 2; + int hlen = strlen(host); + int plen = 1; + char *cur, *pro; + char *c; + + /* skip any initial space */ + for (pro = proxy; isspace(*pro); pro++) + continue; + + /* calculate required size for argument array */ + for (cur = pro; *cur; cur++) { + if (isspace(*cur) && cur[1] && !isspace(cur[1])) + plen++, pargc++; + else if (*cur == '%' && cur[1] == 'h') { + plen += hlen; + cur++; + } else if (!isspace(*cur)) + plen++; + } + + /* put together list of arguments */ + p = pargv = mh_xmalloc(pargc * sizeof(char *)); + c = *pargv = mh_xmalloc(plen * sizeof(char)); + for (cur = pro; *cur; cur++) { + if (isspace(*cur) && cur[1] && !isspace(cur[1])) { + *c++ = '\0'; + *++p = c; + } else if (*cur == '%' && cur[1] == 'h') { + strcpy (c, host); + c += hlen; + cur++; + } else if (!isspace(*cur)) + *c++ = *cur; + } + *++p = NULL; + return pargv; +} + int -pop_init (char *host, char *user, char *pass, int snoop, int rpop, int kpop, - int sasl, char *mech) +pop_init (char *host, char *user, char *pass, char *proxy, int snoop, + int rpop, int kpop, int sasl, char *mech) { int fd1, fd2; char buffer[BUFSIZ]; @@ -458,37 +505,88 @@ pop_init (char *host, char *user, char *pass, int snoop, int rpop, int kpop, rpop = 0; #endif + if (proxy && *proxy) { + int pid; + int inpipe[2]; /* for reading from the server */ + int outpipe[2]; /* for sending to the server */ + + /* first give up any root priviledges we may have for rpop */ + setuid(getuid()); + + pipe(inpipe); + pipe(outpipe); + + pid=fork(); + if (pid==0) { + char **argv; + + /* in child */ + close(0); + close(1); + dup2(outpipe[0],0); /* connect read end of connection */ + dup2(inpipe[1], 1); /* connect write end of connection */ + if(inpipe[0]>1) close(inpipe[0]); + if(inpipe[1]>1) close(inpipe[1]); + if(outpipe[0]>1) close(outpipe[0]); + if(outpipe[1]>1) close(outpipe[1]); + + /* run the proxy command */ + argv=parse_proxy(proxy, host); + execvp(argv[0],argv); + + perror(argv[0]); + close(0); + close(1); + free(*argv); + free(argv); + exit(10); + } + + /* okay in the parent we do some stuff */ + close(inpipe[1]); /* child uses this */ + close(outpipe[0]); /* child uses this */ + + /* we read on fd1 */ + fd1=inpipe[0]; + + /* and write on fd2 */ + fd2=outpipe[1]; + + } else { + #ifndef NNTP + if ( kpop ) { # ifdef KPOP - if ( kpop ) { - snprintf (buffer, sizeof(buffer), "%s/%s", KPOP_PRINCIPAL, "kpop"); - if ((fd1 = client (host, "tcp", buffer, 0, response, sizeof(response))) == NOTOK) { - return NOTOK; - } - } else { -# endif /* KPOP */ - if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK) { + 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"); return NOTOK; - } -# ifdef KPOP - } # 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; + if ((fd1 = client (host, "tcp", "nntp", rpop, response, sizeof(response))) == NOTOK) + return NOTOK; #endif - if ((fd2 = dup (fd1)) == NOTOK) { - char *s; + if ((fd2 = dup (fd1)) == NOTOK) { + char *s; - if ((s = strerror(errno))) - snprintf (response, sizeof(response), - "unable to dup connection descriptor: %s", s); - else - snprintf (response, sizeof(response), - "unable to dup connection descriptor: unknown error"); - close (fd1); - return NOTOK; + if ((s = strerror(errno))) + snprintf (response, sizeof(response), + "unable to dup connection descriptor: %s", s); + else + snprintf (response, sizeof(response), + "unable to dup connection descriptor: unknown error"); + close (fd1); + return NOTOK; + } } #ifndef NNTP if (pop_set (fd1, fd2, snoop) == NOTOK) @@ -830,20 +928,20 @@ pop_xtnd (int (*action)(), char *fmt, ...) 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 */ + if (!mh_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]) { + if (!mh_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 (!mh_strcasecmp (ap[0], "bboards")) { if (ap[1]) { /* XTND "BBOARDS group" */ snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */ @@ -866,7 +964,7 @@ pop_xtnd (int (*action)(), char *fmt, ...) return NOTOK; /* unknown XTND command */ #endif /* NNTP */ } -#endif BPOP +#endif /* BPOP */ int @@ -984,7 +1082,7 @@ multiline (void) #endif /* CYRUS_SASL */ fprintf (stderr, "<--- %s\n", response); } -#endif DEBUG +#endif /* DEBUG */ if (strncmp (buffer, TRM, TRMLEN) == 0) { if (buffer[TRMLEN] == 0) return DONE; @@ -1140,12 +1238,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; }