From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 22 Jan 2020 13:38:05 +0000 (+0100)
Subject: MINOR: http-rules: Set SF_ERR_PRXCOND termination flag when a header rewrite fails
X-Git-Tag: v2.2-dev2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333bf8c33f5d018a5bfeed5be2bdaab455f0234f;p=thirdparty%2Fhaproxy.git

MINOR: http-rules: Set SF_ERR_PRXCOND termination flag when a header rewrite fails

When a header rewrite fails, an internal errors is triggered. But
SF_ERR_INTERNAL is documented to be the concequence of a bug and must be
reported to the dev teamm. So, when this happens, the SF_ERR_PRXCOND termination
flag is set now.
---

diff --git a/src/http_act.c b/src/http_act.c
index e1d9c96bd8..5d3d2e2794 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -107,8 +107,11 @@ static enum act_return http_action_set_req_line(struct act_rule *rule, struct pr
 	if (objt_server(s->target))
 		_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
-	if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW))
+	if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW)) {
 		ret = ACT_RET_ERR;
+		if (!(s->flags & SF_ERR_MASK))
+			s->flags |= SF_ERR_PRXCOND;
+	}
 	goto leave;
 }
 
@@ -227,8 +230,11 @@ static enum act_return http_action_replace_uri(struct act_rule *rule, struct pro
 	if (objt_server(s->target))
 		_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
-	if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW))
+	if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW)) {
 		ret = ACT_RET_ERR;
+		if (!(s->flags & SF_ERR_MASK))
+			s->flags |= SF_ERR_PRXCOND;
+	}
 	goto leave;
 }
 
@@ -289,8 +295,11 @@ static enum act_return action_http_set_status(struct act_rule *rule, struct prox
 		if (objt_server(s->target))
 			_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
-		if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW))
+		if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW)) {
 			return ACT_RET_ERR;
+			if (!(s->flags & SF_ERR_MASK))
+				s->flags |= SF_ERR_PRXCOND;
+		}
 	}
 
 	return ACT_RET_CONT;
@@ -1187,8 +1196,11 @@ static enum act_return http_action_set_header(struct act_rule *rule, struct prox
 	if (objt_server(s->target))
 		_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
-	if (!(msg->flags & HTTP_MSGF_SOFT_RW))
+	if (!(msg->flags & HTTP_MSGF_SOFT_RW)) {
 		ret = ACT_RET_ERR;
+		if (!(s->flags & SF_ERR_MASK))
+			s->flags |= SF_ERR_PRXCOND;
+	}
 	goto leave;
 }
 
@@ -1297,8 +1309,11 @@ static enum act_return http_action_replace_header(struct act_rule *rule, struct
 	if (objt_server(s->target))
 		_HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
-	if (!(msg->flags & HTTP_MSGF_SOFT_RW))
+	if (!(msg->flags & HTTP_MSGF_SOFT_RW)) {
 		ret = ACT_RET_ERR;
+		if (!(s->flags & SF_ERR_MASK))
+			s->flags |= SF_ERR_PRXCOND;
+	}
 	goto leave;
 }