From 9701509fced80d18b30bde4e51bca7fb2e73b26e Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sun, 21 Oct 2007 18:38:25 +0000 Subject: * src/dnsbase.c (cname_loop_body): Return TXT only if explicitly required. Bug reported by Jan Rafaj. git-svn-id: file:///svnroot/mailfromd/trunk@1518 7a8a7f39-df28-0410-adc6-e0d955640f24 --- ChangeLog | 3 + src/bi_sa.m4 | 218 +++++++++++++++++++++++++++++++++++++++++++++++----------- src/dnsbase.c | 4 +- 3 files changed, 182 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index c50cbd64..053fa59c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-10-21 Sergey Poznyakoff + * src/dnsbase.c (cname_loop_body): Return TXT only if explicitly + required. Bug reported by Jan Rafaj. + * src/engine.c: Fix timeout calculations (struct timeout_ctl): New data type (UPDATE_TTW,smtp_stream_wait,smtp_wait): Operate on struct timeout_ctl. diff --git a/src/bi_sa.m4 b/src/bi_sa.m4 index 0ed7472b..8472bbe9 100644 --- a/src/bi_sa.m4 +++ b/src/bi_sa.m4 @@ -27,27 +27,150 @@ MF_VAR(sa_threshold, NUMBER); MF_VAR(sa_keywords, STRING); MF_VAR(clamav_virus_name, STRING); + +struct mf_stream { + eval_environ_t env; + mu_stream_t str; + time_t start; + time_t timeout; +}; + +typedef struct mf_stream *mf_stream_t; + +/* FIXME: duplicated in engine.c */ +#define UPDATE_TTW(t,start) do { \ + time_t delta = time(NULL) - start; \ + if (t > delta) \ + t -= delta; \ + else \ + t = 0; \ +} while (0) + +extern int smtp_stream_wait(mu_stream_t stream, int flags, time_t *timeout); +static void spamd_destroy(mf_stream_t *pstream); + +mf_stream_t +mf_stream_new (eval_environ_t env, mu_stream_t stream, time_t start, + time_t timeout) +{ + mf_stream_t pmfs = xmalloc (sizeof pmfs[0]); + pmfs->env = env; + pmfs->str = stream; + pmfs->start = start; + pmfs->timeout = timeout; + return pmfs; +} + +int +mf_stream_sequential_read(mf_stream_t stream, char *buf, size_t size) +{ + int rc; + eval_environ_t env = stream->env; + + if (stream->timeout == 0) { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_read: %s", + mu_strerror(ETIMEDOUT)); + } + + rc = smtp_stream_wait(stream->str, MU_STREAM_READY_RD, + &stream->timeout); + if (rc == 0) { + UPDATE_TTW(stream->timeout, stream->start); + rc = mu_stream_sequential_read(stream->str, buf, size, NULL); + } else { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_read: %s", + mu_strerror(ETIMEDOUT)); + } + + return rc; +} + +int +mf_stream_sequential_readline(mf_stream_t stream, char *buf, size_t size, + size_t *nbytes) +{ + int rc; + eval_environ_t env = stream->env; + + if (stream->timeout == 0) { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_readline: %s", + mu_strerror(ETIMEDOUT)); + } + rc = smtp_stream_wait(stream->str, MU_STREAM_READY_RD, + &stream->timeout); + if (rc == 0) { + UPDATE_TTW(stream->timeout, stream->start); + rc = mu_stream_sequential_readline(stream->str, buf, size, + nbytes); + } else { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_readline: %s", + mu_strerror(ETIMEDOUT)); + } + return rc; +} + +int +mf_stream_sequential_write(mf_stream_t stream, char *buf, size_t size) +{ + int rc; + eval_environ_t env = stream->env; + + if (stream->timeout == 0) { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_write: %s", + mu_strerror(ETIMEDOUT)); + } + + rc = smtp_stream_wait(stream->str, MU_STREAM_READY_WR, + &stream->timeout); + if (rc == 0) { + UPDATE_TTW(stream->timeout, stream->start); + rc = mu_stream_sequential_write(stream->str, buf, size); + } else { + spamd_destroy(&stream); + MF_THROW(mf_temp_failure, + "sa_sequential_write: %s", + mu_strerror(ETIMEDOUT)); + } + return rc; +} + + + static int -spamd_connect_tcp(eval_environ_t env, mu_stream_t *stream, - char *host, int port) +spamd_connect_tcp(eval_environ_t env, mf_stream_t *pmfs, + char *host, int port, time_t timeout) { - int rc = mu_tcp_stream_create(stream, host, port, 0); + mu_stream_t stream; + int rc = mu_tcp_stream_create(&stream, host, port, 0); MF_ASSERT(rc == 0, mf_failure, "mu_tcp_stream_create: %s", mu_strerror(rc)); - rc = mu_stream_open(*stream); + rc = mu_stream_open(stream); MF_ASSERT(rc == 0, mf_failure, "mu_stream_open: %s", mu_strerror(rc)); + *pmfs = mf_stream_new(env, stream, time(NULL), timeout); return rc; } static int -spamd_connect_socket(eval_environ_t env, mu_stream_t *stream, char *path) +spamd_connect_socket(eval_environ_t env, mf_stream_t *pmfs, char *path, + time_t timeout) { int fd, rc; FILE *fp; struct sockaddr_un addr; + mu_stream_t stream; fd = socket(PF_UNIX, SOCK_STREAM, 0); MF_ASSERT(fd >= 0, mf_failure, @@ -63,7 +186,7 @@ spamd_connect_socket(eval_environ_t env, mu_stream_t *stream, char *path) } fp = fdopen(fd, "w+"); - rc = mu_stdio_stream_create(stream, fp, MU_STREAM_RDWR); + rc = mu_stdio_stream_create(&stream, fp, MU_STREAM_RDWR); if (rc) { fclose(fp); MF_THROW(mf_failure, @@ -71,25 +194,28 @@ spamd_connect_socket(eval_environ_t env, mu_stream_t *stream, char *path) mu_strerror(rc)); } - rc = mu_stream_open(*stream); + rc = mu_stream_open(stream); if (rc) { - mu_stream_destroy (stream, mu_stream_get_owner (*stream)); + mu_stream_destroy(&stream, mu_stream_get_owner(stream)); fclose(fp); MF_THROW(mf_failure, "mu_stream_open: %s", mu_strerror(rc)); } + + *pmfs = mf_stream_new(env, stream, time(NULL), timeout); + return rc; } static void -spamd_shutdown(mu_stream_t stream, int isfile, int flag) +spamd_shutdown(mf_stream_t stream, int isfile, int flag) { int fd; - mu_transport_t trans; - mu_stream_flush(stream); - mu_stream_get_transport(stream, &trans); + + mu_stream_flush(stream->str); + mu_stream_get_transport(stream->str, &trans); if (isfile) fd = fileno((FILE*)trans); else @@ -98,14 +224,17 @@ spamd_shutdown(mu_stream_t stream, int isfile, int flag) } static void -spamd_destroy(mu_stream_t *stream) +spamd_destroy(mf_stream_t *pstream) { - mu_stream_close(*stream); - mu_stream_destroy(stream, mu_stream_get_owner(*stream)); + mf_stream_t stream = *pstream; + mu_stream_close(stream->str); + mu_stream_destroy(&stream->str, mu_stream_get_owner(stream->str)); + free(stream); + *pstream = NULL; } static void -spamd_send_command(mu_stream_t stream, const char *fmt, ...) +spamd_send_command(mf_stream_t stream, const char *fmt, ...) { char buf[512]; size_t n; @@ -114,12 +243,12 @@ spamd_send_command(mu_stream_t stream, const char *fmt, ...) va_start (ap, fmt); n = vsnprintf (buf, sizeof buf, fmt, ap); va_end (ap); - mu_stream_sequential_write(stream, buf, n); - mu_stream_sequential_write(stream, "\r\n", 2); + mf_stream_sequential_write(stream, buf, n); + mf_stream_sequential_write(stream, "\r\n", 2); } static void -spamd_send_stream(mu_stream_t stream, mu_stream_t instr) +spamd_send_stream(mf_stream_t stream, mu_stream_t instr) { size_t size; char buf[512]; @@ -129,15 +258,15 @@ spamd_send_stream(mu_stream_t stream, mu_stream_t instr) &size) == 0 && size > 0) { debug3(80,"<< %*.*s", size, size, buf); - mu_stream_sequential_write (stream, buf, size); + mf_stream_sequential_write(stream, buf, size); } } static int -spamd_read_line(mu_stream_t stream, char *buffer, size_t size, size_t *pn) +spamd_read_line(mf_stream_t stream, char *buffer, size_t size, size_t *pn) { size_t n = 0; - int rc = mu_stream_sequential_readline(stream, buffer, size, &n); + int rc = mf_stream_sequential_readline(stream, buffer, size, &n); if (rc == 0) { if (pn) *pn = n; @@ -187,11 +316,11 @@ decode_float(long *vn, char *str, int digits) } static int -decode_boolean (char *str) +decode_boolean(char *str) { - if (strcasecmp (str, "true") == 0) + if (strcasecmp(str, "true") == 0) return 1; - else if (strcasecmp (str, "false") == 0) + else if (strcasecmp(str, "false") == 0) return 0; /*else?*/ return 0; @@ -222,12 +351,13 @@ sigpipe_handler (int sig) got_sigpipe = 1; } -mu_stream_t -open_connection(eval_environ_t env, char *urlstr, int *isfile, char **phost) +mf_stream_t +open_connection(eval_environ_t env, char *urlstr, int *isfile, char **phost, + long timeout) { char *path = NULL; short port = 0; - mu_stream_t str = NULL; + mf_stream_t str = NULL; int rc; if (urlstr[0] == '/') { @@ -310,10 +440,10 @@ open_connection(eval_environ_t env, char *urlstr, int *isfile, char **phost) } if (port == 0) { - rc = spamd_connect_socket(env, &str, path); + rc = spamd_connect_socket(env, &str, path, timeout); *isfile = 1; } else { - rc = spamd_connect_tcp(env, &str, path, port); + rc = spamd_connect_tcp(env, &str, path, port, timeout); *isfile = 0; } @@ -332,12 +462,12 @@ open_connection(eval_environ_t env, char *urlstr, int *isfile, char **phost) MF_STATE(eom) MF_CAPTURE -MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec) +MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec, OPTIONAL, NUMBER timeout) { mu_off_t msize; size_t size; mu_stream_t mstr = env_get_stream(env); - mu_stream_t ostr; + mf_stream_t ostr; signal_handler_fn handler; char buffer[512]; char version_str[19]; @@ -347,7 +477,8 @@ MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec) long score, threshold; int isfile; - ostr = open_connection(env, urlstr, &isfile, NULL); + ostr = open_connection(env, urlstr, &isfile, NULL, + MF_OPTVAL(timeout, 7200)); mu_stream_size(mstr, &msize); spamd_send_command(ostr, "SYMBOLS SPAMC/1.2"); spamd_send_command(ostr, "Content-length: %lu", @@ -414,10 +545,11 @@ END MF_STATE(eom) MF_CAPTURE -MF_DEFUN(clamav, NUMBER, STRING urlstr) +MF_DEFUN(clamav, NUMBER, STRING urlstr, OPTIONAL, NUMBER timeout) { mu_stream_t mstr = env_get_stream(env); - mu_stream_t cstr, dstr; + mf_stream_t cstr, dstr; + mu_stream_t str; char buffer[512]; char *host; unsigned short port; @@ -425,8 +557,9 @@ MF_DEFUN(clamav, NUMBER, STRING urlstr) signal_handler_fn handler; char *p; int isfile; - - cstr = open_connection(env, urlstr, &isfile, &host); + + cstr = open_connection(env, urlstr, &isfile, &host, + MF_OPTVAL(timeout, 7200)); spamd_send_command(cstr, "STREAM"); spamd_read_line(cstr, buffer, sizeof buffer, NULL); @@ -439,8 +572,8 @@ MF_DEFUN(clamav, NUMBER, STRING urlstr) if (!host) host = strdup("127.0.0.1"); /* FIXME */ - - rc = mu_tcp_stream_create(&dstr, host, port, 0); + + rc = mu_tcp_stream_create(&str, host, port, 0); free(host); if (rc) { spamd_destroy(&cstr); @@ -449,18 +582,21 @@ MF_DEFUN(clamav, NUMBER, STRING urlstr) mu_strerror(rc)); } - rc = mu_stream_open(dstr); + rc = mu_stream_open(str); if (rc) { spamd_destroy(&cstr); - mu_stream_destroy(&dstr, mu_stream_get_owner(dstr)); + mu_stream_destroy(&str, mu_stream_get_owner(str)); MF_THROW(mf_failure, "mu_stream_open: %s", mu_strerror(rc)); } handler = set_signal_handler(SIGPIPE, sigpipe_handler); + dstr = mf_stream_new (env, str, cstr->start, cstr->timeout); spamd_send_stream(dstr, mstr); spamd_shutdown(dstr, 0, SHUT_WR); + spamd_destroy(&dstr); + set_signal_handler(SIGPIPE, handler); rc = spamd_read_line(cstr, buffer, sizeof buffer, NULL); diff --git a/src/dnsbase.c b/src/dnsbase.c index cf4b95a4..cbb658d0 100644 --- a/src/dnsbase.c +++ b/src/dnsbase.c @@ -247,7 +247,7 @@ struct loop_data { /* Return data: */ char *hbuf; /* Return buffer */ size_t hbsize; /* Size of return buffer */ - size_t hbcount; /* ?? */ + size_t hbcount; /* Number of items returned */ time_t ttl; /* TTL value */ dns_status status; /* Status */ @@ -418,7 +418,7 @@ cname_loop_body(struct loop_data *lp) break; case T_TXT: - if (lp->atype != T_ANY && lp->atype != type) + if (lp->atype != type) continue; l = cp[0]; if (lp->hbcount + l >= lp->hbsize) -- cgit v1.2.1