RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-20 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: bwlim: Check scope for period expr for set-bandwitdh-limit actions

Browse Source 
If a period expression is defined for a set-bandwitdh-limit action, its
scope must be tested.

This patch must be backported to 2.7.
This commit is contained in:
Christopher Faulet 2023-01-13 15:21:53 +01:00
parent 4e52010e57
commit ab34ebe5f5
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/flt_bwlim.c
View File

@ -434,6 +434,11 @@ int check_bwlim_action(struct act_rule *rule, struct proxy *px, char **err)
return 0;
}
if ((conf->flags & BWLIM_FL_SHARED) && rule->arg.act.p[2]) {
memprintf(err, "set-bandwidth-limit rule cannot define a period for a shared bwlim filter");
return 0;
}
where = 0;
if (px->cap & PR_CAP_FE)
where |= (rule->from == ACT_F_HTTP_REQ ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_FE_HRS_HDR);
@ -460,6 +465,26 @@ int check_bwlim_action(struct act_rule *rule, struct proxy *px, char **err)
}
}
if (rule->arg.act.p[2]) {
struct sample_expr *expr = rule->arg.act.p[2];
if (!(expr->fetch->val & where)) {
memprintf(err, "set-bandwidth-limit rule uses a period extracting information from '%s', none of which is available here",
sample_src_names(expr->fetch->use));
return 0;
}
if (rule->from == ACT_F_TCP_REQ_CNT && (px->cap & PR_CAP_FE)) {
if (!px->tcp_req.inspect_delay && !(expr->fetch->val & SMP_VAL_FE_SES_ACC)) {
ha_warning("%s '%s' : a 'tcp-request content set-bandwidth-limit*' rule explicitly depending on request"
" contents without any 'tcp-request inspect-delay' setting."
" This means that this rule will randomly find its contents. This can be fixed by"
" setting the tcp-request inspect-delay.\n",
proxy_type_str(px), px->id);
}
}
}
if (conf->expr) {
if (!(conf->expr->fetch->val & where)) {
memprintf(err, "bwlim filter '%s uses a key extracting information from '%s', none of which is available here",