X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fgreylist.c;h=4cbe8b90e25a03a0fc4f40c22f5a55472b5579a0;hb=ae0c2eb5d2ea501fd9e458fc138696c268a14569;hp=aee9a6b6f5b2e63f956ce55fb20580a40131d4bd;hpb=87c3b6012886b05ab8ff36098e1e92e9afb1759c;p=apps%2Fpfixtools.git diff --git a/postlicyd/greylist.c b/postlicyd/greylist.c index aee9a6b..4cbe8b9 100644 --- a/postlicyd/greylist.c +++ b/postlicyd/greylist.c @@ -97,10 +97,11 @@ 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"); + info("database cleanup started"); awl_db = tcbdbnew(); if (tcbdbopen(awl_db, path, BDBOREADER)) { tmp_db = tcbdbnew(); @@ -130,28 +131,41 @@ 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; } + } else { + info("database cleanup finished: nothing to do, %u entries", new_count); } - syslog(LOG_INFO, "database cleanup stat: before %u entries, after %d entries", - old_count, new_count); } /* 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,7 +180,7 @@ static bool greylist_initialize(greylist_config_t *config, if (config->client_awl) { snprintf(path, sizeof(path), "%s/%swhitelist.db", directory, prefix); - syslog(LOG_INFO, "loading auto-whitelist database"); + 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)); @@ -176,7 +190,7 @@ static bool greylist_initialize(greylist_config_t *config, } snprintf(path, sizeof(path), "%s/%sgreylist.db", directory, prefix); - syslog(LOG_INFO, "loading greylist database"); + info("loading greylist database"); config->obj_db = greylist_db_get(config, path, true, sizeof(struct obj_entry), (db_entry_checker_t)(greylist_check_object)); @@ -282,6 +296,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)); @@ -300,23 +316,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; } } @@ -331,7 +351,7 @@ static bool try_greylist(const greylist_config_t *config, 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 @@ -339,6 +359,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. @@ -354,19 +379,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; } @@ -399,7 +423,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; \ } @@ -434,11 +458,12 @@ 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"); + warn("greylisting only works as smtpd_recipient_restrictions"); return HTK_ABORT; } @@ -451,7 +476,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");