X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=888a39382291191726f348537dca2b945c67a6ed;hp=59751676a371c46b16a36ae475995ff9c1c637d6;hb=6b977cdc115af3cebdf488f27d106788e8bd9461;hpb=0ad0ac6446aa4490800addafd8219f0f2a968c4d diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c index 5975167..888a393 100644 --- a/postlicyd/main-postlicyd.c +++ b/postlicyd/main-postlicyd.c @@ -16,17 +16,20 @@ /* 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. */ +/* THIS SOFTWARE IS PROVIDED BY THE 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 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 (c) 2006-2008 the Authors */ +/* see AUTHORS and source files for details */ /******************************************************************************/ /* @@ -41,20 +44,27 @@ #include "policy_tokens.h" #include "server.h" #include "config.h" -#include "postlicyd.h" +#include "query.h" #define DAEMON_NAME "postlicyd" -#define DAEMON_VERSION "0.3" +#define DAEMON_VERSION "0.5" #define DEFAULT_PORT 10000 #define RUNAS_USER "nobody" #define RUNAS_GROUP "nogroup" DECLARE_MAIN -static config_t *config = NULL; +typedef struct query_context_t { + query_t query; + filter_context_t context; + client_t *client; +} query_context_t; +static config_t *config = NULL; +static bool refresh = false; +static PA(client_t) busy = ARRAY_INIT; -static void *query_starter(server_t* server) +static void *query_starter(listener_t* server) { query_context_t *context = p_new(query_context_t, 1); filter_context_prepare(&context->context, context); @@ -72,87 +82,95 @@ static void query_stopper(void *data) static bool config_refresh(void *mconfig) { + refresh = true; if (filter_running > 0) { - sleep(1); return true; } - return config_reload(mconfig); + log_state = "refreshing "; + info("reloading configuration"); + bool ret = config_reload(mconfig); + log_state = ""; + foreach (client_t **server, busy) { + client_io_ro(*server); + }} + array_len(busy) = 0; + refresh = false; + return ret; } -static void policy_answer(server_t *pcy, const char *message) +static void policy_answer(client_t *pcy, const char *message) { - query_context_t *context = pcy->data; + query_context_t *context = client_data(pcy); const query_t* query = &context->query; + buffer_t *buf = client_output_buffer(pcy); - buffer_addstr(&pcy->obuf, "action="); - buffer_ensure(&pcy->obuf, m_strlen(message) + 64); - - ssize_t size = array_size(pcy->obuf) - array_len(pcy->obuf); - ssize_t format_size = query_format(array_ptr(pcy->obuf, array_len(pcy->obuf)), - size, message, query); - if (format_size == -1) { - buffer_addstr(&pcy->obuf, message); - } else if (format_size > size) { - buffer_ensure(&pcy->obuf, format_size + 1); - query_format(array_ptr(pcy->obuf, array_len(pcy->obuf)), - array_size(pcy->obuf) - array_len(pcy->obuf), - message, query); - array_len(pcy->obuf) += format_size; - } else { - array_len(pcy->obuf) += format_size; + /* Write reply "action=ACTION [text]" */ + buffer_addstr(buf, "action="); + if (!query_format_buffer(buf, message, query)) { + buffer_addstr(buf, message); } - buffer_addstr(&pcy->obuf, "\n\n"); - buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data); - server_rw(pcy); + buffer_addstr(buf, "\n\n"); + + /* Finalize query. */ + buf = client_input_buffer(pcy); + buffer_consume(buf, query->eoq - buf->data); + client_io_rw(pcy); } -static const filter_t *next_filter(server_t *pcy, const filter_t *filter, +static const filter_t *next_filter(client_t *pcy, const filter_t *filter, const query_t *query, const filter_hook_t *hook, bool *ok) { + char log_prefix[BUFSIZ]; + log_prefix[0] = '\0'; + +#define log_reply(Level, Msg, ...) \ + if (log_level >= LOG_ ## Level) { \ + if (log_prefix[0] == '\0') { \ + query_format(log_prefix, BUFSIZ, \ + config->log_format && config->log_format[0] ? \ + config->log_format : DEFAULT_LOG_FORMAT, query); \ + } \ + __log(LOG_ ## Level, "%s: " Msg, log_prefix, ##__VA_ARGS__); \ + } + + if (hook != NULL) { + query_context_t *context = client_data(pcy); + if (hook->counter >= 0 && hook->counter < MAX_COUNTERS && hook->cost > 0) { + context->context.counters[hook->counter] += hook->cost; + log_reply(DEBUG, "added %d to counter %d (now %u)", + hook->cost, hook->counter, + context->context.counters[hook->counter]); + } + } if (hook == NULL) { - warn("request client=%s, from=<%s>, to=<%s>: aborted", - query->client_name, - query->sender == NULL ? "undefined" : query->sender, - query->recipient == NULL ? "undefined" : query->recipient); + log_reply(WARNING, "aborted"); *ok = false; return NULL; } else if (hook->async) { - debug("request client=%s, from=<%s>, to=<%s>: " - "asynchronous filter from filter %s", - query->client_name, - query->sender == NULL ? "undefined" : query->sender, - query->recipient == NULL ? "undefined" : query->recipient, - filter->name); + log_reply(WARNING, "asynchronous filter from filter %s", filter->name); *ok = true; return NULL; } else if (hook->postfix) { - info("request client=%s, from=<%s>, to=<%s>: " - "awswer %s from filter %s: \"%s\"", - query->client_name, - query->sender == NULL ? "undefined" : query->sender, - query->recipient == NULL ? "undefined" : query->recipient, - htokens[hook->type], filter->name, hook->value); + log_reply(INFO, "answer %s from filter %s: \"%s\"", + htokens[hook->type], filter->name, hook->value); policy_answer(pcy, hook->value); *ok = true; return NULL; } else { - debug("request client=%s, from=<%s>, to=<%s>: " - "awswer %s from filter %s: next filter %s", - query->client_name, - query->sender == NULL ? "undefined" : query->sender, - query->recipient == NULL ? "undefined" : query->recipient, - htokens[hook->type], filter->name, - (array_ptr(config->filters, hook->filter_id))->name); + log_reply(DEBUG, "answer %s from filter %s: next filter %s", + htokens[hook->type], filter->name, + (array_ptr(config->filters, hook->filter_id))->name); return array_ptr(config->filters, hook->filter_id); } +#undef log_reply } -static bool policy_process(server_t *pcy, const config_t *mconfig) +static bool policy_process(client_t *pcy, const config_t *mconfig) { - query_context_t *context = pcy->data; + query_context_t *context = client_data(pcy); const query_t* query = &context->query; const filter_t *filter; if (mconfig->entry_points[query->state] == -1) { - warn("no filter defined for current protocol_state (%d)", query->state); + warn("no filter defined for current protocol_state (%s)", smtp_state_names[query->state].str); return false; } if (context->context.current_filter != NULL) { @@ -171,15 +189,22 @@ static bool policy_process(server_t *pcy, const config_t *mconfig) } } -static int policy_run(server_t *pcy, void* vconfig) +static int policy_run(client_t *pcy, void* vconfig) { - int search_offs = MAX(0, (int)(pcy->ibuf.len - 1)); - int nb = buffer_read(&pcy->ibuf, pcy->fd, -1); - const char *eoq; - query_context_t *context = pcy->data; - query_t *query = &context->query; - context->server = pcy; const config_t *mconfig = vconfig; + if (refresh) { + array_add(busy, pcy); + return 0; + } + + query_context_t *context = client_data(pcy); + query_t *query = &context->query; + context->client = pcy; + + buffer_t *buf = client_input_buffer(pcy); + int search_offs = MAX(0, (int)(buf->len - 1)); + int nb = client_read(pcy); + const char *eoq; if (nb < 0) { if (errno == EAGAIN || errno == EINTR) @@ -188,18 +213,27 @@ static int policy_run(server_t *pcy, void* vconfig) return -1; } if (nb == 0) { - if (pcy->ibuf.len) + if (buf->len) err("unexpected end of data"); return -1; } - if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n"))) + if (!(eoq = strstr(buf->data + search_offs, "\n\n"))) { return 0; + } - if (!query_parse(pcy->data, pcy->ibuf.data)) + if (!query_parse(query, buf->data)) { return -1; + } query->eoq = eoq + strlen("\n\n"); - server_none(pcy); + + /* The instance changed => reset the static context */ + if (query->instance.str == NULL || query->instance.len == 0 + || strcmp(context->context.instance, query->instance.str) != 0) { + filter_context_clean(&context->context); + m_strcat(context->context.instance, 64, query->instance.str); + } + client_io_none(pcy); return policy_process(pcy, mconfig) ? 0 : -1; } @@ -210,14 +244,17 @@ static void policy_async_handler(filter_context_t *context, const filter_t *filter = context->current_filter; query_context_t *qctx = context->data; query_t *query = &qctx->query; - server_t *server = qctx->server; + client_t *server = qctx->client; context->current_filter = next_filter(server, filter, query, hook, &ok); if (context->current_filter != NULL) { ok = policy_process(server, config); } if (!ok) { - server_release(server); + client_release(server); + } + if (refresh && filter_running == 0) { + config_refresh(config); } } @@ -226,12 +263,13 @@ static int postlicyd_init(void) filter_async_handler_register(policy_async_handler); return 0; } -module_init(postlicyd_init); -int start_listener(int port) +static void postlicyd_shutdown(void) { - return start_server(port, NULL, NULL); + array_deep_wipe(busy, client_delete); } +module_init(postlicyd_init); +module_exit(postlicyd_shutdown); /* administrivia {{{ */ @@ -245,6 +283,7 @@ void usage(void) " -f stay in foreground\n" " -d grow logging level\n" " -u unsafe mode (don't drop privileges)\n" + " -c check-conf\n" , stderr); } @@ -257,8 +296,9 @@ int main(int argc, char *argv[]) bool daemonize = true; int port = DEFAULT_PORT; bool port_from_cli = false; + bool check_conf = false; - for (int c = 0; (c = getopt(argc, argv, "ufd" "l:p:")) >= 0; ) { + for (int c = 0; (c = getopt(argc, argv, "hufdc" "l:p:")) >= 0; ) { switch (c) { case 'p': pidfile = optarg; @@ -276,6 +316,11 @@ int main(int argc, char *argv[]) case 'd': ++log_level; break; + case 'c': + check_conf = true; + daemonize = false; + unsafe = true; + break; default: usage(); return EXIT_FAILURE; @@ -291,7 +336,10 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - info("starting %s v%s...", DAEMON_NAME, DAEMON_VERSION); + if (check_conf) { + return config_check(argv[optind]) ? EXIT_SUCCESS : EXIT_FAILURE; + } + info("%s v%s...", DAEMON_NAME, DAEMON_VERSION); if (pidfile_open(pidfile) < 0) { crit("unable to write pidfile %s", pidfile); @@ -318,7 +366,7 @@ int main(int argc, char *argv[]) pidfile_refresh(); - if (start_listener(config->port) < 0) { + if (start_listener(config->port) == NULL) { return EXIT_FAILURE; } else { return server_loop(query_starter, query_stopper,