/* products derived from this software without specific prior written */
/* permission. */
/* */
-/* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND */
-/* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE */
-/* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
-/* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS */
-/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR */
-/* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF */
-/* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS */
-/* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) */
-/* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF */
-/* THE POSSIBILITY OF SUCH DAMAGE. */
+/* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS */
+/* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED */
+/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE */
+/* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY */
+/* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL */
+/* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS */
+/* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) */
+/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, */
+/* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN */
+/* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */
+/* POSSIBILITY OF SUCH DAMAGE. */
+/* */
+/* Copyright (c) 2006-2008 the Authors */
+/* see AUTHORS and source files for details */
/******************************************************************************/
/*
MATCH_EMPTY,
} condition;
- char *value;
- ssize_t value_len;
+ static_str_t value;
} match_condition_t;
ARRAY(match_condition_t)
-#define CONDITION_INIT { PTK_UNKNOWN, false, MATCH_UNKNOWN, NULL, 0 }
+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 {
A(match_condition_t) conditions;
static inline void match_condition_wipe(match_condition_t *condition)
{
- p_delete(&condition->value);
- condition->value_len = 0;
+ char *str = (char*)condition->value.str;
+ p_delete(&str);
+ condition->value.str = NULL;
+ condition->value.len = 0;
}
static void match_config_delete(match_config_t **config)
#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);
CASE_OP('!', DIFFER);
CASE_OP('>', CONTAINS);
CASE_OP('<', CONTAINED);
- CASE_OP('1', EMPTY);
+ CASE_OP('#', EMPTY);
#undef CASE_OP
}
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);
+ condition.value.len = param->value_len - (p - param->value);
+ condition.value.str = p_dupstr(p, condition.value.len);
}
array_add(config->conditions, condition);
} break;
static inline bool match_condition(const match_condition_t *cond, const query_t *query)
{
-// const char *field = NULL;
+ const static_str_t *field = query_field_for_id(query, cond->field);
+ debug("running condition: \"%s\" %s %s\"%s\"",
+ field->str, condition_names[cond->condition],
+ cond->case_sensitive ? "" : "(alternative) ",
+ cond->value.str ? cond->value.str : "(none)");
+ switch (cond->condition) {
+ case MATCH_EQUAL:
+ case MATCH_DIFFER:
+ if (field == NULL || field->str == NULL) {
+ return cond->condition != MATCH_DIFFER;
+ }
+ if (cond->case_sensitive) {
+ return !!((strcmp(field->str, cond->value.str) == 0)
+ ^ (cond->condition == MATCH_DIFFER));
+ } else {
+ return !!((ascii_strcasecmp(field->str, cond->value.str) == 0)
+ ^ (cond->condition == MATCH_DIFFER));
+ }
+ break;
+
+ case MATCH_CONTAINS:
+ if (field == NULL || field->str == NULL) {
+ return false;
+ }
+ if (cond->case_sensitive) {
+ return strstr(field->str, cond->value.str);
+ } else {
+ return m_stristrn(field->str, cond->value.str, cond->value.len);
+ }
+ break;
+
+ case MATCH_CONTAINED:
+ if (field == NULL || field->str == NULL) {
+ return false;
+ }
+ if (cond->case_sensitive) {
+ return strstr(cond->value.str, field->str);
+ } else {
+ return m_stristr(cond->value.str, field->str);
+ }
+ break;
+
+ case MATCH_EMPTY:
+ return !!((field == NULL || field->len == 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.
*/
projects / apps / pfixtools.git / blobdiff