upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 14:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BUG/MAJOR: tcp: tcp rulesets were still broken

Browse source 
Commit cc87a11 ("MEDIUM: tcp: add register keyword system.") broke the
TCP ruleset by merging custom rules and accept. It was fixed a first time
by commit e91ffd0 ("BUG/MAJOR: tcp: only call registered actions when
they're registered") but the accept action still didn't work anymore
and was causing the matching rule to simply be ignored.

Since the code introduced a very fragile behaviour by not even mentionning
that accept and custom were silently merged, let's fix this once for all by
adding an explicit check for the accept action. Nevertheless, as previously
mentionned, the action should be changed so that custom is the only action
and the continue vs break indication directly comes from the callee.

No backport is needed, this bug only affects 1.6-dev.
This commit is contained in:
Willy Tarreau 2015-07-04 11:36:30 +02:00
parent 46175dd81d
commit 27f78241e6
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/proto_tcp.c
View file

@ -1158,7 +1158,10 @@ int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit)
if (ret) {
resume_execution:
/* we have a matching rule. */
if (rule->action == TCP_ACT_REJECT) {
if (rule->action == TCP_ACT_ACCEPT) {
break;
}
else if (rule->action == TCP_ACT_REJECT) {
channel_abort(req);
channel_abort(&s->res);
req->analysers = 0;
@ -1323,7 +1326,10 @@ int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit)
if (ret) {
resume_execution:
/* we have a matching rule. */
if (rule->action == TCP_ACT_REJECT) {
if (rule->action == TCP_ACT_ACCEPT) {
break;
}
else if (rule->action == TCP_ACT_REJECT) {
channel_abort(rep);
channel_abort(&s->req);
rep->analysers = 0;
@ -1399,7 +1405,10 @@ int tcp_exec_req_rules(struct session *sess)
if (ret) {
/* we have a matching rule. */
if (rule->action == TCP_ACT_REJECT) {
if (rule->action == TCP_ACT_ACCEPT) {
break;
}
else if (rule->action == TCP_ACT_REJECT) {
sess->fe->fe_counters.denied_conn++;
if (sess->listener->counters)
sess->listener->counters->denied_conn++;