MINOR: log: Add log-format variable %HQ, to log HTTP query strings
Since sample fetches are not always available in the response phase, this patch implements %HQ such that: GET /foo?bar=baz HTTP/1.0 ...would be logged as: ?bar=baz
This commit is contained in:
parent
9f5ada32e4
commit
e63ac871f8
|
@ -14072,6 +14072,7 @@ Please refer to the table below for currently defined variables :
|
||||||
| | %H | hostname | string |
|
| | %H | hostname | string |
|
||||||
| H | %HM | HTTP method (ex: POST) | string |
|
| H | %HM | HTTP method (ex: POST) | string |
|
||||||
| H | %HP | HTTP request URI without query string (path) | string |
|
| H | %HP | HTTP request URI without query string (path) | string |
|
||||||
|
| H | %HQ | HTTP request URI query string (ex: ?bar=baz) | string |
|
||||||
| H | %HU | HTTP request URI (ex: /foo?bar=baz) | string |
|
| H | %HU | HTTP request URI (ex: /foo?bar=baz) | string |
|
||||||
| H | %HV | HTTP version (ex: HTTP/1.0) | string |
|
| H | %HV | HTTP version (ex: HTTP/1.0) | string |
|
||||||
| | %ID | unique-id | string |
|
| | %ID | unique-id | string |
|
||||||
|
|
|
@ -96,6 +96,7 @@ enum {
|
||||||
LOG_FMT_HTTP_METHOD,
|
LOG_FMT_HTTP_METHOD,
|
||||||
LOG_FMT_HTTP_URI,
|
LOG_FMT_HTTP_URI,
|
||||||
LOG_FMT_HTTP_PATH,
|
LOG_FMT_HTTP_PATH,
|
||||||
|
LOG_FMT_HTTP_QUERY,
|
||||||
LOG_FMT_HTTP_VERSION,
|
LOG_FMT_HTTP_VERSION,
|
||||||
LOG_FMT_HOSTNAME,
|
LOG_FMT_HOSTNAME,
|
||||||
LOG_FMT_UNIQUEID,
|
LOG_FMT_UNIQUEID,
|
||||||
|
|
36
src/log.c
36
src/log.c
|
@ -111,6 +111,7 @@ static const struct logformat_type logformat_keywords[] = {
|
||||||
{ "hsl", LOG_FMT_HDRRESPONSLIST, PR_MODE_TCP, LW_RSPHDR, NULL }, /* header response list */
|
{ "hsl", LOG_FMT_HDRRESPONSLIST, PR_MODE_TCP, LW_RSPHDR, NULL }, /* header response list */
|
||||||
{ "HM", LOG_FMT_HTTP_METHOD, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP method */
|
{ "HM", LOG_FMT_HTTP_METHOD, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP method */
|
||||||
{ "HP", LOG_FMT_HTTP_PATH, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP path */
|
{ "HP", LOG_FMT_HTTP_PATH, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP path */
|
||||||
|
{ "HQ", LOG_FMT_HTTP_QUERY, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP query */
|
||||||
{ "HU", LOG_FMT_HTTP_URI, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP full URI */
|
{ "HU", LOG_FMT_HTTP_URI, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP full URI */
|
||||||
{ "HV", LOG_FMT_HTTP_VERSION, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP version */
|
{ "HV", LOG_FMT_HTTP_VERSION, PR_MODE_HTTP, LW_REQ, NULL }, /* HTTP version */
|
||||||
{ "lc", LOG_FMT_LOGCNT, PR_MODE_TCP, LW_INIT, NULL }, /* log counter */
|
{ "lc", LOG_FMT_LOGCNT, PR_MODE_TCP, LW_INIT, NULL }, /* log counter */
|
||||||
|
@ -937,6 +938,7 @@ int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list
|
||||||
struct chunk chunk;
|
struct chunk chunk;
|
||||||
char *uri;
|
char *uri;
|
||||||
char *spc;
|
char *spc;
|
||||||
|
char *qmark;
|
||||||
char *end;
|
char *end;
|
||||||
struct tm tm;
|
struct tm tm;
|
||||||
int t_request;
|
int t_request;
|
||||||
|
@ -1578,6 +1580,40 @@ int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list
|
||||||
last_isspace = 0;
|
last_isspace = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case LOG_FMT_HTTP_QUERY: // %HQ
|
||||||
|
if (tmp->options & LOG_OPT_QUOTE)
|
||||||
|
LOGCHAR('"');
|
||||||
|
|
||||||
|
if (!txn->uri) {
|
||||||
|
chunk.str = "<BADREQ>";
|
||||||
|
chunk.len = strlen("<BADREQ>");
|
||||||
|
} else {
|
||||||
|
uri = txn->uri;
|
||||||
|
end = uri + strlen(uri);
|
||||||
|
// look for the first question mark
|
||||||
|
while (uri < end && *uri != '?')
|
||||||
|
uri++;
|
||||||
|
|
||||||
|
qmark = uri;
|
||||||
|
// look for first space or question mark after url
|
||||||
|
while (uri < end && !HTTP_IS_SPHT(*uri))
|
||||||
|
uri++;
|
||||||
|
|
||||||
|
chunk.str = qmark;
|
||||||
|
chunk.len = uri - qmark;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk);
|
||||||
|
if (ret == NULL || *ret != '\0')
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
tmplog = ret;
|
||||||
|
if (tmp->options & LOG_OPT_QUOTE)
|
||||||
|
LOGCHAR('"');
|
||||||
|
|
||||||
|
last_isspace = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
case LOG_FMT_HTTP_URI: // %HU
|
case LOG_FMT_HTTP_URI: // %HU
|
||||||
uri = txn->uri ? txn->uri : "<BADREQ>";
|
uri = txn->uri ? txn->uri : "<BADREQ>";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue