2016-03-19 15:14:35 +00:00
|
|
|
#include "first.h"
|
|
|
|
|
2009-10-11 14:31:42 +00:00
|
|
|
#include "base.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
|
|
|
|
#include "plugin.h"
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
# include <syslog.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
char key;
|
2006-10-04 13:26:23 +00:00
|
|
|
enum {
|
2005-02-20 14:27:00 +00:00
|
|
|
FORMAT_UNSET,
|
|
|
|
FORMAT_UNSUPPORTED,
|
|
|
|
FORMAT_PERCENT,
|
|
|
|
FORMAT_REMOTE_HOST,
|
|
|
|
FORMAT_REMOTE_IDENT,
|
|
|
|
FORMAT_REMOTE_USER,
|
|
|
|
FORMAT_TIMESTAMP,
|
|
|
|
FORMAT_REQUEST_LINE,
|
|
|
|
FORMAT_STATUS,
|
|
|
|
FORMAT_BYTES_OUT_NO_HEADER,
|
|
|
|
FORMAT_HEADER,
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
FORMAT_REMOTE_ADDR,
|
|
|
|
FORMAT_LOCAL_ADDR,
|
|
|
|
FORMAT_COOKIE,
|
2016-07-13 00:41:53 +00:00
|
|
|
FORMAT_TIME_USED_US,
|
2005-02-20 14:27:00 +00:00
|
|
|
FORMAT_ENV,
|
|
|
|
FORMAT_FILENAME,
|
|
|
|
FORMAT_REQUEST_PROTOCOL,
|
|
|
|
FORMAT_REQUEST_METHOD,
|
|
|
|
FORMAT_SERVER_PORT,
|
|
|
|
FORMAT_QUERY_STRING,
|
|
|
|
FORMAT_TIME_USED,
|
|
|
|
FORMAT_URL,
|
|
|
|
FORMAT_SERVER_NAME,
|
2005-09-02 16:09:42 +00:00
|
|
|
FORMAT_HTTP_HOST,
|
2005-02-20 14:27:00 +00:00
|
|
|
FORMAT_CONNECTION_STATUS,
|
|
|
|
FORMAT_BYTES_IN,
|
|
|
|
FORMAT_BYTES_OUT,
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2016-07-13 00:41:53 +00:00
|
|
|
FORMAT_KEEPALIVE_COUNT,
|
2005-02-20 14:27:00 +00:00
|
|
|
FORMAT_RESPONSE_HEADER
|
|
|
|
} type;
|
|
|
|
} format_mapping;
|
|
|
|
|
|
|
|
/**
|
2006-10-04 13:26:23 +00:00
|
|
|
*
|
|
|
|
*
|
2005-02-20 14:27:00 +00:00
|
|
|
* "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
2006-10-04 13:26:23 +00:00
|
|
|
*
|
2005-02-20 14:27:00 +00:00
|
|
|
*/
|
|
|
|
|
2012-08-31 14:11:39 +00:00
|
|
|
static const format_mapping fmap[] =
|
2006-10-04 13:26:23 +00:00
|
|
|
{
|
2005-02-20 14:27:00 +00:00
|
|
|
{ '%', FORMAT_PERCENT },
|
|
|
|
{ 'h', FORMAT_REMOTE_HOST },
|
|
|
|
{ 'l', FORMAT_REMOTE_IDENT },
|
|
|
|
{ 'u', FORMAT_REMOTE_USER },
|
|
|
|
{ 't', FORMAT_TIMESTAMP },
|
|
|
|
{ 'r', FORMAT_REQUEST_LINE },
|
|
|
|
{ 's', FORMAT_STATUS },
|
|
|
|
{ 'b', FORMAT_BYTES_OUT_NO_HEADER },
|
|
|
|
{ 'i', FORMAT_HEADER },
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
{ 'a', FORMAT_REMOTE_ADDR },
|
|
|
|
{ 'A', FORMAT_LOCAL_ADDR },
|
|
|
|
{ 'B', FORMAT_BYTES_OUT_NO_HEADER },
|
|
|
|
{ 'C', FORMAT_COOKIE },
|
2016-07-13 00:41:53 +00:00
|
|
|
{ 'D', FORMAT_TIME_USED_US },
|
2005-02-20 14:27:00 +00:00
|
|
|
{ 'e', FORMAT_ENV },
|
|
|
|
{ 'f', FORMAT_FILENAME },
|
|
|
|
{ 'H', FORMAT_REQUEST_PROTOCOL },
|
2016-07-13 00:41:53 +00:00
|
|
|
{ 'k', FORMAT_KEEPALIVE_COUNT },
|
2005-02-20 14:27:00 +00:00
|
|
|
{ 'm', FORMAT_REQUEST_METHOD },
|
|
|
|
{ 'n', FORMAT_UNSUPPORTED }, /* we have no notes */
|
|
|
|
{ 'p', FORMAT_SERVER_PORT },
|
|
|
|
{ 'P', FORMAT_UNSUPPORTED }, /* we are only one process */
|
|
|
|
{ 'q', FORMAT_QUERY_STRING },
|
|
|
|
{ 'T', FORMAT_TIME_USED },
|
|
|
|
{ 'U', FORMAT_URL }, /* w/o querystring */
|
|
|
|
{ 'v', FORMAT_SERVER_NAME },
|
2005-09-02 16:09:42 +00:00
|
|
|
{ 'V', FORMAT_HTTP_HOST },
|
2005-02-20 14:27:00 +00:00
|
|
|
{ 'X', FORMAT_CONNECTION_STATUS },
|
|
|
|
{ 'I', FORMAT_BYTES_IN },
|
|
|
|
{ 'O', FORMAT_BYTES_OUT },
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
{ 'o', FORMAT_RESPONSE_HEADER },
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
{ '\0', FORMAT_UNSET }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2016-07-13 00:41:53 +00:00
|
|
|
enum e_optflags_time {
|
|
|
|
/* format string is passed to strftime unless other format optflags set
|
|
|
|
* (besides FORMAT_FLAG_TIME_BEGIN or FORMAT_FLAG_TIME_END) */
|
|
|
|
FORMAT_FLAG_TIME_END = 0x00,/* use request end time (default) */
|
|
|
|
FORMAT_FLAG_TIME_BEGIN = 0x01,/* use request start time */
|
|
|
|
FORMAT_FLAG_TIME_SEC = 0x02,/* request time as num sec since epoch */
|
|
|
|
FORMAT_FLAG_TIME_MSEC = 0x04,/* request time as num msec since epoch */
|
|
|
|
FORMAT_FLAG_TIME_USEC = 0x08,/* request time as num usec since epoch */
|
|
|
|
FORMAT_FLAG_TIME_NSEC = 0x10,/* request time as num nsec since epoch */
|
|
|
|
FORMAT_FLAG_TIME_MSEC_FRAC = 0x20,/* request time msec fraction */
|
|
|
|
FORMAT_FLAG_TIME_USEC_FRAC = 0x40,/* request time usec fraction */
|
|
|
|
FORMAT_FLAG_TIME_NSEC_FRAC = 0x80 /* request time nsec fraction */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
typedef struct {
|
|
|
|
enum { FIELD_UNSET, FIELD_STRING, FIELD_FORMAT } type;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer *string;
|
|
|
|
int field;
|
2016-07-13 00:41:53 +00:00
|
|
|
int opt;
|
2005-02-20 14:27:00 +00:00
|
|
|
} format_field;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
format_field **ptr;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
size_t used;
|
|
|
|
size_t size;
|
|
|
|
} format_fields;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
buffer *access_logfile;
|
2013-07-31 20:23:18 +00:00
|
|
|
int log_access_fd;
|
|
|
|
buffer *access_logbuffer; /* each logfile has a separate buffer */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2013-07-31 20:23:18 +00:00
|
|
|
unsigned short use_syslog; /* syslog has global buffer */
|
2013-08-30 14:13:43 +00:00
|
|
|
unsigned short syslog_level;
|
2013-07-31 20:23:18 +00:00
|
|
|
|
|
|
|
buffer *format;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
time_t last_generated_accesslog_ts;
|
|
|
|
time_t *last_generated_accesslog_ts_ptr;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer *ts_accesslog_str;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
format_fields *parsed_format;
|
|
|
|
} plugin_config;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PLUGIN_DATA;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
plugin_config **config_storage;
|
2006-10-04 13:26:23 +00:00
|
|
|
plugin_config conf;
|
2013-07-31 20:23:18 +00:00
|
|
|
|
|
|
|
buffer *syslog_logbuffer; /* syslog has global buffer. no caching, always written directly */
|
2005-02-20 14:27:00 +00:00
|
|
|
} plugin_data;
|
|
|
|
|
|
|
|
INIT_FUNC(mod_accesslog_init) {
|
|
|
|
plugin_data *p;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
p = calloc(1, sizeof(*p));
|
2013-07-31 20:23:18 +00:00
|
|
|
p->syslog_logbuffer = buffer_init();
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2015-08-22 16:01:08 +00:00
|
|
|
static void accesslog_write_all(server *srv, const buffer *filename, int fd, const void* buf, size_t count) {
|
|
|
|
if (-1 == write_all(fd, buf, count)) {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "sbs",
|
|
|
|
"writing access log entry failed:", filename, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-16 16:43:28 +00:00
|
|
|
static void accesslog_append_escaped(buffer *dest, buffer *str) {
|
2010-08-05 19:53:49 +00:00
|
|
|
char *ptr, *start, *end;
|
2010-07-11 17:18:54 +00:00
|
|
|
|
2009-10-16 16:43:28 +00:00
|
|
|
/* replaces non-printable chars with \xHH where HH is the hex representation of the byte */
|
|
|
|
/* exceptions: " => \", \ => \\, whitespace chars => \n \t etc. */
|
2015-02-08 19:10:39 +00:00
|
|
|
if (buffer_string_is_empty(str)) return;
|
|
|
|
buffer_string_prepare_append(dest, buffer_string_length(str));
|
2009-10-16 16:43:28 +00:00
|
|
|
|
2015-02-08 19:10:39 +00:00
|
|
|
for (ptr = start = str->ptr, end = str->ptr + buffer_string_length(str); ptr < end; ptr++) {
|
2015-07-05 16:01:16 +00:00
|
|
|
unsigned char const c = (unsigned char) *ptr;
|
2012-04-19 13:02:08 +00:00
|
|
|
if (c >= ' ' && c <= '~' && c != '"' && c != '\\') {
|
2010-08-05 19:53:49 +00:00
|
|
|
/* nothing to change, add later as one block */
|
|
|
|
} else {
|
|
|
|
/* copy previous part */
|
|
|
|
if (start < ptr) {
|
|
|
|
buffer_append_string_len(dest, start, ptr - start);
|
|
|
|
}
|
|
|
|
start = ptr + 1;
|
|
|
|
|
2012-04-19 13:02:08 +00:00
|
|
|
switch (c) {
|
2010-08-05 19:53:49 +00:00
|
|
|
case '"':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\\"");
|
|
|
|
break;
|
|
|
|
case '\\':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\\\");
|
|
|
|
break;
|
|
|
|
case '\b':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\b");
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\n");
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\r");
|
|
|
|
break;
|
|
|
|
case '\t':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\t");
|
|
|
|
break;
|
|
|
|
case '\v':
|
|
|
|
BUFFER_APPEND_STRING_CONST(dest, "\\v");
|
|
|
|
break;
|
|
|
|
default: {
|
|
|
|
/* non printable char => \xHH */
|
|
|
|
char hh[5] = {'\\','x',0,0,0};
|
2012-04-19 13:02:08 +00:00
|
|
|
char h = c / 16;
|
2010-08-05 19:53:49 +00:00
|
|
|
hh[2] = (h > 9) ? (h - 10 + 'A') : (h + '0');
|
2012-04-19 13:02:08 +00:00
|
|
|
h = c % 16;
|
2010-08-05 19:53:49 +00:00
|
|
|
hh[3] = (h > 9) ? (h - 10 + 'A') : (h + '0');
|
|
|
|
buffer_append_string_len(dest, &hh[0], 4);
|
|
|
|
}
|
|
|
|
break;
|
2009-10-16 16:43:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-08-05 19:53:49 +00:00
|
|
|
|
|
|
|
if (start < end) {
|
|
|
|
buffer_append_string_len(dest, start, end - start);
|
|
|
|
}
|
2009-10-16 16:43:28 +00:00
|
|
|
}
|
|
|
|
|
2009-03-07 21:05:37 +00:00
|
|
|
static int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) {
|
2005-02-20 14:27:00 +00:00
|
|
|
size_t i, j, k = 0, start = 0;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
if (buffer_is_empty(format)) return -1;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
for (i = 0; i < buffer_string_length(format); i++) {
|
2005-02-20 14:27:00 +00:00
|
|
|
switch(format->ptr[i]) {
|
|
|
|
case '%':
|
2007-04-09 19:58:57 +00:00
|
|
|
if (i > 0 && start != i) {
|
|
|
|
/* copy the string before this % */
|
2005-02-20 14:27:00 +00:00
|
|
|
if (fields->size == 0) {
|
|
|
|
fields->size = 16;
|
|
|
|
fields->used = 0;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = malloc(fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
} else if (fields->used == fields->size) {
|
|
|
|
fields->size += 16;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr[fields->used] = malloc(sizeof(format_field));
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->ptr[fields->used]->type = FIELD_STRING;
|
|
|
|
fields->ptr[fields->used]->string = buffer_init();
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer_copy_string_len(fields->ptr[fields->used]->string, format->ptr + start, i - start);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->used++;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* we need a new field */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (fields->size == 0) {
|
|
|
|
fields->size = 16;
|
|
|
|
fields->used = 0;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = malloc(fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
} else if (fields->used == fields->size) {
|
|
|
|
fields->size += 16;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* search for the terminating command */
|
|
|
|
switch (format->ptr[i+1]) {
|
|
|
|
case '>':
|
|
|
|
case '<':
|
2007-04-09 19:58:57 +00:00
|
|
|
/* after the } has to be a character */
|
|
|
|
if (format->ptr[i+2] == '\0') {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%< and %> have to be followed by a format-specifier");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (j = 0; fmap[j].key != '\0'; j++) {
|
|
|
|
if (fmap[j].key != format->ptr[i+2]) continue;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* found key */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr[fields->used] = malloc(sizeof(format_field));
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->ptr[fields->used]->type = FIELD_FORMAT;
|
|
|
|
fields->ptr[fields->used]->field = fmap[j].type;
|
|
|
|
fields->ptr[fields->used]->string = NULL;
|
2016-07-13 00:41:53 +00:00
|
|
|
fields->ptr[fields->used]->opt = 0;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->used++;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (fmap[j].key == '\0') {
|
2007-04-09 19:58:57 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%< and %> have to be followed by a valid format-specifier");
|
2005-02-20 14:27:00 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
start = i + 3;
|
2007-04-09 19:58:57 +00:00
|
|
|
i = start - 1; /* skip the string */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
case '{':
|
|
|
|
/* go forward to } */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
for (k = i+2; k < buffer_string_length(format); k++) {
|
2005-02-20 14:27:00 +00:00
|
|
|
if (format->ptr[k] == '}') break;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
if (k == buffer_string_length(format)) {
|
2007-04-09 19:58:57 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%{ has to be terminated by a }");
|
2005-02-20 14:27:00 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2007-04-09 19:58:57 +00:00
|
|
|
|
|
|
|
/* after the } has to be a character */
|
2005-02-20 14:27:00 +00:00
|
|
|
if (format->ptr[k+1] == '\0') {
|
2007-04-09 19:58:57 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be followed by a format-specifier");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (k == i + 2) {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be contain a string");
|
2005-02-20 14:27:00 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (j = 0; fmap[j].key != '\0'; j++) {
|
|
|
|
if (fmap[j].key != format->ptr[k+1]) continue;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* found key */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr[fields->used] = malloc(sizeof(format_field));
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->ptr[fields->used]->type = FIELD_FORMAT;
|
|
|
|
fields->ptr[fields->used]->field = fmap[j].type;
|
|
|
|
fields->ptr[fields->used]->string = buffer_init();
|
2016-07-13 00:41:53 +00:00
|
|
|
fields->ptr[fields->used]->opt = 0;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer_copy_string_len(fields->ptr[fields->used]->string, format->ptr + i + 2, k - (i + 2));
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->used++;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (fmap[j].key == '\0') {
|
2007-04-09 19:58:57 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be followed by a valid format-specifier");
|
2005-02-20 14:27:00 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
start = k + 2;
|
2007-04-09 19:58:57 +00:00
|
|
|
i = start - 1; /* skip the string */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
default:
|
2007-04-09 19:58:57 +00:00
|
|
|
/* after the % has to be a character */
|
|
|
|
if (format->ptr[i+1] == '\0') {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "% has to be followed by a format-specifier");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (j = 0; fmap[j].key != '\0'; j++) {
|
|
|
|
if (fmap[j].key != format->ptr[i+1]) continue;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* found key */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr[fields->used] = malloc(sizeof(format_field));
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->ptr[fields->used]->type = FIELD_FORMAT;
|
|
|
|
fields->ptr[fields->used]->field = fmap[j].type;
|
|
|
|
fields->ptr[fields->used]->string = NULL;
|
2016-07-13 00:41:53 +00:00
|
|
|
fields->ptr[fields->used]->opt = 0;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->used++;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (fmap[j].key == '\0') {
|
2007-04-09 19:58:57 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "s", "% has to be followed by a valid format-specifier");
|
2005-02-20 14:27:00 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
start = i + 2;
|
2007-04-09 19:58:57 +00:00
|
|
|
i = start - 1; /* skip the string */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (start < i) {
|
|
|
|
/* copy the string */
|
|
|
|
if (fields->size == 0) {
|
|
|
|
fields->size = 16;
|
|
|
|
fields->used = 0;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = malloc(fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
} else if (fields->used == fields->size) {
|
|
|
|
fields->size += 16;
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * ));
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2009-02-03 20:16:20 +00:00
|
|
|
fields->ptr[fields->used] = malloc(sizeof(format_field));
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->ptr[fields->used]->type = FIELD_STRING;
|
|
|
|
fields->ptr[fields->used]->string = buffer_init();
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer_copy_string_len(fields->ptr[fields->used]->string, format->ptr + start, i - start);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
fields->used++;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
FREE_FUNC(mod_accesslog_free) {
|
|
|
|
plugin_data *p = p_d;
|
|
|
|
size_t i;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (!p) return HANDLER_GO_ON;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (p->config_storage) {
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (i = 0; i < srv->config_context->used; i++) {
|
|
|
|
plugin_config *s = p->config_storage[i];
|
2005-06-15 09:27:04 +00:00
|
|
|
|
2015-05-14 09:38:33 +00:00
|
|
|
if (NULL == s) continue;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
if (!buffer_string_is_empty(s->access_logbuffer)) {
|
2013-07-31 20:23:18 +00:00
|
|
|
if (s->log_access_fd != -1) {
|
2015-08-22 16:01:08 +00:00
|
|
|
accesslog_write_all(srv, s->access_logfile, s->log_access_fd, CONST_BUF_LEN(s->access_logbuffer));
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (s->log_access_fd != -1) close(s->log_access_fd);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
buffer_free(s->ts_accesslog_str);
|
|
|
|
buffer_free(s->access_logbuffer);
|
|
|
|
buffer_free(s->format);
|
|
|
|
buffer_free(s->access_logfile);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (s->parsed_format) {
|
|
|
|
size_t j;
|
|
|
|
for (j = 0; j < s->parsed_format->used; j++) {
|
|
|
|
if (s->parsed_format->ptr[j]->string) buffer_free(s->parsed_format->ptr[j]->string);
|
|
|
|
free(s->parsed_format->ptr[j]);
|
|
|
|
}
|
|
|
|
free(s->parsed_format->ptr);
|
|
|
|
free(s->parsed_format);
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
free(s);
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
free(p->config_storage);
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2013-07-31 20:23:18 +00:00
|
|
|
if (p->syslog_logbuffer) buffer_free(p->syslog_logbuffer);
|
2013-11-13 11:43:26 +00:00
|
|
|
free(p);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
SETDEFAULTS_FUNC(log_access_open) {
|
|
|
|
plugin_data *p = p_d;
|
|
|
|
size_t i = 0;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
|
|
|
config_values_t cv[] = {
|
2005-02-20 14:27:00 +00:00
|
|
|
{ "accesslog.filename", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
|
|
|
|
{ "accesslog.use-syslog", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
|
|
|
|
{ "accesslog.format", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
|
2013-08-30 14:13:43 +00:00
|
|
|
{ "accesslog.syslog-level", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },
|
2005-02-20 14:27:00 +00:00
|
|
|
{ NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
|
|
|
|
};
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (!p) return HANDLER_ERROR;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2013-11-13 11:43:26 +00:00
|
|
|
p->config_storage = calloc(1, srv->config_context->used * sizeof(plugin_config *));
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (i = 0; i < srv->config_context->used; i++) {
|
2015-11-07 12:51:11 +00:00
|
|
|
data_config const* config = (data_config const*)srv->config_context->data[i];
|
2005-02-20 14:27:00 +00:00
|
|
|
plugin_config *s;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
s = calloc(1, sizeof(plugin_config));
|
|
|
|
s->access_logfile = buffer_init();
|
|
|
|
s->format = buffer_init();
|
|
|
|
s->access_logbuffer = buffer_init();
|
|
|
|
s->ts_accesslog_str = buffer_init();
|
|
|
|
s->log_access_fd = -1;
|
|
|
|
s->last_generated_accesslog_ts = 0;
|
|
|
|
s->last_generated_accesslog_ts_ptr = &(s->last_generated_accesslog_ts);
|
2013-08-30 14:13:43 +00:00
|
|
|
s->syslog_level = LOG_INFO;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
cv[0].destination = s->access_logfile;
|
|
|
|
cv[1].destination = &(s->use_syslog);
|
|
|
|
cv[2].destination = s->format;
|
2013-08-30 14:13:43 +00:00
|
|
|
cv[3].destination = &(s->syslog_level);
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
p->config_storage[i] = s;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-11-07 12:51:11 +00:00
|
|
|
if (0 != config_insert_values_global(srv, config->value, cv, i == 0 ? T_CONFIG_SCOPE_SERVER : T_CONFIG_SCOPE_CONNECTION)) {
|
2005-02-20 14:27:00 +00:00
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 12:37:10 +00:00
|
|
|
if (i == 0 && buffer_string_is_empty(s->format)) {
|
2005-02-20 14:27:00 +00:00
|
|
|
/* set a default logfile string */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2008-07-30 19:38:32 +00:00
|
|
|
buffer_copy_string_len(s->format, CONST_STR_LEN("%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""));
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
/* parse */
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
if (!buffer_is_empty(s->format)) {
|
2016-07-13 00:41:53 +00:00
|
|
|
size_t j, tcount = 0;
|
2009-10-12 10:13:01 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
s->parsed_format = calloc(1, sizeof(*(s->parsed_format)));
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (-1 == accesslog_parse_format(srv, s->parsed_format, s->format)) {
|
2005-06-27 19:25:55 +00:00
|
|
|
|
2006-10-04 13:26:23 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "sb",
|
2005-06-27 19:25:55 +00:00
|
|
|
"parsing accesslog-definition failed:", s->format);
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
2009-10-12 10:13:01 +00:00
|
|
|
|
2016-07-13 00:41:53 +00:00
|
|
|
for (j = 0; j < s->parsed_format->used; ++j) {
|
|
|
|
format_field * const f = s->parsed_format->ptr[j];
|
|
|
|
if (FIELD_FORMAT != f->type) continue;
|
|
|
|
if (FORMAT_TIMESTAMP == f->field) {
|
|
|
|
if (!buffer_string_is_empty(f->string)) {
|
|
|
|
const char *ptr = f->string->ptr;
|
|
|
|
if (0 == strncmp(ptr, "begin:", sizeof("begin:")-1)) {
|
|
|
|
f->opt |= FORMAT_FLAG_TIME_BEGIN;
|
|
|
|
ptr += sizeof("begin:")-1;
|
|
|
|
} else if (0 == strncmp(ptr, "end:", sizeof("end:")-1)) {
|
|
|
|
f->opt |= FORMAT_FLAG_TIME_END;
|
|
|
|
ptr += sizeof("end:")-1;
|
2009-10-12 10:13:01 +00:00
|
|
|
}
|
2016-07-13 00:41:53 +00:00
|
|
|
if (0 == strcmp(ptr, "sec")) f->opt |= FORMAT_FLAG_TIME_SEC;
|
|
|
|
else if (0 == strcmp(ptr, "msec")) f->opt |= FORMAT_FLAG_TIME_MSEC;
|
|
|
|
else if (0 == strcmp(ptr, "usec")) f->opt |= FORMAT_FLAG_TIME_USEC;
|
|
|
|
else if (0 == strcmp(ptr, "nsec")) f->opt |= FORMAT_FLAG_TIME_NSEC;
|
|
|
|
else if (0 == strcmp(ptr, "msec_frac")) f->opt |= FORMAT_FLAG_TIME_MSEC_FRAC;
|
|
|
|
else if (0 == strcmp(ptr, "usec_frac")) f->opt |= FORMAT_FLAG_TIME_USEC_FRAC;
|
|
|
|
else if (0 == strcmp(ptr, "nsec_frac")) f->opt |= FORMAT_FLAG_TIME_NSEC_FRAC;
|
|
|
|
else if (NULL == strchr(ptr, '%')) {
|
2009-10-12 10:13:01 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "sb",
|
2016-07-13 00:41:53 +00:00
|
|
|
"constant string for time format (misspelled token? or missing '%'):", s->format);
|
2009-10-12 10:13:01 +00:00
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2016-07-13 00:41:53 +00:00
|
|
|
|
|
|
|
/* make sure they didn't try to send the timestamp in twice
|
|
|
|
* (would invalidate s->ts_accesslog_str cache of timestamp str) */
|
|
|
|
if (!(f->opt & ~(FORMAT_FLAG_TIME_BEGIN|FORMAT_FLAG_TIME_END|FORMAT_FLAG_TIME_SEC)) && ++tcount > 1) {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "sb",
|
|
|
|
"you may not use strftime timestamp format %{}t twice in the same access log:", s->format);
|
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (f->opt & FORMAT_FLAG_TIME_BEGIN) srv->srvconf.high_precision_timestamps = 1;
|
|
|
|
} else if (FORMAT_TIME_USED_US == f->field) {
|
|
|
|
f->opt |= FORMAT_FLAG_TIME_USEC;
|
|
|
|
srv->srvconf.high_precision_timestamps = 1;
|
|
|
|
} else if (FORMAT_TIME_USED == f->field) {
|
|
|
|
if (f->opt & ~(FORMAT_FLAG_TIME_SEC)) srv->srvconf.high_precision_timestamps = 1;
|
|
|
|
|
|
|
|
if (buffer_string_is_empty(f->string)
|
2016-07-18 03:21:50 +00:00
|
|
|
|| buffer_is_equal_string(f->string, CONST_STR_LEN("s"))
|
|
|
|
|| buffer_is_equal_string(f->string, CONST_STR_LEN("sec"))) f->opt |= FORMAT_FLAG_TIME_SEC;
|
|
|
|
else if (buffer_is_equal_string(f->string, CONST_STR_LEN("ms"))
|
|
|
|
|| buffer_is_equal_string(f->string, CONST_STR_LEN("msec"))) f->opt |= FORMAT_FLAG_TIME_MSEC;
|
|
|
|
else if (buffer_is_equal_string(f->string, CONST_STR_LEN("us"))
|
|
|
|
|| buffer_is_equal_string(f->string, CONST_STR_LEN("usec"))) f->opt |= FORMAT_FLAG_TIME_USEC;
|
|
|
|
else if (buffer_is_equal_string(f->string, CONST_STR_LEN("ns"))
|
|
|
|
|| buffer_is_equal_string(f->string, CONST_STR_LEN("nsec"))) f->opt |= FORMAT_FLAG_TIME_NSEC;
|
2016-07-13 00:41:53 +00:00
|
|
|
else {
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "sb",
|
|
|
|
"invalid time unit in %{UNIT}T:", s->format);
|
|
|
|
|
|
|
|
return HANDLER_ERROR;
|
|
|
|
}
|
|
|
|
} else if (FORMAT_COOKIE == f->field) {
|
|
|
|
if (buffer_string_is_empty(f->string)) f->type = FIELD_STRING; /*(blank)*/
|
2009-10-12 10:13:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
#if 0
|
2006-10-04 13:26:23 +00:00
|
|
|
/* debugging */
|
2005-02-20 14:27:00 +00:00
|
|
|
for (j = 0; j < s->parsed_format->used; j++) {
|
|
|
|
switch (s->parsed_format->ptr[j]->type) {
|
|
|
|
case FIELD_FORMAT:
|
2006-10-04 13:26:23 +00:00
|
|
|
log_error_write(srv, __FILE__, __LINE__, "ssds",
|
2005-02-20 14:27:00 +00:00
|
|
|
"config:", "format", s->parsed_format->ptr[j]->field,
|
2006-10-04 13:26:23 +00:00
|
|
|
s->parsed_format->ptr[j]->string ?
|
2005-02-20 14:27:00 +00:00
|
|
|
s->parsed_format->ptr[j]->string->ptr : "" );
|
|
|
|
break;
|
|
|
|
case FIELD_STRING:
|
|
|
|
log_error_write(srv, __FILE__, __LINE__, "ssbs", "config:", "string '", s->parsed_format->ptr[j]->string, "'");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
if (s->use_syslog) {
|
|
|
|
/* ignore the next checks */
|
|
|
|
continue;
|
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2015-02-08 19:10:44 +00:00
|
|
|
if (buffer_string_is_empty(s->access_logfile)) continue;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2016-03-26 13:39:54 +00:00
|
|
|
if (srv->srvconf.preflight_check) continue;
|
|
|
|
|
2009-04-10 10:50:51 +00:00
|
|
|
if (-1 == (s->log_access_fd = open_logfile_or_pipe(srv, s->access_logfile->ptr)))
|
2005-02-20 14:27:00 +00:00
|
|
|
return HANDLER_ERROR;
|
2009-04-10 10:50:51 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
}
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
return HANDLER_GO_ON;
|
|
|
|
}
|
|
|
|
|
|
|
|
SIGHUP_FUNC(log_access_cycle) {
|
|
|
|
plugin_data *p = p_d;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (!p->config_storage) return HANDLER_GO_ON;
|
2006-10-04 13:26:23 +00:00
|
|
|
|
2005-02-20 14:27:00 +00:00
|
|
|
for (i = 0; i < srv->config_context->used; i++) {
|
|
|
|
plugin_config *s = p->config_storage[i];
|
|
|
|
|
<