kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: action: add a new flag ACT_FLAG_FIRST

Browse Source 
This flag is used by custom actions to know that they're called for the
first time. The only case where it's not set is when they're resuming
from a yield. It will be needed to let them know when they have to
allocate some resources.
This commit is contained in:
Willy Tarreau 2015-09-27 23:34:39 +02:00
parent 7c39ab4ac2
commit acc980036f
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/action.h
View File

@ -50,6 +50,7 @@ enum act_parse_ret {
enum act_flag { enum act_flag {
ACT_FLAG_NONE = 0x00000000, /* no flag */ ACT_FLAG_NONE = 0x00000000, /* no flag */
ACT_FLAG_FINAL = 0x00000001, /* last call, cannot yield */ ACT_FLAG_FINAL = 0x00000001, /* last call, cannot yield */
ACT_FLAG_FIRST = 0x00000002, /* first call for this action */
}; };
enum act_name { enum act_name {

20
src/proto_http.c
View File

@ -3497,7 +3497,7 @@ http_req_get_intercept_rule(struct proxy *px, struct list *rules, struct stream
struct act_rule *rule; struct act_rule *rule;
struct hdr_ctx ctx; struct hdr_ctx ctx;
const char *auth_realm; const char *auth_realm;
int final; int act_flags = 0;
/* If "the current_rule_list" match the executed rule list, we are in /* If "the current_rule_list" match the executed rule list, we are in
* resume condition. If a resume is needed it is always in the action * resume condition. If a resume is needed it is always in the action
@ -3528,6 +3528,7 @@ http_req_get_intercept_rule(struct proxy *px, struct list *rules, struct stream
continue; continue;
} }
act_flags |= ACT_FLAG_FIRST;
resume_execution: resume_execution:
switch (rule->action) { switch (rule->action) {
case ACT_ACTION_ALLOW: case ACT_ACTION_ALLOW:
@ -3710,11 +3711,10 @@ resume_execution:
} }
case ACT_CUSTOM: case ACT_CUSTOM:
final = 0; if ((px->options & PR_O_ABRT_CLOSE) && (s->req.flags & (CF_SHUTR|CF_READ_NULL|CF_READ_ERROR)))
if (px->options & PR_O_ABRT_CLOSE) act_flags |= ACT_FLAG_FINAL;
final = (s->req.flags & (CF_SHUTR|CF_READ_NULL|CF_READ_ERROR));
switch (rule->action_ptr(rule, px, s->sess, s, final)) { switch (rule->action_ptr(rule, px, s->sess, s, act_flags)) {
case ACT_RET_ERR: case ACT_RET_ERR:
case ACT_RET_CONT: case ACT_RET_CONT:
break; break;
@ -3809,7 +3809,7 @@ http_res_get_intercept_rule(struct proxy *px, struct list *rules, struct stream
struct connection *cli_conn; struct connection *cli_conn;
struct act_rule *rule; struct act_rule *rule;
struct hdr_ctx ctx; struct hdr_ctx ctx;
int final; int act_flags = 0;
/* If "the current_rule_list" match the executed rule list, we are in /* If "the current_rule_list" match the executed rule list, we are in
* resume condition. If a resume is needed it is always in the action * resume condition. If a resume is needed it is always in the action
@ -3840,6 +3840,7 @@ http_res_get_intercept_rule(struct proxy *px, struct list *rules, struct stream
continue; continue;
} }
act_flags |= ACT_FLAG_FIRST;
resume_execution: resume_execution:
switch (rule->action) { switch (rule->action) {
case ACT_ACTION_ALLOW: case ACT_ACTION_ALLOW:
@ -3997,11 +3998,10 @@ resume_execution:
return HTTP_RULE_RES_DONE; return HTTP_RULE_RES_DONE;
case ACT_CUSTOM: case ACT_CUSTOM:
final = 0; if ((px->options & PR_O_ABRT_CLOSE) && (s->req.flags & (CF_SHUTR|CF_READ_NULL|CF_READ_ERROR)))
if (px->options & PR_O_ABRT_CLOSE) act_flags |= ACT_FLAG_FINAL;
final = (s->req.flags & (CF_SHUTR|CF_READ_NULL|CF_READ_ERROR));
switch (rule->action_ptr(rule, px, s->sess, s, final)) { switch (rule->action_ptr(rule, px, s->sess, s, act_flags)) {
case ACT_RET_ERR: case ACT_RET_ERR:
case ACT_RET_CONT: case ACT_RET_CONT:
break; break;

17
src/proto_tcp.c
View File

@ -1038,6 +1038,7 @@ int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit)
struct stksess *ts; struct stksess *ts;
struct stktable *t; struct stktable *t;
int partial; int partial;
int act_flags = 0;
DPRINTF(stderr,"[%u] %s: stream=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n", DPRINTF(stderr,"[%u] %s: stream=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n",
now_ms, __FUNCTION__, now_ms, __FUNCTION__,
@ -1091,6 +1092,7 @@ int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit)
} }
if (ret) { if (ret) {
act_flags |= ACT_FLAG_FIRST;
resume_execution: resume_execution:
/* we have a matching rule. */ /* we have a matching rule. */
if (rule->action == ACT_ACTION_ALLOW) { if (rule->action == ACT_ACTION_ALLOW) {
@ -1166,7 +1168,10 @@ resume_execution:
if (!rule->action_ptr) if (!rule->action_ptr)
continue; continue;
switch (rule->action_ptr(rule, s->be, s->sess, s, (partial & SMP_OPT_FINAL) ? ACT_FLAG_FINAL : 0)) { if (partial & SMP_OPT_FINAL)
act_flags |= ACT_FLAG_FINAL;
switch (rule->action_ptr(rule, s->be, s->sess, s, act_flags)) {
case ACT_RET_ERR: case ACT_RET_ERR:
case ACT_RET_CONT: case ACT_RET_CONT:
continue; continue;
@ -1208,6 +1213,7 @@ int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit)
struct session *sess = s->sess; struct session *sess = s->sess;
struct act_rule *rule; struct act_rule *rule;
int partial; int partial;
int act_flags = 0;
DPRINTF(stderr,"[%u] %s: stream=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n", DPRINTF(stderr,"[%u] %s: stream=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n",
now_ms, __FUNCTION__, now_ms, __FUNCTION__,
@ -1264,6 +1270,7 @@ int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit)
} }
if (ret) { if (ret) {
act_flags |= ACT_FLAG_FIRST;
resume_execution: resume_execution:
/* we have a matching rule. */ /* we have a matching rule. */
if (rule->action == ACT_ACTION_ALLOW) { if (rule->action == ACT_ACTION_ALLOW) {
@ -1295,7 +1302,11 @@ resume_execution:
/* Custom keywords. */ /* Custom keywords. */
if (!rule->action_ptr) if (!rule->action_ptr)
continue; continue;
switch (rule->action_ptr(rule, s->be, s->sess, s, (partial & SMP_OPT_FINAL) ? ACT_FLAG_FINAL : 0)) {
if (partial & SMP_OPT_FINAL)
act_flags |= ACT_FLAG_FINAL;
switch (rule->action_ptr(rule, s->be, s->sess, s, act_flags)) {
case ACT_RET_ERR: case ACT_RET_ERR:
case ACT_RET_CONT: case ACT_RET_CONT:
continue; continue;
@ -1383,7 +1394,7 @@ int tcp_exec_req_rules(struct session *sess)
/* Custom keywords. */ /* Custom keywords. */
if (rule->action_ptr) if (rule->action_ptr)
break; break;
switch (rule->action_ptr(rule, sess->fe, sess, NULL, ACT_FLAG_FINAL)) { switch (rule->action_ptr(rule, sess->fe, sess, NULL, ACT_FLAG_FINAL | ACT_FLAG_FIRST)) {
case ACT_RET_YIELD: case ACT_RET_YIELD:
/* yield is not allowed at this point. If this return code is /* yield is not allowed at this point. If this return code is
* used it is a bug, so I prefer to abort the process. * used it is a bug, so I prefer to abort the process.