[BUG] tarpit did not work anymore
Tarpit was broken by recent splitting of analysers. It would still
let the connection go to the server due to a missing buffer_write_dis().
Also, it was performed too late (after content switching rules).
diff --git a/src/proto_http.c b/src/proto_http.c
index d2c5919..dd4ee9c 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2092,6 +2092,25 @@
stream_int_retnclose(req->prod, error_message(s, HTTP_ERR_403));
goto return_prx_cond;
}
+
+ /* When a connection is tarpitted, we use the tarpit timeout,
+ * which may be the same as the connect timeout if unspecified.
+ * If unset, then set it to zero because we really want it to
+ * eventually expire. We build the tarpit as an analyser.
+ */
+ if (txn->flags & TX_CLTARPIT) {
+ buffer_erase(s->req);
+ /* wipe the request out so that we can drop the connection early
+ * if the client closes first.
+ */
+ buffer_write_dis(req);
+ req->analysers = 0; /* 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)
+ req->analyse_exp = tick_add(now_ms, 0);
+ return 1;
+ }
}
/* We might have to check for "Connection:" */
@@ -2579,23 +2598,6 @@
buffer_set_rlim(req, req->size); /* no more rewrite needed */
s->logs.tv_request = now;
- /* When a connection is tarpitted, we use the tarpit timeout,
- * which may be the same as the connect timeout if unspecified.
- * If unset, then set it to zero because we really want it to
- * eventually expire. We build the tarpit as an analyser.
- */
- if (txn->flags & TX_CLTARPIT) {
- buffer_erase(s->req);
- /* wipe the request out so that we can drop the connection early
- * if the client closes first.
- */
- buffer_write_dis(req);
- req->analysers |= AN_REQ_HTTP_TARPIT;
- req->analyse_exp = tick_add_ifset(now_ms, s->be->timeout.tarpit);
- if (!req->analyse_exp)
- req->analyse_exp = tick_add(now_ms, 0);
- }
-
/* OK let's go on with the BODY now */
return 1;
@@ -2633,6 +2635,7 @@
* timeout. We just have to check that the client is still
* there and that the timeout has not expired.
*/
+ buffer_write_dis(req);
if ((req->flags & (BF_SHUTR|BF_READ_ERROR)) == 0 &&
!tick_is_expired(req->analyse_exp, now_ms))
return 0;