RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-04 16:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: fix option httplog validation with TCP frontends

Browse Source 
Option httplog needs to be checked only once the proxy has been validated,
so that its final mode (tcp/http) can be used. Also we need to check for
httplog before checking the log format, so that we can report a warning
about this specific option and not about the format it implies.
This commit is contained in:
Willy Tarreau 2012-05-31 19:30:26 +02:00
parent 743a2d3e14
commit 196729eff8
4 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/proxy.h
View File

@ -344,6 +344,8 @@ struct proxy {
int no_options; /* PR_O_REDISP, PR_O_TRANSP, ... */ int no_options; /* PR_O_REDISP, PR_O_TRANSP, ... */
int no_options2; /* PR_O2_* */ int no_options2; /* PR_O2_* */
char *logformat_string; /* log format string */
char *uniqueid_format_string; /* unique-id format string */
struct { struct {
const char *file; /* file where the section appears */ const char *file; /* file where the section appears */
int line; /* line where the section appears */ int line; /* line where the section appears */

63
src/cfgparse.c
View File

@ -1345,7 +1345,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
int err_code = 0; int err_code = 0;
struct acl_cond *cond = NULL; struct acl_cond *cond = NULL;
struct logsrv *tmplogsrv; struct logsrv *tmplogsrv;
struct logformat_node *tmplf;
char *errmsg = NULL; char *errmsg = NULL;
if (!strcmp(args[0], "listen")) if (!strcmp(args[0], "listen"))
@ -1564,21 +1563,17 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
LIST_ADDQ(&curproxy->logsrvs, &node->list); LIST_ADDQ(&curproxy->logsrvs, &node->list);
} }
/* copy default log_format to curproxy */ /* get either a pointer to the logformat string or a copy of it */
list_for_each_entry(tmplf, &defproxy.logformat, list) { curproxy->logformat_string = defproxy.logformat_string;
struct logformat_node *node = malloc(sizeof(struct logformat_node)); if (curproxy->logformat_string &&
memcpy(node, tmplf, sizeof(struct logformat_node)); curproxy->logformat_string != default_http_log_format &&
LIST_INIT(&node->list); curproxy->logformat_string != default_tcp_log_format &&
LIST_ADDQ(&curproxy->logformat, &node->list); curproxy->logformat_string != clf_http_log_format)
} curproxy->logformat_string = strdup(curproxy->logformat_string);
/* copy default unique_id to curproxy */ curproxy->uniqueid_format_string = defproxy.uniqueid_format_string;
list_for_each_entry(tmplf, &defproxy.format_unique_id, list) { if (curproxy->uniqueid_format_string)
struct logformat_node *node = malloc(sizeof(struct logformat_node)); curproxy->uniqueid_format_string = strdup(curproxy->uniqueid_format_string);
memcpy(node, tmplf, sizeof(struct logformat_node));
LIST_INIT(&node->list);
LIST_ADDQ(&curproxy->format_unique_id, &node->list);
}
/* copy default header unique id */ /* copy default header unique id */
if (defproxy.header_unique_id) if (defproxy.header_unique_id)
@ -1614,6 +1609,13 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
free(defproxy.expect_str); free(defproxy.expect_str);
if (defproxy.expect_regex) regfree(defproxy.expect_regex); if (defproxy.expect_regex) regfree(defproxy.expect_regex);
if (defproxy.logformat_string == default_http_log_format ||
defproxy.logformat_string == default_tcp_log_format ||
defproxy.logformat_string == clf_http_log_format)
free(defproxy.logformat_string);
free(defproxy.uniqueid_format_string);
for (rc = 0; rc < HTTP_ERR_SIZE; rc++) for (rc = 0; rc < HTTP_ERR_SIZE; rc++)
chunk_destroy(&defproxy.errmsg[rc]); chunk_destroy(&defproxy.errmsg[rc]);
@ -3384,13 +3386,19 @@ stats_error_parsing:
goto out; goto out;
} }
} }
parse_logformat_string(logformat, curproxy, &curproxy->logformat, curproxy->mode); if (curproxy->logformat_string != default_http_log_format &&
curproxy->logformat_string != default_tcp_log_format &&
curproxy->logformat_string != clf_http_log_format)
free(curproxy->logformat_string);
curproxy->logformat_string = logformat;
} }
else if (!strcmp(args[1], "tcplog")) { else if (!strcmp(args[1], "tcplog")) {
char *logformat;
/* generate a detailed TCP log */ /* generate a detailed TCP log */
logformat = default_tcp_log_format; if (curproxy->logformat_string != default_http_log_format &&
parse_logformat_string(logformat, curproxy, &curproxy->logformat, curproxy->mode); curproxy->logformat_string != default_tcp_log_format &&
curproxy->logformat_string != clf_http_log_format)
free(curproxy->logformat_string);
curproxy->logformat_string = default_tcp_log_format;
} }
else if (!strcmp(args[1], "tcpka")) { else if (!strcmp(args[1], "tcpka")) {
/* enable TCP keep-alives on client and server sessions */ /* enable TCP keep-alives on client and server sessions */
@ -4639,7 +4647,8 @@ stats_error_parsing:
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
parse_logformat_string(args[1], curproxy, &curproxy->format_unique_id, PR_MODE_HTTP); free(curproxy->uniqueid_format_string);
curproxy->uniqueid_format_string = strdup(args[1]);
} }
else if (strcmp(args[0], "unique-id-header") == 0) { else if (strcmp(args[0], "unique-id-header") == 0) {
@ -4658,7 +4667,12 @@ stats_error_parsing:
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
parse_logformat_string(args[1], curproxy, &curproxy->logformat, curproxy->mode);
if (curproxy->logformat_string != default_http_log_format &&
curproxy->logformat_string != default_tcp_log_format &&
curproxy->logformat_string != clf_http_log_format)
free(curproxy->logformat_string);
curproxy->logformat_string = strdup(args[1]);
} }
else if (!strcmp(args[0], "log") && kwm == KWM_NO) { else if (!strcmp(args[0], "log") && kwm == KWM_NO) {
@ -6208,6 +6222,13 @@ out_uri_auth_compat:
} }
} }
/* compile the log format */
if (curproxy->logformat_string)
parse_logformat_string(curproxy->logformat_string, curproxy, &curproxy->logformat, curproxy->mode);
if (curproxy->uniqueid_format_string)
parse_logformat_string(curproxy->uniqueid_format_string, curproxy, &curproxy->format_unique_id, PR_MODE_HTTP);
/* first, we will invert the servers list order */ /* first, we will invert the servers list order */
newsrv = NULL; newsrv = NULL;
while (curproxy->srv) { while (curproxy->srv) {

6
src/haproxy.c
View File

@ -831,6 +831,12 @@ void deinit(void)
free(p->capture_name); free(p->capture_name);
free(p->monitor_uri); free(p->monitor_uri);
free(p->rdp_cookie_name); free(p->rdp_cookie_name);
if (p->logformat_string == default_http_log_format ||
p->logformat_string == default_tcp_log_format ||
p->logformat_string == clf_http_log_format)
free(p->logformat_string);
free(p->uniqueid_format_string);
for (i = 0; i < HTTP_ERR_SIZE; i++) for (i = 0; i < HTTP_ERR_SIZE; i++)
chunk_destroy(&p->errmsg[i]); chunk_destroy(&p->errmsg[i]);

7
src/proxy.c
View File

@ -406,6 +406,13 @@ int proxy_cfg_ensure_no_http(struct proxy *curproxy)
Warning("config : 'option httplog' not usable with %s '%s' (needs 'mode http'). Falling back to 'option tcplog'.\n", Warning("config : 'option httplog' not usable with %s '%s' (needs 'mode http'). Falling back to 'option tcplog'.\n",
proxy_type_str(curproxy), curproxy->id); proxy_type_str(curproxy), curproxy->id);
} }
if (curproxy->logformat_string == default_http_log_format ||
curproxy->logformat_string == clf_http_log_format) {
curproxy->logformat_string = default_tcp_log_format;
Warning("config : 'option httplog' not usable with %s '%s' (needs 'mode http'). Falling back to 'option tcplog'.\n",
proxy_type_str(curproxy), curproxy->id);
}
return 0; return 0;
} }