mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: log-format/conf: take into account the parse_logformat_string() return code

Browse Source 
This patch takes into account the return code of the parse_logformat_string()
function. Now the configuration parser will fail if the log_format is not
strict.
This commit is contained in:
Thierry FOURNIER / OZON.IO 2016-11-22 23:50:02 +01:00 committed by Willy Tarreau
parent a2c38d7904
commit 59fd511555
2 changed files with 83 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cfgparse.c
View File

@ -7788,7 +7788,10 @@ int check_config_validity()
*/ */
pxname = rule->be.name; pxname = rule->be.name;
LIST_INIT(&rule->be.expr); LIST_INIT(&rule->be.expr);
parse_logformat_string(pxname, curproxy, &rule->be.expr, 0, SMP_VAL_FE_HRQ_HDR); if (!parse_logformat_string(pxname, curproxy, &rule->be.expr, 0, SMP_VAL_FE_HRQ_HDR)) {
cfgerr++;
continue;
}
node = LIST_NEXT(&rule->be.expr, struct logformat_node *, list); node = LIST_NEXT(&rule->be.expr, struct logformat_node *, list);
if (!LIST_ISEMPTY(&rule->be.expr)) { if (!LIST_ISEMPTY(&rule->be.expr)) {
@ -8272,8 +8275,10 @@ out_uri_auth_compat:
curproxy->conf.args.ctx = ARGC_LOG; curproxy->conf.args.ctx = ARGC_LOG;
curproxy->conf.args.file = curproxy->conf.lfs_file; curproxy->conf.args.file = curproxy->conf.lfs_file;
curproxy->conf.args.line = curproxy->conf.lfs_line; curproxy->conf.args.line = curproxy->conf.lfs_line;
parse_logformat_string(curproxy->conf.logformat_string, curproxy, &curproxy->logformat, LOG_OPT_MANDATORY, if (!parse_logformat_string(curproxy->conf.logformat_string, curproxy, &curproxy->logformat, LOG_OPT_MANDATORY,
SMP_VAL_FE_LOG_END); SMP_VAL_FE_LOG_END)) {
cfgerr++;
}
curproxy->conf.args.file = NULL; curproxy->conf.args.file = NULL;
curproxy->conf.args.line = 0; curproxy->conf.args.line = 0;
} }
@ -8282,9 +8287,12 @@ out_uri_auth_compat:
curproxy->conf.args.ctx = ARGC_LOGSD; curproxy->conf.args.ctx = ARGC_LOGSD;
curproxy->conf.args.file = curproxy->conf.lfsd_file; curproxy->conf.args.file = curproxy->conf.lfsd_file;
curproxy->conf.args.line = curproxy->conf.lfsd_line; curproxy->conf.args.line = curproxy->conf.lfsd_line;
parse_logformat_string(curproxy->conf.logformat_sd_string, curproxy, &curproxy->logformat_sd, LOG_OPT_MANDATORY, if (!parse_logformat_string(curproxy->conf.logformat_sd_string, curproxy, &curproxy->logformat_sd, LOG_OPT_MANDATORY,
SMP_VAL_FE_LOG_END); SMP_VAL_FE_LOG_END)) {
add_to_logformat_list(NULL, NULL, LF_SEPARATOR, &curproxy->logformat_sd); cfgerr++;
} else if (!add_to_logformat_list(NULL, NULL, LF_SEPARATOR, &curproxy->logformat_sd)) {
cfgerr++;
}
curproxy->conf.args.file = NULL; curproxy->conf.args.file = NULL;
curproxy->conf.args.line = 0; curproxy->conf.args.line = 0;
} }
@ -8293,8 +8301,10 @@ out_uri_auth_compat:
curproxy->conf.args.ctx = ARGC_UIF; curproxy->conf.args.ctx = ARGC_UIF;
curproxy->conf.args.file = curproxy->conf.uif_file; curproxy->conf.args.file = curproxy->conf.uif_file;
curproxy->conf.args.line = curproxy->conf.uif_line; curproxy->conf.args.line = curproxy->conf.uif_line;
parse_logformat_string(curproxy->conf.uniqueid_format_string, curproxy, &curproxy->format_unique_id, LOG_OPT_HTTP, if (!parse_logformat_string(curproxy->conf.uniqueid_format_string, curproxy, &curproxy->format_unique_id, LOG_OPT_HTTP,
(curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
cfgerr++;
}
curproxy->conf.args.file = NULL; curproxy->conf.args.file = NULL;
curproxy->conf.args.line = 0; curproxy->conf.args.line = 0;
} }

98
src/proto_http.c
View File

@ -9139,8 +9139,10 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.hdr_add.fmt); LIST_INIT(&rule->arg.hdr_add.fmt);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9169,8 +9171,10 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
} }
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg + 2], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 2], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
@ -9281,8 +9285,10 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9307,8 +9313,10 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9333,8 +9341,10 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9362,12 +9372,16 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
/* key pattern */ /* key pattern */
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
/* value pattern */ /* value pattern */
parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.map.value, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.map.value, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9537,8 +9551,10 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.hdr_add.fmt); LIST_INIT(&rule->arg.hdr_add.fmt);
proxy->conf.args.ctx = ARGC_HRS; proxy->conf.args.ctx = ARGC_HRS;
parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9567,8 +9583,10 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
} }
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg + 2], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 2], proxy, &rule->arg.hdr_add.fmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
@ -9613,8 +9631,10 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRS; proxy->conf.args.ctx = ARGC_HRS;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9640,8 +9660,10 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRS; proxy->conf.args.ctx = ARGC_HRS;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9666,8 +9688,10 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
LIST_INIT(&rule->arg.map.key); LIST_INIT(&rule->arg.map.key);
proxy->conf.args.ctx = ARGC_HRS; proxy->conf.args.ctx = ARGC_HRS;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
proxy->conf.lfs_line = proxy->conf.args.line; proxy->conf.lfs_line = proxy->conf.args.line;
@ -9696,12 +9720,16 @@ struct act_rule *parse_http_res_cond(const char **args, const char *file, int li
proxy->conf.args.ctx = ARGC_HRS; proxy->conf.args.ctx = ARGC_HRS;
/* key pattern */ /* key pattern */
parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.map.key, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
/* value pattern */ /* value pattern */
parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.map.value, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg + 1], proxy, &rule->arg.map.value, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR); (proxy->cap & PR_CAP_BE) ? SMP_VAL_BE_HRS_HDR : SMP_VAL_FE_HRS_HDR)) {
goto out_err;
}
free(proxy->conf.lfs_file); free(proxy->conf.lfs_file);
proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_file = strdup(proxy->conf.args.file);
@ -9945,9 +9973,11 @@ struct redirect_rule *http_parse_redirect_rule(const char *file, int linenum, st
*/ */
curproxy->conf.args.ctx = ARGC_RDR; curproxy->conf.args.ctx = ARGC_RDR;
if (!(type == REDIRECT_TYPE_PREFIX && destination[0] == '/' && destination[1] == '\0')) { if (!(type == REDIRECT_TYPE_PREFIX && destination[0] == '/' && destination[1] == '\0')) {
parse_logformat_string(destination, curproxy, &rule->rdr_fmt, LOG_OPT_HTTP, if (!parse_logformat_string(destination, curproxy, &rule->rdr_fmt, LOG_OPT_HTTP,
dir ? (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRS_HDR : SMP_VAL_BE_HRS_HDR dir ? (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRS_HDR : SMP_VAL_BE_HRS_HDR
: (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); : (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
return NULL;
}
free(curproxy->conf.lfs_file); free(curproxy->conf.lfs_file);
curproxy->conf.lfs_file = strdup(curproxy->conf.args.file); curproxy->conf.lfs_file = strdup(curproxy->conf.args.file);
curproxy->conf.lfs_line = curproxy->conf.args.line; curproxy->conf.lfs_line = curproxy->conf.args.line;
@ -12440,8 +12470,10 @@ enum act_parse_ret parse_set_req_line(const char **args, int *orig_arg, struct p
LIST_INIT(&rule->arg.http.logfmt); LIST_INIT(&rule->arg.http.logfmt);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg], proxy, &rule->arg.http.logfmt, LOG_OPT_HTTP, if (!parse_logformat_string(args[cur_arg], proxy, &rule->arg.http.logfmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR); (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR)) {
return ACT_RET_PRS_ERR;
}
(*orig_arg)++; (*orig_arg)++;
return ACT_RET_PRS_OK; return ACT_RET_PRS_OK;