} match_condition_t;
ARRAY(match_condition_t)
+static const char *condition_names[] = {
+ "unknown",
+ "equals to",
+ "differs from",
+ "contains",
+ "is contained",
+ "is empty"
+};
+
#define CONDITION_INIT { PTK_UNKNOWN, false, MATCH_UNKNOWN, NULL, 0 }
typedef struct match_config_t {
#define PARSE_CHECK(Expr, Str, ...) \
if (!(Expr)) { \
- syslog(LOG_ERR, Str, ##__VA_ARGS__); \
- match_config_delete(&config); \
+ err(Str, ##__VA_ARGS__); \
+ match_config_delete(&config); \
return false; \
}
condition.field = policy_tokenize(p, n - p);
PARSE_CHECK(condition.field >= PTK_HELO_NAME
&& condition.field < PTK_SMTPD_ACCESS_POLICY,
- "invalid field name %.*s", n - p, p);
+ "invalid field name %.*s", (int)(n - p), p);
p = skipspaces(n);
n = p + 1;
PARSE_CHECK(IS_OP_START(*p) && IS_OP_END(*n),
PARSE_CHECK(condition.condition != MATCH_UNKNOWN,
"invalid operator");
if (condition.condition != MATCH_EMPTY) {
- p = m_strnextsp(n + 1);
+ p = skipspaces(n + 1);
PARSE_CHECK(*p, "no value defined to check the condition");
condition.value_len = param->value_len - (p - param->value);
condition.value = p_dupstr(p, condition.value_len);
CASE(HELO_NAME, helo_name)
CASE(QUEUE_ID, queue_id)
CASE(SENDER, sender)
+ CASE(SENDER_DOMAIN, sender_domain)
CASE(RECIPIENT, recipient)
+ CASE(RECIPIENT_DOMAIN, recipient_domain)
CASE(RECIPIENT_COUNT, recipient_count)
CASE(CLIENT_ADDRESS, client_address)
CASE(CLIENT_NAME, client_name)
#undef CASE
default: return false;
}
+ debug("running condition: \"%s\" %s %s\"%s\"",
+ field, condition_names[cond->condition],
+ cond->case_sensitive ? "" : "(alternative) ",
+ cond->value ? cond->value : "(none)");
switch (cond->condition) {
case MATCH_EQUAL:
case MATCH_DIFFER:
return true;
}
-static filter_result_t match_filter(const filter_t *filter, const query_t *query)
+static filter_result_t match_filter(const filter_t *filter, const query_t *query,
+ filter_context_t *context)
{
const match_config_t *config = filter->data;
foreach (const match_condition_t *condition, config->conditions) {
bool r = match_condition(condition, query);
if (!r && config->match_all) {
+ debug("condition failed, match_all failed");
return HTK_FAIL;
} else if (r && !(config->match_all)) {
+ debug("condition succeed, not-match_all succeed");
return HTK_MATCH;
}
}}
if (config->match_all) {
+ debug("all conditions matched, match_all succeed");
return HTK_MATCH;
} else {
+ debug("no condition matched, not-match_all failed");
return HTK_FAIL;
}
}
static int match_init(void)
{
filter_type_t type = filter_register("match", match_filter_constructor,
- match_filter_destructor, match_filter);
+ match_filter_destructor, match_filter,
+ NULL, NULL);
/* Hooks.
*/
(void)filter_hook_register(type, "abort");