mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

[MEDIUM] acl: permit fetch() functions to set the result themselves

Browse Source 
For protocol analysis, it's not always convenient to have to run through
a fetch then a match against dummy values. It's easier to let the fetch()
function set the result itself. This obviously works only for boolean
values.
This commit is contained in:
Willy Tarreau 2008-07-20 10:13:37 +02:00
parent c6317703ce
commit a79534fce1
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types/acl.h
View File

@ -80,6 +80,10 @@ enum {
ACL_TEST_F_VOLATILE = (1<<2)|(1<<3)|(1<<4)|(1<<5)|(1<<6),
ACL_TEST_F_FETCH_MORE = 1 << 7, /* if test does not match, retry with next entry (for multi-match) */
ACL_TEST_F_MAY_CHANGE = 1 << 8, /* if test does not match, retry later (eg: request size) */
ACL_TEST_F_RES_SET = 1 << 9, /* for fetch() function to assign the result without calling match() */
ACL_TEST_F_RES_PASS = 1 << 10,/* with SET_RESULT, sets result to PASS (defaults to FAIL) */
ACL_TEST_F_SET_RES_PASS = (ACL_TEST_F_RES_SET|ACL_TEST_F_RES_PASS), /* sets result to PASS */
ACL_TEST_F_SET_RES_FAIL = (ACL_TEST_F_RES_SET), /* sets result to FAIL */
};
/* ACLs can be evaluated on requests and on responses, and on partial or complete data */

18
src/acl.c
View File

@ -974,11 +974,19 @@ int acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct session *l4, v
continue;
}
/* apply all tests to this value */
list_for_each_entry(pattern, &expr->patterns, list) {
acl_res |= expr->kw->match(&test, pattern);
if (acl_res == ACL_PAT_PASS)
break;
if (test.flags & ACL_TEST_F_RES_SET) {
if (test.flags & ACL_TEST_F_RES_PASS)
acl_res |= ACL_PAT_PASS;
else
acl_res |= ACL_PAT_FAIL;
}
else {
/* call the match() function for all tests on this value */
list_for_each_entry(pattern, &expr->patterns, list) {
acl_res |= expr->kw->match(&test, pattern);
if (acl_res == ACL_PAT_PASS)
break;
}
}
/*
* OK now acl_res holds the result of this expression