} 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; \
}
#define IS_OP_END(N) \
((N) == '=' || (N) == 'i')
match_condition_t condition = CONDITION_INIT;
- const char *p = m_strnextsp(param->value);
+ const char *p = skipspaces(param->value);
const char *n = p + 1;
PARSE_CHECK(isalnum(*p), "invalid field name");
for (n = p + 1 ; *n && (isalnum(*n) || *n == '_') ; ++n);
- PARSE_CHECK(*n &&
- (isspace(*n) || IS_OP_START(*n)),
+ PARSE_CHECK(*n && (isspace(*n) || IS_OP_START(*n)),
"invalid condition, expected operator after field name");
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);
- p = m_strnextsp(n);
+ "invalid field name %.*s", (int)(n - p), p);
+ p = skipspaces(n);
n = p + 1;
PARSE_CHECK(IS_OP_START(*p) && IS_OP_END(*n),
"invalid operator %2s", p);
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);
static inline bool match_condition(const match_condition_t *cond, const query_t *query)
{
- const char *field = NULL;
- switch (cond->field) {
-#define CASE(Up, Low) \
- case PTK_ ## Up: field = query->Low; break;
- CASE(HELO_NAME, helo_name)
- CASE(QUEUE_ID, queue_id)
- CASE(SENDER, sender)
- CASE(RECIPIENT, recipient)
- CASE(RECIPIENT_COUNT, recipient_count)
- CASE(CLIENT_ADDRESS, client_address)
- CASE(CLIENT_NAME, client_name)
- CASE(REVERSE_CLIENT_NAME, reverse_client_name)
- CASE(INSTANCE, instance)
- CASE(SASL_METHOD, sasl_method)
- CASE(SASL_USERNAME, sasl_username)
- CASE(SASL_SENDER, sasl_sender)
- CASE(SIZE, size)
- CASE(CCERT_SUBJECT, ccert_subject)
- CASE(CCERT_ISSUER, ccert_issuer)
- CASE(CCERT_FINGERPRINT, ccert_fingerprint)
- CASE(ENCRYPTION_PROTOCOL, encryption_protocol)
- CASE(ENCRYPTION_CIPHER, encryption_cipher)
- CASE(ENCRYPTION_KEYSIZE, encryption_keysize)
- CASE(ETRN_DOMAIN, etrn_domain)
- CASE(STRESS, stress)
-#undef CASE
- default: return false;
- }
+ const char *field = query_field_for_id(query, cond->field);
+ 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 !!((strcmp(field, cond->value) == 0)
^ (cond->condition == MATCH_DIFFER));
} else {
- return !!((strcasecmp(field, cond->value) == 0)
+ return !!((ascii_strcasecmp(field, cond->value) == 0)
^ (cond->condition == MATCH_DIFFER));
}
break;
if (cond->case_sensitive) {
return strstr(field, cond->value);
} else {
- /* XXX: GNU Sources */
- return strcasestr(field, cond->value);
+ return m_stristrn(field, cond->value, cond->value_len);
}
break;
if (cond->case_sensitive) {
return strstr(cond->value, field);
} else {
- /* XXX: GNU Sources */
- return strcasestr(cond->value, field);
+ return m_stristr(cond->value, field);
}
break;
case MATCH_EMPTY:
- return !!(!!(field == NULL || *field == '\0')) ^ (!!cond->case_sensitive);
+ return !!((field == NULL || *field == '\0') ^ (!cond->case_sensitive));
default:
assert(false && "invalid condition type");
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) {
- return HTK_FALSE;
+ debug("condition failed, match_all failed");
+ return HTK_FAIL;
} else if (r && !(config->match_all)) {
- return HTK_TRUE;
+ debug("condition succeed, not-match_all succeed");
+ return HTK_MATCH;
}
}}
if (config->match_all) {
- return HTK_TRUE;
+ debug("all conditions matched, match_all succeed");
+ return HTK_MATCH;
} else {
- return HTK_FALSE;
+ 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");
(void)filter_hook_register(type, "error");
- (void)filter_hook_register(type, "true");
- (void)filter_hook_register(type, "false");
+ (void)filter_hook_register(type, "match");
+ (void)filter_hook_register(type, "fail");
/* Parameters.
*/