mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: acl: acl_find_target() now resolves arguments based on their types

Browse Source 
This function does not rely on the keyword anymore but just on its type.
It's much cleaner and much safer. It should be extended to do the same for
all PRX type arguments.
This commit is contained in:
Willy Tarreau 2012-04-19 19:11:13 +02:00
parent 61612d49a7
commit 63364eed75
1 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/acl.c
View File

@ -1959,91 +1959,88 @@ acl_find_targets(struct proxy *p)
struct acl_expr *expr;
struct acl_pattern *pattern;
struct userlist *ul;
struct arg *arg;
int cfgerr = 0;
list_for_each_entry(acl, &p->acl, list) {
list_for_each_entry(expr, &acl->expr, list) {
if (strcmp(expr->kw->kw, "srv_is_up") == 0 ||
strcmp(expr->kw->kw, "srv_conn") == 0) {
struct proxy *px;
struct server *srv;
char *pname, *sname;
for (arg = expr->args; arg; arg++) {
if (arg->type == ARGT_STOP)
break;
else if (arg->type == ARGT_SRV) {
struct proxy *px;
struct server *srv;
char *pname, *sname;
/* FIXME: at the moment we check argument types from the keyword,
* but later we'll simlpy inspect argument types.
*/
if (!expr->args || !expr->args->data.str.len) {
Alert("proxy %s: acl %s %s(): missing server name.\n",
p->id, acl->name, expr->kw->kw);
cfgerr++;
continue;
}
pname = expr->args->data.str.str;
sname = strrchr(pname, '/');
if (sname)
*sname++ = '\0';
else {
sname = pname;
pname = NULL;
}
px = p;
if (pname) {
px = findproxy(pname, PR_CAP_BE);
if (!px) {
Alert("proxy %s: acl %s %s(): unable to find proxy '%s'.\n",
p->id, acl->name, expr->kw->kw, pname);
if (!expr->args->data.str.len) {
Alert("proxy %s: acl '%s' %s(): missing server name.\n",
p->id, acl->name, expr->kw->kw);
cfgerr++;
continue;
}
}
srv = findserver(px, sname);
if (!srv) {
Alert("proxy %s: acl %s %s(): unable to find server '%s'.\n",
p->id, acl->name, expr->kw->kw, sname);
cfgerr++;
pname = expr->args->data.str.str;
sname = strrchr(pname, '/');
if (sname)
*sname++ = '\0';
else {
sname = pname;
pname = NULL;
}
px = p;
if (pname) {
px = findproxy(pname, PR_CAP_BE);
if (!px) {
Alert("proxy %s: acl '%s' %s(): unable to find proxy '%s'.\n",
p->id, acl->name, expr->kw->kw, pname);
cfgerr++;
continue;
}
}
srv = findserver(px, sname);
if (!srv) {
Alert("proxy %s: acl '%s' %s(): unable to find server '%s'.\n",
p->id, acl->name, expr->kw->kw, sname);
cfgerr++;
continue;
}
free(expr->args->data.str.str);
expr->args->data.srv = srv;
continue;
}
else if (arg->type == ARGT_USR) {
if (!expr->args->data.str.len) {
Alert("proxy %s: acl '%s' %s(): missing userlist name.\n",
p->id, acl->name, expr->kw->kw);
cfgerr++;
continue;
}
free(expr->args->data.str.str);
expr->args->data.srv = srv;
continue;
}
if (p->uri_auth && p->uri_auth->userlist &&
!strcmp(p->uri_auth->userlist->name, expr->args->data.str.str))
ul = p->uri_auth->userlist;
else
ul = auth_find_userlist(expr->args->data.str.str);
if (strstr(expr->kw->kw, "http_auth") == expr->kw->kw) {
if (!ul) {
Alert("proxy %s: acl '%s' %s(%s): unable to find userlist.\n",
p->id, acl->name, expr->kw->kw, expr->args->data.str.str);
cfgerr++;
continue;
}
/* FIXME: at the moment we check argument types from the keyword,
* but later we'll simlpy inspect argument types.
*/
if (!expr->args || !expr->args->data.str.len) {
Alert("proxy %s: acl %s %s(): missing userlist name.\n",
p->id, acl->name, expr->kw->kw);
cfgerr++;
continue;
free(expr->args->data.str.str);
expr->args->data.usr = ul;
}
if (p->uri_auth && p->uri_auth->userlist &&
!strcmp(p->uri_auth->userlist->name, expr->args->data.str.str))
ul = p->uri_auth->userlist;
else
ul = auth_find_userlist(expr->args->data.str.str);
if (!ul) {
Alert("proxy %s: acl %s %s(%s): unable to find userlist.\n",
p->id, acl->name, expr->kw->kw, expr->args->data.str.str);
cfgerr++;
continue;
}
free(expr->args->data.str.str);
expr->args->data.usr = ul;
}
} /* end of args processing */
if (!strcmp(expr->kw->kw, "http_auth_group")) {
/* note: argument resolved above thanks to ARGT_USR */
if (LIST_ISEMPTY(&expr->patterns)) {
Alert("proxy %s: acl %s %s(): no groups specified.\n",