commit 74f67af8d49b623bb9b96a170705613ad6815eb4
author Christopher Faulet <cfaulet@haproxy.com> Mon Dec 16 13:07:14 2019 +0100
committer Christopher Faulet <cfaulet@haproxy.com> Mon Jan 20 15:18:45 2020 +0100
tree 0eca136eddf69a3aa0c70fadf91128ad32000bb3
parent 282992e25fbd0d46275ea26a01c6323e44803527

MINOR: http-rules: Handle denied/aborted/invalid connections from HTTP rules

The new possible results for a custom action (deny/abort/invalid) are now handled
during HTTP rules evaluation. These codes are mapped on HTTP rules ones :

  * ACT_RET_DENY => HTTP_RULE_RES_DENY
  * ACT_RET_ABRT => HTTP_RULE_RES_ABRT
  * ACT_RET_INV  => HTTP_RULE_RES_BADREQ

For now, no custom action uses these new codes.

src/http_ana.c

diff --git a/src/http_ana.c b/src/http_ana.c
index 983c5eb..14a86a1 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -3176,21 +3176,30 @@
 					act_flags |= ACT_FLAG_FINAL;
 
 				switch (rule->action_ptr(rule, px, s->sess, s, act_flags)) {
-					case ACT_RET_ERR:
-						rule_ret = HTTP_RULE_RES_ERROR;
-						goto end;
 					case ACT_RET_CONT:
 						break;
 					case ACT_RET_STOP:
 						rule_ret = HTTP_RULE_RES_STOP;
 						goto end;
-					case ACT_RET_DONE:
-						rule_ret = HTTP_RULE_RES_DONE;
-						goto end;
 					case ACT_RET_YIELD:
 						s->current_rule = rule;
 						rule_ret = HTTP_RULE_RES_YIELD;
 						goto end;
+					case ACT_RET_ERR:
+						rule_ret = HTTP_RULE_RES_ERROR;
+						goto end;
+					case ACT_RET_DONE:
+						rule_ret = HTTP_RULE_RES_DONE;
+						goto end;
+					case ACT_RET_DENY:
+						rule_ret = HTTP_RULE_RES_DENY;
+						goto end;
+					case ACT_RET_ABRT:
+						rule_ret = HTTP_RULE_RES_ABRT;
+						goto end;
+					case ACT_RET_INV:
+						rule_ret = HTTP_RULE_RES_BADREQ;
+						goto end;
 				}
 				break;
 
@@ -3580,21 +3589,30 @@
 					act_flags |= ACT_FLAG_FINAL;
 
 				switch (rule->action_ptr(rule, px, s->sess, s, act_flags)) {
-					case ACT_RET_ERR:
-						rule_ret = HTTP_RULE_RES_ERROR;
-						goto end;
 					case ACT_RET_CONT:
 						break;
 					case ACT_RET_STOP:
 						rule_ret = HTTP_RULE_RES_STOP;
 						goto end;
-					case ACT_RET_DONE:
-						rule_ret = HTTP_RULE_RES_DONE;
-						goto end;
 					case ACT_RET_YIELD:
 						s->current_rule = rule;
 						rule_ret = HTTP_RULE_RES_YIELD;
 						goto end;
+					case ACT_RET_ERR:
+						rule_ret = HTTP_RULE_RES_ERROR;
+						goto end;
+					case ACT_RET_DONE:
+						rule_ret = HTTP_RULE_RES_DONE;
+						goto end;
+					case ACT_RET_DENY:
+						rule_ret = HTTP_RULE_RES_DENY;
+						goto end;
+					case ACT_RET_ABRT:
+						rule_ret = HTTP_RULE_RES_ABRT;
+						goto end;
+					case ACT_RET_INV:
+						rule_ret = HTTP_RULE_RES_BADREQ;
+						goto end;
 				}
 				break;