#include "buffer.h"
#include "common.h"
-#include "epoll.h"
#include "policy_tokens.h"
#include "server.h"
#include "config.h"
#include "postlicyd.h"
#define DAEMON_NAME "postlicyd"
-#define DAEMON_VERSION "0.2"
+#define DAEMON_VERSION "0.3"
#define DEFAULT_PORT 10000
#define RUNAS_USER "nobody"
#define RUNAS_GROUP "nogroup"
DECLARE_MAIN
-static config_t *config = NULL;
-
+static config_t *config = NULL;
+static bool refresh = false;
+static PA(server_t) busy = ARRAY_INIT;
static void *query_starter(server_t* server)
{
static bool config_refresh(void *mconfig)
{
- return config_reload(mconfig);
+ refresh = true;
+ if (filter_running > 0) {
+ return true;
+ }
+ bool ret = config_reload(mconfig);
+ foreach (server_t **server, busy) {
+ server_ro(*server);
+ }}
+ array_len(busy) = 0;
+ refresh = false;
+ return ret;
}
-__attribute__((format(printf,2,0)))
-static void policy_answer(server_t *pcy, const char *fmt, ...)
+static void policy_answer(server_t *pcy, const char *message)
{
- va_list args;
query_context_t *context = pcy->data;
const query_t* query = &context->query;
buffer_addstr(&pcy->obuf, "action=");
- va_start(args, fmt);
- buffer_addvf(&pcy->obuf, fmt, args);
- va_end(args);
+ 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;
+ }
buffer_addstr(&pcy->obuf, "\n\n");
buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data);
- epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
+ server_rw(pcy);
+}
+
+static const filter_t *next_filter(server_t *pcy, const filter_t *filter,
+ const query_t *query, const filter_hook_t *hook, bool *ok) {
+ if (hook != NULL) {
+ query_context_t *context = pcy->data;
+ if (hook->counter >= 0 && hook->counter < MAX_COUNTERS && hook->cost > 0) {
+ context->context.counters[hook->counter] += hook->cost;
+ debug("request client=%s, from=<%s>, to=<%s>: added %d to counter %d (now %u)",
+ query->client_name,
+ query->sender == NULL ? "undefined" : query->sender,
+ query->recipient == NULL ? "undefined" : query->recipient,
+ 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);
+ *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);
+ *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);
+ 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);
+ return array_ptr(config->filters, hook->filter_id);
+ }
}
static bool policy_process(server_t *pcy, const config_t *mconfig)
}
context->context.current_filter = NULL;
while (true) {
+ bool ok = false;
const filter_hook_t *hook = filter_run(filter, query, &context->context);
- 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);
- return false;
- } 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);
- return true;
- } 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);
- policy_answer(pcy, "%s", hook->value);
- return true;
- } 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(mconfig->filters, hook->filter_id))->name);
- filter = array_ptr(mconfig->filters, hook->filter_id);
+ filter = next_filter(pcy, filter, query, hook, &ok);
+ if (filter == NULL) {
+ return ok;
}
}
}
static int policy_run(server_t *pcy, void* vconfig)
{
+ if (refresh) {
+ array_add(busy, pcy);
+ return 0;
+ }
+
int search_offs = MAX(0, (int)(pcy->ibuf.len - 1));
int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
const char *eoq;
if (!query_parse(pcy->data, pcy->ibuf.data))
return -1;
query->eoq = eoq + strlen("\n\n");
- epoll_modify(pcy->fd, 0, pcy);
+ if (query->instance == NULL || strcmp(context->context.instance, query->instance) != 0) {
+ filter_context_clean(&context->context);
+ m_strcat(context->context.instance, 64, query->instance);
+ }
+ server_none(pcy);
return policy_process(pcy, mconfig) ? 0 : -1;
}
static void policy_async_handler(filter_context_t *context,
const filter_hook_t *hook)
{
+ bool ok = false;
const filter_t *filter = context->current_filter;
query_context_t *qctx = context->data;
query_t *query = &qctx->query;
server_t *server = qctx->server;
- 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);
- context->current_filter = array_ptr(config->filters, hook->filter_id);
-
- if (!policy_process(server, config)) {
+ 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);
}
+ if (refresh && filter_running == 0) {
+ config_refresh(config);
+ }
}
static int postlicyd_init(void)
filter_async_handler_register(policy_async_handler);
return 0;
}
+
+static void postlicyd_shutdown(void)
+{
+ array_deep_wipe(busy, server_delete);
+}
module_init(postlicyd_init);
+module_exit(postlicyd_shutdown);
int start_listener(int port)
{
projects / apps / pfixtools.git / blobdiff