[MAJOR] implement tcp request content inspection
Some people need to inspect contents of TCP requests before
deciding to forward a connection or not. A future extension
of this demand might consist in selecting a server farm
depending on the protocol detected in the request.
For this reason, a new state CL_STINSPECT has been added on
the client side. It is immediately entered upon accept() if
the statement "tcp-request inspect-delay <xxx>" is found in
the frontend configuration. Haproxy will then wait up to
this amount of time trying to find a matching ACL, and will
either accept or reject the connection depending on the
"tcp-request content <action> {if|unless}" rules, where
<action> is either "accept" or "reject".
Note that it only waits that long if no definitive verdict
can be found earlier. That generally implies calling a fetch()
function which does not have enough information to decode
some contents, or a match() function which only finds the
beginning of what it's looking for.
It is only at the ACL level that partial data may be processed
as such, because we need to distinguish between MISS and FAIL
*before* applying the term negation.
Thus it is enough to add "| ACL_PARTIAL" to the last argument
when calling acl_exec_cond() to indicate that we expect
ACL_PAT_MISS to be returned if some data is missing (for
fetch() or match()). This is the only case we may return
this value. For this reason, the ACL check in process_cli()
has become a lot simpler.
A new ACL "req_len" of type "int" has been added. Right now
it is already possible to drop requests which talk too early
(eg: for SMTP) or which don't talk at all (eg: HTTP/SSL).
Also, the acl fetch() functions have been extended in order
to permit reporting of missing data in case of fetch failure,
using the ACL_TEST_F_MAY_CHANGE flag.
The default behaviour is unchanged, and if no rule matches,
the request is accepted.
As a side effect, all layer 7 fetching functions have been
cleaned up so that they now check for the validity of the
layer 7 pointer before dereferencing it.
diff --git a/src/client.c b/src/client.c
index a40c2a4..e76a741 100644
--- a/src/client.c
+++ b/src/client.c
@@ -168,7 +168,10 @@
* backend must be assigned if set.
*/
if (p->mode == PR_MODE_HTTP) {
- s->cli_state = CL_STHEADERS;
+ if (s->fe->tcp_req.inspect_delay)
+ s->cli_state = CL_STINSPECT;
+ else
+ s->cli_state = CL_STHEADERS;
} else {
/* We must assign any default backend now since
* there will be no header processing.
@@ -178,7 +181,10 @@
s->be = p->defbe.be;
s->flags |= SN_BE_ASSIGNED;
}
- s->cli_state = CL_STDATA; /* no HTTP headers for non-HTTP proxies */
+ if (s->fe->tcp_req.inspect_delay)
+ s->cli_state = CL_STINSPECT;
+ else
+ s->cli_state = CL_STDATA; /* no HTTP headers for non-HTTP proxies */
}
s->srv_state = SV_STIDLE;
@@ -340,7 +346,7 @@
buffer_init(s->req);
s->req->rlim += BUFSIZE;
- if (s->cli_state == CL_STHEADERS) /* reserve some space for header rewriting */
+ if (p->mode == PR_MODE_HTTP) /* reserve some space for header rewriting */
s->req->rlim -= MAXREWRITE;
s->req->rto = s->fe->timeout.client;
@@ -390,6 +396,7 @@
s->rep->rex = TICK_ETERNITY;
s->rep->wex = TICK_ETERNITY;
s->txn.exp = TICK_ETERNITY;
+ s->inspect_exp = TICK_ETERNITY;
t->expire = TICK_ETERNITY;
if (s->fe->timeout.client) {
@@ -407,6 +414,10 @@
s->txn.exp = tick_add(now_ms, s->fe->timeout.httpreq);
t->expire = tick_first(t->expire, s->txn.exp);
}
+ else if (s->cli_state == CL_STINSPECT && s->fe->tcp_req.inspect_delay) {
+ s->inspect_exp = tick_add(now_ms, s->fe->tcp_req.inspect_delay);
+ t->expire = tick_first(t->expire, s->inspect_exp);
+ }
if (p->mode != PR_MODE_HEALTH)
task_wakeup(t);