BUG/MINOR : allow to log cookie for tarpit and denied request
The following patch allow to log cookie for tarpit and denied request.
This minor bug affect at least 1.5, 1.6 and 1.7 branch.
The solution is not perfect : may be the cookie processing
(manage_client_side_cookies) can be moved into http_process_req_common.
(cherry picked from commit 83a2c3d4d71fc23b9c513b456d33cc7488dff99f)
(cherry picked from commit e0f4150610b206f82ebba474a3feb92f7363ad83)
diff --git a/src/proto_http.c b/src/proto_http.c
index 2622e2b..131d140 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -4152,6 +4152,12 @@
*/
channel_dont_connect(req);
req->analysers = 0; /* remove switching rules etc... */
+
+ /* Allow cookie logging
+ */
+ if (s->be->cookie_name || s->fe->capture_name)
+ manage_client_side_cookies(s, req);
+
req->analysers |= AN_REQ_HTTP_TARPIT;
req->analyse_exp = tick_add_ifset(now_ms, s->be->timeout.tarpit);
if (!req->analyse_exp)
@@ -4165,6 +4171,12 @@
goto done_without_exp;
deny: /* this request was blocked (denied) */
+
+ /* Allow cookie logging
+ */
+ if (s->be->cookie_name || s->fe->capture_name)
+ manage_client_side_cookies(s, req);
+
txn->flags |= TX_CLDENY;
txn->status = 403;
s->logs.tv_request = now;
@@ -4305,8 +4317,7 @@
* the fields will stay coherent and the URI will not move.
* This should only be performed in the backend.
*/
- if ((s->be->cookie_name || s->be->appsession_name || s->fe->capture_name)
- && !(txn->flags & (TX_CLDENY|TX_CLTARPIT)))
+ if (s->be->cookie_name || s->be->appsession_name || s->fe->capture_name)
manage_client_side_cookies(s, req);
/*