MINOR: http-ana/http-rules: Use dedicated function to forward internal responses

Call http_forward_proxy_resp() function when an internal response is
returned. It concerns redirect, auth and error reponses. But also 100-Continue
and 103-Early-Hints responses. For errors, there is a subtlety. if the forward
fails, an HTTP 500 error is generated if it is not already an internal
error. For now http_forward_proxy_resp() cannot fail. But it will be possible
when the new ruleset applied on all responses will be added.

src/http_act.c

@@ -1114,8 +1114,6 @@ static enum act_return http_action_early_hint(struct act_rule *rule, struct prox
 	/* if it is the last rule or the next one is not an early-hint, terminate the current
 	 * response. */
 	if (&next_rule->list == s->current_rule_list || next_rule->action_ptr != http_action_early_hint) {
-		size_t data;
-
 		if (!htx_add_endof(htx, HTX_BLK_EOH)) {
 			/* If an error occurred during an Early-hint rule,
 			 * remove the incomplete HTTP 103 response from the
@@ -1123,10 +1121,8 @@ static enum act_return http_action_early_hint(struct act_rule *rule, struct prox
 			goto error;
 		}
 
-		data = htx->data - co_data(res);
+		if (!http_forward_proxy_resp(s, 0))
-		c_adv(res, data);
+			goto error;
-		htx->first = -1;
-		res->total += data;
 	}
 
   leave:

src/http_ana.c

@@ -2464,7 +2464,6 @@ int http_apply_redirect_rule(struct redirect_rule *rule, struct stream *s, struc
 	struct buffer *chunk;
 	struct ist status, reason, location;
 	unsigned int flags;
-	size_t data;
 	int close = 0; /* Try to keep the connection alive byt default */
 
 	chunk = alloc_trash_chunk();
@@ -2662,22 +2661,9 @@ int http_apply_redirect_rule(struct redirect_rule *rule, struct stream *s, struc
 		goto fail;
 
 	htx_to_buf(htx, &res->buf);
+	if (!http_forward_proxy_resp(s, 1))
+		goto fail;
 
-	htx->flags |= HTX_FL_PROXY_RESP;
-	data = htx->data - co_data(res);
-	c_adv(res, data);
-	htx->first = -1;
-	res->total += data;
-
-	channel_auto_read(req);
-	channel_abort(req);
-	channel_auto_close(req);
-	channel_htx_erase(req, htxbuf(&req->buf));
-
-	res->wex = tick_add_ifset(now_ms, res->wto);
-	channel_auto_read(res);
-	channel_auto_close(res);
-	channel_shutr_now(res);
 	if (rule->flags & REDIRECT_FLAG_FROM_REQ) {
 		/* let's log the request time */
 		s->logs.tv_request = now;
@@ -4210,7 +4196,6 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
 	struct htx_sl *sl;
 	struct ist path, location;
 	unsigned int flags;
-	size_t data;
 
 	/*
 	 * Create the location
@@ -4258,14 +4243,8 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
 		goto fail;
 
 	htx_to_buf(htx, &res->buf);
-	htx->flags |= HTX_FL_PROXY_RESP;
+	if (!http_forward_proxy_resp(s, 1))
-	/*
+		goto fail;
-	 * Send the message
-	 */
-	data = htx->data - co_data(res);
-	c_adv(res, data);
-	htx->first = -1;
-	res->total += data;
 
 	/* return without error. */
 	si_shutr(si);
@@ -4273,13 +4252,6 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
 	si->err_type = SI_ET_NONE;
 	si->state    = SI_ST_CLO;
 
-	channel_auto_read(req);
-	channel_abort(req);
-	channel_auto_close(req);
-	channel_htx_erase(req, htxbuf(&req->buf));
-	channel_auto_read(res);
-	channel_auto_close(res);
-
 	if (!(s->flags & SF_ERR_MASK))
 		s->flags |= SF_ERR_LOCAL;
 	if (!(s->flags & SF_FINST_MASK))
@@ -4610,16 +4582,14 @@ void http_reply_and_close(struct stream *s, short status, const struct buffer *m
 	if (msg && !b_is_null(msg)) {
 		struct channel *chn = &s->res;
 		struct htx *htx;
-		size_t data;
 
 		FLT_STRM_CB(s, flt_http_reply(s, s->txn->status, msg));
 		htx = htx_from_buf(&chn->buf);
 		if (channel_htx_copy_msg(chn, htx, msg)) {
-			htx->flags |= HTX_FL_PROXY_RESP;
+			if (!http_forward_proxy_resp(s, 1) && s->txn->status != 500) {
-			data = htx->data - co_data(chn);
+				s->txn->status = 500;
-			c_adv(chn, data);
+				http_reply_and_close(s, s->txn->status, http_error_message(s));
-			htx->first = -1;
+			}
-			chn->total += data;
 		}
 	}
 }
@@ -4724,7 +4694,6 @@ static int http_reply_100_continue(struct stream *s)
 	struct htx_sl *sl;
 	unsigned int flags = (HTX_SL_F_IS_RESP|HTX_SL_F_VER_11|
 			      HTX_SL_F_XFER_LEN|HTX_SL_F_BODYLESS);
-	size_t data;
 
 	sl = htx_add_stline(htx, HTX_BLK_RES_SL, flags,
 			    ist("HTTP/1.1"), ist("100"), ist("Continue"));
@@ -4735,10 +4704,8 @@ static int http_reply_100_continue(struct stream *s)
 	if (!htx_add_endof(htx, HTX_BLK_EOH))
 		goto fail;
 
-	data = htx->data - co_data(res);
+	if (!http_forward_proxy_resp(s, 0))
-	c_adv(res, data);
+		goto fail;
-	htx->first = -1;
-	res->total += data;
 	return 0;
 
   fail:
@@ -4761,7 +4728,6 @@ static int http_reply_40x_unauthorized(struct stream *s, const char *auth_realm)
 	struct ist code, body;
 	int status;
 	unsigned int flags = (HTX_SL_F_IS_RESP|HTX_SL_F_VER_11);
-	size_t data;
 
 	if (!(s->txn->flags & TX_USE_PX_CONN)) {
 		status = 401;
@@ -4811,21 +4777,8 @@ static int http_reply_40x_unauthorized(struct stream *s, const char *auth_realm)
 	if (!htx_add_endof(htx, HTX_BLK_EOM))
 		goto fail;
 
-	htx->flags |= HTX_FL_PROXY_RESP;
+	if (!http_forward_proxy_resp(s, 1))
-	data = htx->data - co_data(res);
+		goto fail;
-	c_adv(res, data);
-	htx->first = -1;
-	res->total += data;
-
-	channel_auto_read(&s->req);
-	channel_abort(&s->req);
-	channel_auto_close(&s->req);
-	channel_htx_erase(&s->req, htxbuf(&s->req.buf));
-
-	res->wex = tick_add_ifset(now_ms, res->wto);
-	channel_auto_read(res);
-	channel_auto_close(res);
-	channel_shutr_now(res);
 	return 0;
 
   fail: