X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fgreylist.c;h=b2ea86cd9bee5d1ba3dab2c253e463edb67b7bde;hb=8cecbefa8f63c37cf7a8e9932eea137edcdd5773;hp=e80a9dfc83446f4e7e053e9d094caef058ce5bbc;hpb=6d516b6e6da4768baf29f3d9abe39e6c45e1af04;p=apps%2Fpfixtools.git diff --git a/postlicyd/greylist.c b/postlicyd/greylist.c index e80a9df..b2ea86c 100644 --- a/postlicyd/greylist.c +++ b/postlicyd/greylist.c @@ -41,6 +41,8 @@ typedef struct greylist_config_t { unsigned lookup_by_host : 1; + unsigned no_sender : 1; + unsigned no_recipient : 1; int delay; int retry_window; int client_awl; @@ -51,6 +53,8 @@ typedef struct greylist_config_t { } greylist_config_t; #define GREYLIST_INIT { .lookup_by_host = false, \ + .no_sender = false, \ + .no_recipient = false, \ .delay = 300, \ .retry_window = 2 * 24 * 3600, \ .client_awl = 5, \ @@ -97,16 +101,17 @@ static TCBDB *greylist_db_get(const greylist_config_t *config, uint32_t old_count = 0; uint32_t new_count = 0; bool replace = false; + bool trashable = false; char tmppath[PATH_MAX]; snprintf(tmppath, PATH_MAX, "%s.tmp", path); - syslog(LOG_INFO, "database cleanup started"); awl_db = tcbdbnew(); if (tcbdbopen(awl_db, path, BDBOREADER)) { tmp_db = tcbdbnew(); - if (tcbdbopen(tmp_db, tmppath, BDBOWRITER | BDBOTRUNC)) { + if (tcbdbopen(tmp_db, tmppath, BDBOWRITER | BDBOCREAT | BDBOTRUNC)) { BDBCUR *cur = tcbdbcurnew(awl_db); TCXSTR *key, *value; + key = tcxstrnew(); value = tcxstrnew(); if (tcbdbcurfirst(cur)) { @@ -129,29 +134,42 @@ static TCBDB *greylist_db_get(const greylist_config_t *config, tcxstrdel(value); tcbdbcurdel(cur); tcbdbsync(tmp_db); + } else { + warn("cannot run database cleanup: can't open destination database: %s", + tcbdberrmsg(tcbdbecode(awl_db))); } tcbdbdel(tmp_db); + } else { + int ecode = tcbdbecode(awl_db); + warn("can not open database: %s", tcbdberrmsg(ecode)); + trashable = ecode != TCENOPERM && ecode != TCEOPEN && ecode != TCENOFILE && ecode != TCESUCCESS; } tcbdbdel(awl_db); /** Cleanup successful, replace the old database with the new one. */ - if (replace) { + if (trashable) { + info("database cleanup finished: database was corrupted, create a new one"); + unlink(path); + } else if (replace) { + info("database cleanup finished: before %u entries, after %d entries", + old_count, new_count); unlink(path); if (rename(tmppath, path) != 0) { UNIXERR("rename"); return NULL; } - syslog(LOG_INFO, "database cleanup stat: before %u entries, after %d entries", - old_count, new_count); + } else { + unlink(tmppath); + info("database cleanup finished: nothing to do, %u entries", new_count); } - syslog(LOG_INFO, "database cleanup finished"); } /* Effectively open the database. */ awl_db = tcbdbnew(); if (!tcbdbopen(awl_db, path, BDBOWRITER | BDBOCREAT)) { + err("can not open database: %s", tcbdberrmsg(tcbdbecode(awl_db))); tcbdbdel(awl_db); return NULL; } @@ -166,6 +184,7 @@ static bool greylist_initialize(greylist_config_t *config, if (config->client_awl) { snprintf(path, sizeof(path), "%s/%swhitelist.db", directory, prefix); + info("loading auto-whitelist database"); config->awl_db = greylist_db_get(config, path, true, sizeof(struct awl_entry), (db_entry_checker_t)(greylist_check_awlentry)); @@ -175,6 +194,7 @@ static bool greylist_initialize(greylist_config_t *config, } snprintf(path, sizeof(path), "%s/%sgreylist.db", directory, prefix); + info("loading greylist database"); config->obj_db = greylist_db_get(config, path, true, sizeof(struct obj_entry), (db_entry_checker_t)(greylist_check_object)); @@ -280,6 +300,8 @@ static bool try_greylist(const greylist_config_t *config, #define INCR_AWL \ aent.count++; \ aent.last = now; \ + debug("whitelist entry for %.*s updated, count %d", \ + c_addrlen, c_addr, aent.count); \ tcbdbput(config->awl_db, c_addr, c_addrlen, &aent, \ sizeof(aent)); @@ -298,23 +320,27 @@ static bool try_greylist(const greylist_config_t *config, res = tcbdbget3(config->awl_db, c_addr, c_addrlen, &len); if (res && len == sizeof(aent)) { memcpy(&aent, res, len); + debug("client %.*s has a whitelist entry, count is %d", + c_addrlen, c_addr, aent.count); } if (!greylist_check_awlentry(config, &aent, now)) { aent.count = 0; aent.last = 0; + debug("client %.*s whitelist entry too old", + c_addrlen, c_addr); } /* Whitelist if count is enough. */ if (aent.count >= config->client_awl) { + debug("client %.*s whitelisted", c_addrlen, c_addr); if (now < aent.last + 3600) { INCR_AWL } /* OK. */ - //syslog(LOG_INFO, "client whitelisted"); return true; } } @@ -323,13 +349,14 @@ static bool try_greylist(const greylist_config_t *config, */ klen = snprintf(key, sizeof(key), "%s/%s/%s", c_net(config, c_addr, c_name, cnet, sizeof(cnet)), - sender_normalize(sender, sbuf, sizeof(sbuf)), rcpt); + config->no_sender ? "" : sender_normalize(sender, sbuf, sizeof(sbuf)), + config->no_recipient ? "" : rcpt); klen = MIN(klen, ssizeof(key) - 1); res = tcbdbget3(config->obj_db, key, klen, &len); if (res && len == sizeof(oent)) { memcpy(&oent, res, len); - greylist_check_object(config, &oent, now); + debug("found a greylist entry for %.*s", klen, key); } /* Discard stored first-seen if it is the first retrial and @@ -337,6 +364,11 @@ static bool try_greylist(const greylist_config_t *config, */ if (!greylist_check_object(config, &oent, now)) { oent.first = now; + debug("invalid retry for %.*s: %s", klen, key, + (config->max_age > 0 && now - oent.last > config->max_age) ? + "too old entry" + : (oent.last - oent.first < config->delay ? + "retry too early" : "retry too late" )); } /* Update. @@ -352,19 +384,18 @@ static bool try_greylist(const greylist_config_t *config, * - client whitelisted already ? -> update last-seen timestamp. */ if (oent.first + config->delay < now) { + debug("valid retry for %.*s", klen, key); if (config->client_awl) { INCR_AWL } /* OK */ - //syslog(LOG_INFO, "client whitelisted"); return true; } /* DUNNO */ - //syslog(LOG_INFO, "client greylisted"); return false; } @@ -397,7 +428,7 @@ static bool greylist_filter_constructor(filter_t *filter) #define PARSE_CHECK(Expr, Str, ...) \ if (!(Expr)) { \ - syslog(LOG_ERR, Str, ##__VA_ARGS__); \ + err(Str, ##__VA_ARGS__); \ greylist_config_delete(&config); \ return false; \ } @@ -407,6 +438,8 @@ static bool greylist_filter_constructor(filter_t *filter) FILTER_PARAM_PARSE_STRING(PATH, path); FILTER_PARAM_PARSE_STRING(PREFIX, prefix); FILTER_PARAM_PARSE_BOOLEAN(LOOKUP_BY_HOST, config->lookup_by_host); + FILTER_PARAM_PARSE_BOOLEAN(NO_SENDER, config->no_sender); + FILTER_PARAM_PARSE_BOOLEAN(NO_RECIPIENT, config->no_recipient); FILTER_PARAM_PARSE_INT(RETRY_WINDOW, config->retry_window); FILTER_PARAM_PARSE_INT(CLIENT_AWL, config->client_awl); FILTER_PARAM_PARSE_INT(DELAY, config->delay); @@ -432,11 +465,16 @@ static void greylist_filter_destructor(filter_t *filter) } static filter_result_t greylist_filter(const filter_t *filter, - const query_t *query) + const query_t *query, + filter_context_t *context) { const greylist_config_t *config = filter->data; - if (query->state != SMTP_RCPT) { - syslog(LOG_WARNING, "greylisting only works as smtpd_recipient_restrictions"); + if (!config->no_recipient && query->state != SMTP_RCPT) { + warn("greylisting on recipient only works as smtpd_recipient_restrictions"); + return HTK_ABORT; + } + if (!config->no_sender && query->state < SMTP_MAIL) { + warn("greylisting on sender must be performed after (or at) MAIL TO"); return HTK_ABORT; } @@ -449,7 +487,7 @@ static int greylist_init(void) { filter_type_t type = filter_register("greylist", greylist_filter_constructor, greylist_filter_destructor, - greylist_filter); + greylist_filter, NULL, NULL); /* Hooks. */ (void)filter_hook_register(type, "abort"); @@ -460,6 +498,8 @@ static int greylist_init(void) /* Parameters. */ (void)filter_param_register(type, "lookup_by_host"); + (void)filter_param_register(type, "no_sender"); + (void)filter_param_register(type, "no_recipient"); (void)filter_param_register(type, "delay"); (void)filter_param_register(type, "retry_window"); (void)filter_param_register(type, "client_awl");