BUG/MINOR: tcp-rules: Don't forward close during tcp-response content rules eval

When the tcp-response content ruleset evaluation is delayed because of an
ACL condition, the close forwarding on the client side is not explicitly
blocked. So it is possible to close the client side before the end of the
response evaluation.

To fix the issue, this is now done in all cases where some data are
missing. Concretely, channel_dont_close() is called in "missing_data" goto
label.

Note it is only a theorical bug (or pending bug). It is not possible to
trigger it for now because an ACL cannot wait for more data when a close was
received. But the code remains a bit weak. It is safer this way. It is
especially mandatory for the "force yield" option that should be added soon.

This patch could be backported to all stable versions.

(cherry picked from commit 04bbfa4354800b893f03294bd02475a16d90ec85)
[wt: trivial ctx adjustment]
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit ba7be506130d5b6554f6db1fead55dde97bc14dd)
[ad: context issue due to undefined stream waiting_entity member]
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 2613056..cbf662a 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -363,7 +363,6 @@ resume_execution:
                                                        s->last_rule_line = rule->conf.line;
                                                        goto internal;
                                                }
-                                               channel_dont_close(rep);
                                                goto missing_data;
                                        case ACT_RET_DENY:
                                                s->last_rule_file = rule->conf.file;
@@ -425,6 +424,7 @@ resume_execution:
 
  missing_data:
        /* just set the analyser timeout once at the beginning of the response */
+       channel_dont_close(rep);
        if (!tick_isset(s->rules_exp) && s->be->tcp_rep.inspect_delay)
                s->rules_exp = tick_add(now_ms, s->be->tcp_rep.inspect_delay);
        rep->analyse_exp = tick_first((tick_is_expired(rep->analyse_exp, now_ms) ? 0 : rep->analyse_exp), s->rules_exp);