From: Pierre Habouzit Date: Sat, 1 Dec 2007 13:16:52 +0000 (+0100) Subject: We don't need a separate module here. X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=commitdiff_plain;h=cd6d97ab05dc231c35cf0dd38afaa43f0ab1fd99 We don't need a separate module here. Signed-off-by: Pierre Habouzit --- diff --git a/Makefile b/Makefile index 29ee7aa..97bfaa1 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,8 @@ TESTS = tst-rbl GENERATED = tokens.h tokens.c -postlicyd_SOURCES = common.c threads.c str.c buffer.c \ - policy.c greylist.c rbl.c \ - $(GENERATED) main-postlicyd.c +postlicyd_SOURCES = common.c threads.c str.c buffer.c $(GENERATED) \ + greylist.c rbl.c main-postlicyd.c postlicyd_LIBADD = -lpthread $(TC_LIBS) postlicyd_CFLAGS = $(TC_CFLAGS) diff --git a/common.c b/common.c index d3147ff..186ac43 100644 --- a/common.c +++ b/common.c @@ -159,6 +159,20 @@ int accept_nonblock(int fd) return sock; } +int xwrite(int fd, const char *s, size_t l) +{ + while (l > 0) { + int nb = write(fd, s, l); + if (nb < 0) { + if (errno == EINTR || errno == EAGAIN) + continue; + return -1; + } + l -= nb; + } + return 0; +} + int daemon_detach(void) { pid_t pid; diff --git a/common.h b/common.h index e6050ac..f7dd978 100644 --- a/common.h +++ b/common.h @@ -76,6 +76,7 @@ void common_sighandler(int sig); int tcp_listen_nonblock(const struct sockaddr *addr, socklen_t len); int accept_nonblock(int fd); +int xwrite(int fd, const char *s, size_t l); int daemon_detach(void); int drop_privileges(const char *user, const char *group); diff --git a/main-postlicyd.c b/main-postlicyd.c index 92c2026..fa92f0d 100644 --- a/main-postlicyd.c +++ b/main-postlicyd.c @@ -35,11 +35,225 @@ #include +#include "buffer.h" +#include "common.h" #include "threads.h" -#include "policy.h" +#include "tokens.h" #define DAEMON_NAME "postlicyd" +enum smtp_state { + SMTP_UNKNOWN, + SMTP_CONNECT, + SMTP_EHLO, + SMTP_HELO = SMTP_EHLO, + SMTP_MAIL, + SMTP_RCPT, + SMTP_DATA, + SMTP_END_OF_MESSAGE, + SMTP_VRFY, + SMTP_ETRN, +}; + +/* \see http://www.postfix.org/SMTPD_POLICY_README.html */ +typedef struct query_t { + unsigned state : 4; + unsigned esmtp : 1; + + const char *helo_name; + const char *queue_id; + const char *sender; + const char *recipient; + const char *recipient_count; + const char *client_address; + const char *client_name; + const char *rclient_name; + const char *instance; + + /* postfix 2.2+ */ + const char *sasl_method; + const char *sasl_username; + const char *sasl_sender; + const char *size; + const char *ccert_subject; + const char *ccert_issuer; + const char *ccsert_fingerprint; + + /* postfix 2.3+ */ + const char *encryption_protocol; + const char *encryption_cipher; + const char *encryption_keysize; + const char *etrn_domain; + + buffer_t data; +} query_t; + +static query_t *query_init(query_t *rq) { + memset(rq, 0, offsetof(query_t, data)); + buffer_init(&rq->data); + return rq; +} +static void query_wipe(query_t *rq) { + buffer_wipe(&rq->data); +} + +static int postfix_parsejob(query_t *query) +{ +#define PARSE_CHECK(expr, error, ...) \ + do { \ + if (!(expr)) { \ + syslog(LOG_ERR, error, ##__VA_ARGS__); \ + return -1; \ + } \ + } while (0) + + char *p = vskipspaces(query->data.data); + + memset(query, 0, offsetof(query_t, data)); + while (p[0] != '\r' || p[1] != '\n') { + char *k, *v; + int klen, vlen, vtk; + + while (isblank(*p)) + p++; + p = strchr(k = p, '='); + PARSE_CHECK(p, "could not find '=' in line"); + for (klen = p - k; klen && isblank(k[klen]); klen--); + p += 1; /* skip = */ + + while (isblank(*p)) + p++; + p = strstr(v = p, "\r\n"); + PARSE_CHECK(p, "could not find final \\r\\n in line"); + for (vlen = p - v; vlen && isblank(v[vlen]); vlen--); + p += 2; /* skip \r\n */ + + vtk = tokenize(v, vlen); + switch (tokenize(k, klen)) { +#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; break; + CASE(HELO_NAME, helo_name); + CASE(QUEUE_ID, queue_id); + CASE(SENDER, sender); + CASE(RECIPIENT, recipient); + CASE(RECIPIENT_COUNT, recipient_count); + CASE(CLIENT_ADDRESS, client_address); + CASE(CLIENT_NAME, client_name); + CASE(RCLIENT_NAME, rclient_name); + CASE(INSTANCE, instance); + CASE(SASL_METHOD, sasl_method); + CASE(SASL_USERNAME, sasl_username); + CASE(SASL_SENDER, sasl_sender); + CASE(SIZE, size); + CASE(CCERT_SUBJECT, ccert_subject); + CASE(CCERT_ISSUER, ccert_issuer); + CASE(CCSERT_FINGERPRINT, ccsert_fingerprint); + CASE(ENCRYPTION_PROTOCOL, encryption_protocol); + CASE(ENCRYPTION_CIPHER, encryption_cipher); + CASE(ENCRYPTION_KEYSIZE, encryption_keysize); + CASE(ETRN_DOMAIN, etrn_domain); +#undef CASE + + case PTK_REQUEST: + PARSE_CHECK(vtk == PTK_SMTPD_ACCESS_POLICY, + "unexpected `request' value: %.*s", vlen, v); + break; + + case PTK_PROTOCOL_NAME: + PARSE_CHECK(vtk == PTK_SMTP || vtk == PTK_ESMTP, + "unexpected `protocol_name' value: %.*s", vlen, v); + query->esmtp = vtk == PTK_ESMTP; + break; + + case PTK_PROTOCOL_STATE: + switch (vtk) { +#define CASE(name) case PTK_##name: query->state = SMTP_##name; break; + CASE(CONNECT); + CASE(EHLO); + CASE(HELO); + CASE(MAIL); + CASE(RCPT); + CASE(DATA); + CASE(END_OF_MESSAGE); + CASE(VRFY); + CASE(ETRN); + default: + PARSE_CHECK(false, "unexpected `protocol_state` value: %.*s", + vlen, v); +#undef CASE + } + break; + + default: + syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k); + break; + } + } + + return query->state == SMTP_UNKNOWN ? -1 : 0; +#undef PARSE_CHECK +} + +static void *policy_run(int fd, void *data) +{ + query_t q; + query_init(&q); + + for (;;) { + int nb = buffer_read(&q.data, fd, -1); + const char *eoq; + + if (nb < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; + UNIXERR("read"); + break; + } + if (nb == 0) { + if (q.data.len) + syslog(LOG_ERR, "unexpected end of data"); + break; + } + + eoq = strstr(q.data.data + MAX(0, q.data.len - 3), "\r\n\r\n"); + if (!eoq) + continue; + + if (postfix_parsejob(&q) < 0) + break; + + buffer_consume(&q.data, eoq + strlen("\r\n\r\n") - q.data.data); + if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) { + UNIXERR("write"); + break; + } + } + + query_wipe(&q); + close(fd); + return NULL; +} + +static int main_loop(void) +{ + int exitcode = EXIT_SUCCESS; + int sock = -1; + + while (!sigint) { + int fd = accept(sock, NULL, 0); + if (fd < 0) { + if (errno != EINTR || errno != EAGAIN) + UNIXERR("accept"); + continue; + } + + thread_launch(policy_run, fd, NULL); + threads_join(); + } + + close(sock); + return exitcode; +} + /* administrivia {{{ */ static int main_initialize(void) @@ -72,27 +286,6 @@ void usage(void) /* }}} */ -static int main_loop(void) -{ - int exitcode = EXIT_SUCCESS; - int sock = -1; - - while (!sigint) { - int fd = accept(sock, NULL, 0); - if (fd < 0) { - if (errno != EINTR || errno != EAGAIN) - UNIXERR("accept"); - continue; - } - - thread_launch(policy_run, fd, NULL); - threads_join(); - } - - close(sock); - return exitcode; -} - int main(int argc, char *argv[]) { const char *pidfile = NULL; diff --git a/policy.c b/policy.c deleted file mode 100644 index 0949dd2..0000000 --- a/policy.c +++ /dev/null @@ -1,244 +0,0 @@ -/******************************************************************************/ -/* pfixtools: a collection of postfix related tools */ -/* ~~~~~~~~~ */ -/* ________________________________________________________________________ */ -/* */ -/* Redistribution and use in source and binary forms, with or without */ -/* modification, are permitted provided that the following conditions */ -/* are met: */ -/* */ -/* 1. Redistributions of source code must retain the above copyright */ -/* notice, this list of conditions and the following disclaimer. */ -/* 2. Redistributions in binary form must reproduce the above copyright */ -/* notice, this list of conditions and the following disclaimer in the */ -/* documentation and/or other materials provided with the distribution. */ -/* 3. The names of its contributors may not be used to endorse or promote */ -/* products derived from this software without specific prior written */ -/* permission. */ -/* */ -/* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND */ -/* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE */ -/* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ -/* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS */ -/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR */ -/* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF */ -/* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS */ -/* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN */ -/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) */ -/* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF */ -/* THE POSSIBILITY OF SUCH DAMAGE. */ -/******************************************************************************/ - -/* - * Copyright © 2006-2007 Pierre Habouzit - */ - -#include "common.h" -#include "policy.h" -#include "buffer.h" -#include "tokens.h" - -enum smtp_state { - SMTP_UNKNOWN, - SMTP_CONNECT, - SMTP_EHLO, - SMTP_HELO = SMTP_EHLO, - SMTP_MAIL, - SMTP_RCPT, - SMTP_DATA, - SMTP_END_OF_MESSAGE, - SMTP_VRFY, - SMTP_ETRN, -}; - -/* \see http://www.postfix.org/SMTPD_POLICY_README.html */ -typedef struct query_t { - unsigned state : 4; - unsigned esmtp : 1; - - const char *helo_name; - const char *queue_id; - const char *sender; - const char *recipient; - const char *recipient_count; - const char *client_address; - const char *client_name; - const char *rclient_name; - const char *instance; - - /* postfix 2.2+ */ - const char *sasl_method; - const char *sasl_username; - const char *sasl_sender; - const char *size; - const char *ccert_subject; - const char *ccert_issuer; - const char *ccsert_fingerprint; - - /* postfix 2.3+ */ - const char *encryption_protocol; - const char *encryption_cipher; - const char *encryption_keysize; - const char *etrn_domain; - - buffer_t data; -} query_t; - -static query_t *query_init(query_t *rq) { - memset(rq, 0, offsetof(query_t, data)); - buffer_init(&rq->data); - return rq; -} -static void query_wipe(query_t *rq) { - buffer_wipe(&rq->data); -} - -static int xwrite(int fd, const char *s, size_t l) -{ - while (l > 0) { - int nb = write(fd, s, l); - if (nb < 0) { - if (errno == EINTR || errno == EAGAIN) - continue; - return -1; - } - l -= nb; - } - return 0; -} - -static int postfix_parsejob(query_t *query) -{ -#define PARSE_CHECK(expr, error, ...) \ - do { \ - if (!(expr)) { \ - syslog(LOG_ERR, error, ##__VA_ARGS__); \ - return -1; \ - } \ - } while (0) - - char *p = vskipspaces(query->data.data); - - memset(query, 0, offsetof(query_t, data)); - while (p[0] != '\r' || p[1] != '\n') { - char *k, *v; - int klen, vlen, vtk; - - while (isblank(*p)) - p++; - p = strchr(k = p, '='); - PARSE_CHECK(p, "could not find '=' in line"); - for (klen = p - k; klen && isblank(k[klen]); klen--); - p += 1; /* skip = */ - - while (isblank(*p)) - p++; - p = strstr(v = p, "\r\n"); - PARSE_CHECK(p, "could not find final \\r\\n in line"); - for (vlen = p - v; vlen && isblank(v[vlen]); vlen--); - p += 2; /* skip \r\n */ - - vtk = tokenize(v, vlen); - switch (tokenize(k, klen)) { -#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; break; - CASE(HELO_NAME, helo_name); - CASE(QUEUE_ID, queue_id); - CASE(SENDER, sender); - CASE(RECIPIENT, recipient); - CASE(RECIPIENT_COUNT, recipient_count); - CASE(CLIENT_ADDRESS, client_address); - CASE(CLIENT_NAME, client_name); - CASE(RCLIENT_NAME, rclient_name); - CASE(INSTANCE, instance); - CASE(SASL_METHOD, sasl_method); - CASE(SASL_USERNAME, sasl_username); - CASE(SASL_SENDER, sasl_sender); - CASE(SIZE, size); - CASE(CCERT_SUBJECT, ccert_subject); - CASE(CCERT_ISSUER, ccert_issuer); - CASE(CCSERT_FINGERPRINT, ccsert_fingerprint); - CASE(ENCRYPTION_PROTOCOL, encryption_protocol); - CASE(ENCRYPTION_CIPHER, encryption_cipher); - CASE(ENCRYPTION_KEYSIZE, encryption_keysize); - CASE(ETRN_DOMAIN, etrn_domain); -#undef CASE - - case PTK_REQUEST: - PARSE_CHECK(vtk == PTK_SMTPD_ACCESS_POLICY, - "unexpected `request' value: %.*s", vlen, v); - break; - - case PTK_PROTOCOL_NAME: - PARSE_CHECK(vtk == PTK_SMTP || vtk == PTK_ESMTP, - "unexpected `protocol_name' value: %.*s", vlen, v); - query->esmtp = vtk == PTK_ESMTP; - break; - - case PTK_PROTOCOL_STATE: - switch (vtk) { -#define CASE(name) case PTK_##name: query->state = SMTP_##name; break; - CASE(CONNECT); - CASE(EHLO); - CASE(HELO); - CASE(MAIL); - CASE(RCPT); - CASE(DATA); - CASE(END_OF_MESSAGE); - CASE(VRFY); - CASE(ETRN); - default: - PARSE_CHECK(false, "unexpected `protocol_state` value: %.*s", - vlen, v); -#undef CASE - } - break; - - default: - syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k); - break; - } - } - - return query->state == SMTP_UNKNOWN ? -1 : 0; -#undef PARSE_CHECK -} - -void *policy_run(int fd, void *data) -{ - query_t q; - query_init(&q); - - for (;;) { - int nb = buffer_read(&q.data, fd, -1); - const char *eoq; - - if (nb < 0) { - if (errno == EAGAIN || errno == EINTR) - continue; - UNIXERR("read"); - break; - } - if (nb == 0) { - if (q.data.len) - syslog(LOG_ERR, "unexpected end of data"); - break; - } - - eoq = strstr(q.data.data + MAX(0, q.data.len - 3), "\r\n\r\n"); - if (!eoq) - continue; - - if (postfix_parsejob(&q) < 0) - break; - - buffer_consume(&q.data, eoq + strlen("\r\n\r\n") - q.data.data); - if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) { - UNIXERR("write"); - break; - } - } - - query_wipe(&q); - close(fd); - return NULL; -} diff --git a/policy.h b/policy.h deleted file mode 100644 index 632baf8..0000000 --- a/policy.h +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************/ -/* pfixtools: a collection of postfix related tools */ -/* ~~~~~~~~~ */ -/* ________________________________________________________________________ */ -/* */ -/* Redistribution and use in source and binary forms, with or without */ -/* modification, are permitted provided that the following conditions */ -/* are met: */ -/* */ -/* 1. Redistributions of source code must retain the above copyright */ -/* notice, this list of conditions and the following disclaimer. */ -/* 2. Redistributions in binary form must reproduce the above copyright */ -/* notice, this list of conditions and the following disclaimer in the */ -/* documentation and/or other materials provided with the distribution. */ -/* 3. The names of its contributors may not be used to endorse or promote */ -/* products derived from this software without specific prior written */ -/* permission. */ -/* */ -/* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND */ -/* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE */ -/* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ -/* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS */ -/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR */ -/* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF */ -/* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS */ -/* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN */ -/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) */ -/* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF */ -/* THE POSSIBILITY OF SUCH DAMAGE. */ -/******************************************************************************/ - -/* - * Copyright © 2006-2007 Pierre Habouzit - */ - -#ifndef PFIXTOOLS_POLICY_H -#define PFIXTOOLS_POLICY_H - -void *policy_run(int fd, void *); - -#endif