BUG/MAJOR: channel: Fix the definition order of channel analyzers
It is important to defined analyzers (AN_REQ_* and AN_RES_*) in the same order
they are evaluated in process_stream. This order is really important because
during analyzers evaluation, we run them in the order of the lower bit to the
higher one. This way, when an analyzer adds/removes another one during its
evaluation, we know if it is located before or after it. So, when it adds an
analyzer which is located before it, we can switch to it immediately, even if it
has already been called once but removed since.
With the time, and introduction of new analyzers, this order was broken up. the
main problems come from the filter analyzers. We used values not related with
their evaluation order. Furthermore, we used same values for request and response
analyzers.
So, to fix the bug, filter analyzers have been splitted in 2 distinct lists to
have different analyzers for the request channel than those for the response
channel. And of course, we have moved them to the right place.
Some other analyzers have been reordered to respect the evaluation order:
* AN_REQ_HTTP_TARPIT has been moved just before AN_REQ_SRV_RULES
* AN_REQ_PRST_RDP_COOKIE has been moved just before AN_REQ_STICKING_RULES
* AN_RES_STORE_RULES has been moved just after AN_RES_WAIT_HTTP
Note today we have 29 analyzers, all stored into a 32 bits bitfield. So we can
still add 4 more analyzers before having a problem. A good way to fend off the
problem for a while could be to have a different bitfield for request and
response analyzers.
[wt: all of this must be backported to 1.7, and part of it must be backported
to 1.6 and 1.5]
diff --git a/src/proto_http.c b/src/proto_http.c
index aa8d997..0aa7c27 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2718,7 +2718,7 @@
txn->status = 400;
msg->msg_state = HTTP_MSG_ERROR;
http_reply_and_close(s, txn->status, NULL);
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
stream_inc_http_req_ctr(s);
proxy_inc_fe_req_ctr(sess->fe);
sess->fe->fe_counters.failed_req++;
@@ -2749,7 +2749,7 @@
txn->status = 408;
msg->msg_state = HTTP_MSG_ERROR;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_408));
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
stream_inc_http_req_ctr(s);
proxy_inc_fe_req_ctr(sess->fe);
@@ -2778,7 +2778,7 @@
txn->status = 400;
msg->msg_state = HTTP_MSG_ERROR;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_400));
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
stream_inc_http_err_ctr(s);
stream_inc_http_req_ctr(s);
proxy_inc_fe_req_ctr(sess->fe);
@@ -2834,7 +2834,7 @@
*/
txn->status = 0;
msg->msg_state = HTTP_MSG_RQBEFORE;
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
s->logs.logwait = 0;
s->logs.level = 0;
s->res.flags &= ~CF_EXPECT_MORE; /* speed up sending a previous response */
@@ -3161,7 +3161,7 @@
if (!(s->flags & SF_FINST_MASK))
s->flags |= SF_FINST_R;
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
req->analyse_exp = TICK_ETERNITY;
return 0;
}
@@ -4219,8 +4219,8 @@
bi_fast_delete(req->chn->buf, req->sov);
req->next -= req->sov;
req->sov = 0;
- s->req.analysers = AN_REQ_HTTP_XFER_BODY | (s->req.analysers & AN_FLT_END);
- s->res.analysers = AN_RES_HTTP_XFER_BODY | (s->req.analysers & AN_FLT_END);
+ s->req.analysers = AN_REQ_HTTP_XFER_BODY | (s->req.analysers & AN_REQ_FLT_END);
+ s->res.analysers = AN_RES_HTTP_XFER_BODY | (s->req.analysers & AN_RES_FLT_END);
req->msg_state = HTTP_MSG_CLOSED;
res->msg_state = HTTP_MSG_DONE;
/* Trim any possible response */
@@ -4236,7 +4236,7 @@
trash.len += 23;
}
http_reply_and_close(s, txn->status, &trash);
- req->chn->analysers &= AN_FLT_END;
+ req->chn->analysers &= AN_REQ_FLT_END;
}
if (!(s->flags & SF_ERR_MASK))
@@ -4379,8 +4379,8 @@
s->flags |= SF_FINST_R;
/* enable the minimally required analyzers to handle keep-alive and compression on the HTTP response */
- req->analysers &= (AN_REQ_HTTP_BODY | AN_FLT_HTTP_HDRS | AN_FLT_END);
- req->analysers &= ~AN_FLT_XFER_DATA;
+ req->analysers &= (AN_REQ_HTTP_BODY | AN_REQ_FLT_HTTP_HDRS | AN_REQ_FLT_END);
+ req->analysers &= ~AN_REQ_FLT_XFER_DATA;
req->analysers |= AN_REQ_HTTP_XFER_BODY;
goto done;
}
@@ -4437,7 +4437,7 @@
if (s->be->cookie_name || sess->fe->capture_name)
manage_client_side_cookies(s, req);
- req->analysers &= AN_FLT_END; /* remove switching rules etc... */
+ req->analysers &= AN_REQ_FLT_END; /* remove switching rules etc... */
req->analysers |= AN_REQ_HTTP_TARPIT;
req->analyse_exp = tick_add_ifset(now_ms, s->be->timeout.tarpit);
if (!req->analyse_exp)
@@ -4492,7 +4492,7 @@
if (!(s->flags & SF_FINST_MASK))
s->flags |= SF_FINST_R;
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
req->analyse_exp = TICK_ETERNITY;
return 0;
@@ -4548,7 +4548,7 @@
if (unlikely((conn = si_alloc_conn(&s->si[1])) == NULL)) {
txn->req.msg_state = HTTP_MSG_ERROR;
txn->status = 500;
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_500));
if (!(s->flags & SF_ERR_MASK))
@@ -4780,7 +4780,7 @@
}
if (msg->flags & HTTP_MSGF_XFER_LEN) {
- req->analysers &= ~AN_FLT_XFER_DATA;
+ req->analysers &= ~AN_REQ_FLT_XFER_DATA;
req->analysers |= AN_REQ_HTTP_XFER_BODY;
#ifdef TCP_QUICKACK
/* We expect some data from the client. Unless we know for sure
@@ -4823,7 +4823,7 @@
txn->req.msg_state = HTTP_MSG_ERROR;
txn->status = 400;
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_400));
sess->fe->fe_counters.failed_req++;
@@ -4867,7 +4867,7 @@
if (!(req->flags & CF_READ_ERROR))
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_500));
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
req->analyse_exp = TICK_ETERNITY;
if (!(s->flags & SF_ERR_MASK))
@@ -5022,7 +5022,7 @@
s->flags |= SF_FINST_R;
return_err_msg:
- req->analysers &= AN_FLT_END;
+ req->analysers &= AN_REQ_FLT_END;
sess->fe->fe_counters.failed_req++;
if (sess->listener->counters)
sess->listener->counters->failed_req++;
@@ -5272,8 +5272,8 @@
}
if (HAS_FILTERS(s)) {
- s->req.analysers &= AN_FLT_END;
- s->res.analysers &= AN_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END;
+ s->res.analysers &= AN_RES_FLT_END;
}
else {
s->req.analysers = strm_li(s) ? strm_li(s)->analysers : 0;
@@ -5591,25 +5591,25 @@
txn->rsp.msg_state == HTTP_MSG_TUNNEL ||
(txn->req.msg_state == HTTP_MSG_CLOSED &&
txn->rsp.msg_state == HTTP_MSG_CLOSED)) {
- s->req.analysers &= AN_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END;
channel_auto_close(&s->req);
channel_auto_read(&s->req);
- s->res.analysers &= AN_FLT_END;
+ s->res.analysers &= AN_RES_FLT_END;
channel_auto_close(&s->res);
channel_auto_read(&s->res);
if (txn->req.msg_state == HTTP_MSG_TUNNEL && HAS_REQ_DATA_FILTERS(s))
- s->req.analysers |= AN_FLT_XFER_DATA;
+ s->req.analysers |= AN_REQ_FLT_XFER_DATA;
if (txn->rsp.msg_state == HTTP_MSG_TUNNEL && HAS_RSP_DATA_FILTERS(s))
- s->res.analysers |= AN_FLT_XFER_DATA;
+ s->res.analysers |= AN_RES_FLT_XFER_DATA;
}
else if ((txn->req.msg_state >= HTTP_MSG_DONE &&
(txn->rsp.msg_state == HTTP_MSG_CLOSED || (s->res.flags & CF_SHUTW))) ||
txn->rsp.msg_state == HTTP_MSG_ERROR ||
txn->req.msg_state == HTTP_MSG_ERROR) {
- s->res.analysers &= AN_FLT_END;
+ s->res.analysers &= AN_RES_FLT_END;
channel_auto_close(&s->res);
channel_auto_read(&s->res);
- s->req.analysers &= AN_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END;
channel_abort(&s->req);
channel_auto_close(&s->req);
channel_auto_read(&s->req);
@@ -5818,8 +5818,8 @@
txn->status = 400;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_400));
}
- req->analysers &= AN_FLT_END;
- s->res.analysers &= AN_FLT_END; /* we're in data phase, we want to abort both directions */
+ req->analysers &= AN_REQ_FLT_END;
+ s->res.analysers &= AN_RES_FLT_END; /* we're in data phase, we want to abort both directions */
if (!(s->flags & SF_ERR_MASK))
s->flags |= SF_ERR_PRXCOND;
@@ -5840,8 +5840,8 @@
txn->status = 502;
http_reply_and_close(s, txn->status, http_error_message(s, HTTP_ERR_502));
}
- req->analysers &= AN_FLT_END;
- s->res.analysers &= AN_FLT_END; /* we're in data phase, we want to abort both directions */
+ req->analysers &= AN_REQ_FLT_END;
+ s->res.analysers &= AN_RES_FLT_END; /* we're in data phase, we want to abort both directions */
sess->fe->fe_counters.srv_aborts++;
s->be->be_counters.srv_aborts++;
@@ -5977,7 +5977,7 @@
}
abort_response:
channel_auto_close(rep);
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
txn->status = 502;
s->si[1].flags |= SI_FL_NOLINGER;
channel_truncate(rep);
@@ -6012,7 +6012,7 @@
}
channel_auto_close(rep);
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
txn->status = 502;
s->si[1].flags |= SI_FL_NOLINGER;
channel_truncate(rep);
@@ -6037,7 +6037,7 @@
}
channel_auto_close(rep);
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
txn->status = 504;
s->si[1].flags |= SI_FL_NOLINGER;
channel_truncate(rep);
@@ -6057,7 +6057,7 @@
if (objt_server(s->target))
objt_server(s->target)->counters.cli_aborts++;
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
channel_auto_close(rep);
txn->status = 400;
@@ -6087,7 +6087,7 @@
}
channel_auto_close(rep);
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
txn->status = 502;
s->si[1].flags |= SI_FL_NOLINGER;
channel_truncate(rep);
@@ -6108,7 +6108,7 @@
goto abort_keep_alive;
s->be->be_counters.failed_resp++;
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
channel_auto_close(rep);
if (!(s->flags & SF_ERR_MASK))
@@ -6467,8 +6467,8 @@
* any other information so that the client retries.
*/
txn->status = 0;
- rep->analysers &= AN_FLT_END;
- s->req.analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END;
channel_auto_close(rep);
s->logs.logwait = 0;
s->logs.level = 0;
@@ -6568,7 +6568,7 @@
}
s->be->be_counters.failed_resp++;
return_srv_prx_502:
- rep->analysers &= AN_FLT_END;
+ rep->analysers &= AN_RES_FLT_END;
txn->status = 502;
s->logs.t_data = -1; /* was not a valid response */
s->si[1].flags |= SI_FL_NOLINGER;
@@ -6788,7 +6788,7 @@
skip_header_mangling:
if ((msg->flags & HTTP_MSGF_XFER_LEN) || HAS_FILTERS(s) ||
(txn->flags & TX_CON_WANT_MSK) == TX_CON_WANT_TUN) {
- rep->analysers &= ~AN_FLT_XFER_DATA;
+ rep->analysers &= ~AN_RES_FLT_XFER_DATA;
rep->analysers |= AN_RES_HTTP_XFER_BODY;
}
@@ -6966,8 +6966,8 @@
txn->rsp.msg_state = HTTP_MSG_ERROR;
/* don't send any error message as we're in the body */
http_reply_and_close(s, txn->status, NULL);
- res->analysers &= AN_FLT_END;
- s->req.analysers &= AN_FLT_END; /* we're in data phase, we want to abort both directions */
+ res->analysers &= AN_RES_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END; /* we're in data phase, we want to abort both directions */
if (objt_server(s->target))
health_adjust(objt_server(s->target), HANA_STATUS_HTTP_HDRRSP);
@@ -6981,8 +6981,8 @@
txn->rsp.msg_state = HTTP_MSG_ERROR;
/* don't send any error message as we're in the body */
http_reply_and_close(s, txn->status, NULL);
- res->analysers &= AN_FLT_END;
- s->req.analysers &= AN_FLT_END; /* we're in data phase, we want to abort both directions */
+ res->analysers &= AN_RES_FLT_END;
+ s->req.analysers &= AN_REQ_FLT_END; /* we're in data phase, we want to abort both directions */
sess->fe->fe_counters.cli_aborts++;
s->be->be_counters.cli_aborts++;