Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rewrite extract_specific_cookie #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

rewrite extract_specific_cookie #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3310945
rewrite extract_specific_cookie
mrhans3n Jun 21, 2020
03dcf0d
dont try to insert NULL into database, simply skip that column/value …
mrhans3n Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/mod_log_sql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ typedef enum {
LOGSQL_DATATYPE_SMALLINT,
LOGSQL_DATATYPE_VARCHAR,
LOGSQL_DATATYPE_CHAR,
LOGSQL_DATATYPE_BIGINT
LOGSQL_DATATYPE_BIGINT,
LOGSQL_DATATYPE_TIMESTAMP
} logsql_field_datatype;

LOGSQL_DECLARE(void) log_sql_register_field(apr_pool_t *p,
Expand Down
235 changes: 81 additions & 154 deletions src/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,94 +7,76 @@

static const char *extract_remote_host(request_rec *r, char *a)
{
return (char *) ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL);
return (char *) ap_get_useragent_host(r, REMOTE_NAME, NULL);
}

static const char *extract_remote_address(request_rec *r, char *a) __attribute__((unused));

static const char *extract_remote_address(request_rec *r, char *a)
{
return r->connection->remote_ip;
return r->useragent_ip;
}

static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));

static const char *extract_local_address(request_rec *r, char *a)
{
return r->connection->local_ip;
}

static const char *extract_remote_logname(request_rec *r, char *a)
{
return (char *) ap_get_remote_logname(r);
return (char *) ap_get_remote_logname(r);
}

static const char *extract_remote_user(request_rec *r, char *a)
{
#ifdef WITH_APACHE13
char *rvalue = r->connection->user;
#else
char *rvalue = r->user;
#endif
if (rvalue == NULL) {
rvalue = "-";
} else if (strlen(rvalue) == 0) {
rvalue = "\"\"";
}
return rvalue;
return r->user;
}

static const char *extract_request_line(request_rec *r, char *a)
{
/* Upddated to mod_log_config logic */
/* NOTE: If the original request contained a password, we
* re-write the request line here to contain XXXXXX instead:
* (note the truncation before the protocol string for HTTP/0.9 requests)
* (note also that r->the_request contains the unmodified request)
*/
return (r->parsed_uri.password)
? apr_pstrcat(r->pool, r->method, " ",
apr_uri_unparse(r->pool,
&r->parsed_uri, 0),
r->assbackwards ? NULL : " ",
r->protocol, NULL)
: r->the_request;
/* Upddated to mod_log_config logic */
/* NOTE: If the original request contained a password, we
* re-write the request line here to contain XXXXXX instead:
* (note the truncation before the protocol string for HTTP/0.9 requests)
* (note also that r->the_request contains the unmodified request)
*/
return (r->parsed_uri.password)
? apr_pstrcat(r->pool, r->method, " ",
apr_uri_unparse(r->pool, &r->parsed_uri, 0), r->assbackwards ? NULL : " ", r->protocol, NULL)
: r->the_request;
}

static const char *extract_request_file(request_rec *r, char *a)
{
return r->filename;
return r->filename;
}

static const char *extract_request_uri(request_rec *r, char *a)
{
return r->uri;
return r->uri;
}

static const char *extract_request_method(request_rec *r, char *a)
{
return r->method;
return r->method;
}

static const char *extract_request_protocol(request_rec *r, char *a)
{
return r->protocol;
return r->protocol;
}

static const char *extract_request_query(request_rec *r, char *a)
{
return (r->args) ? apr_pstrcat(r->pool, "?",
r->args, NULL)
: "";
return (r->args) ? apr_pstrcat(r->pool, "?", r->args, NULL)
: NULL;
}

static const char *extract_status(request_rec *r, char *a)
{
if (r->status <= 0) {
return "-";
} else {
return apr_psprintf(r->pool, "%d", r->status);
}
if (r->status <= 0) {
return NULL;
} else {
return apr_psprintf(r->pool, "%d", r->status);
}
}

static const char *extract_virtual_host(request_rec *r, char *a)
Expand All @@ -109,153 +91,98 @@ static const char *extract_server_name(request_rec *r, char *a)

static const char *extract_machine_id(request_rec *r, char *a)
{
if (!global_config.machid)
return "-";
else
return global_config.machid;
return global_config.machid;
}

static const char *extract_server_port(request_rec *r, char *a)
{
return apr_psprintf(r->pool, "%u",
r->server->port ? r->server->port : ap_default_port(r));
}

/* This respects the setting of UseCanonicalName so that
* the dynamic mass virtual hosting trick works better.
*/
static const char *log_server_name(request_rec *r, char *a) __attribute__((unused));
static const char *log_server_name(request_rec *r, char *a)
{
return ap_get_server_name(r);
return apr_psprintf(r->pool, "%u", r->server->port ? r->server->port : ap_default_port(r));
}

static const char *extract_child_pid(request_rec *r, char *a)
{
if (*a == '\0' || !strcmp(a, "pid")) {
return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());
}
else if (!strcmp(a, "tid")) {
return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());
} else if (!strcmp(a, "tid")) {
#if APR_HAS_THREADS
apr_os_thread_t tid = apr_os_thread_current();
apr_os_thread_t tid = apr_os_thread_current();
#else
int tid = 0; /* APR will format "0" anyway but an arg is needed */
int tid = 0; /* APR will format "0" anyway but an arg is needed */
#endif
return apr_psprintf(r->pool, "%pT", &tid);
return apr_psprintf(r->pool, "%pT", &tid);
}
/* bogus format */
return a;
return NULL;
}

static const char *extract_referer(request_rec *r, char *a)
{
const char *tempref;

tempref = apr_table_get(r->headers_in, "Referer");
if (!tempref)
{
return "-";
} else {
return tempref;
}
return apr_table_get(r->headers_in, "Referer");
}

static const char *extract_agent(request_rec *r, char *a)
{
const char *tempag;

tempag = apr_table_get(r->headers_in, "User-Agent");
if (!tempag)
{
return "-";
} else {
return tempag;
}
return apr_table_get(r->headers_in, "User-Agent");
}


static const char *extract_specific_cookie(request_rec *r, char *a)
{
const char *cookiestr;
char *cookieend;
char *isvalid;
char *cookiebuf;

if (a != NULL) {
log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
"watching for cookie '%s'", a);

/* Fetch out the cookie header */
cookiestr = (char *)apr_table_get(r->headers_in, "cookie2");
if (cookiestr != NULL) {
log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
"Cookie2: [%s]", cookiestr);
/* Does the cookie string contain one with our name? */
isvalid = ap_strstr_c(cookiestr, a);
if (isvalid != NULL) {
/* Move past the cookie name and equal sign */
isvalid += strlen(a) + 1;
/* Duplicate it into the pool */
cookiebuf = apr_pstrdup(r->pool, isvalid);
/* Segregate just this cookie out of the string
* with a terminating nul at the first semicolon */
cookieend = ap_strchr(cookiebuf, ';');
if (cookieend != NULL)
*cookieend = '\0';
return cookiebuf;
}
}
const char *cookiebuf;

cookiestr = (char *)apr_table_get(r->headers_in, "cookie");
if (cookiestr != NULL) {
log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
"Cookie: [%s]", cookiestr);
isvalid = ap_strstr_c(cookiestr, a);
if (isvalid != NULL) {
isvalid += strlen(a) + 1;
cookiebuf = apr_pstrdup(r->pool, isvalid);
cookieend = ap_strchr(cookiebuf, ';');
if (cookieend != NULL)
*cookieend = '\0';
return cookiebuf;
}
}

cookiestr = apr_table_get(r->headers_out, "set-cookie");
if (cookiestr != NULL) {
log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
"Set-Cookie: [%s]", cookiestr);
isvalid = ap_strstr_c(cookiestr, a);
if (isvalid != NULL) {
isvalid += strlen(a) + 1;
cookiebuf = apr_pstrdup(r->pool, isvalid);
cookieend = ap_strchr(cookiebuf, ';');
if (cookieend != NULL)
*cookieend = '\0';
return cookiebuf;
}
}
char *check_cookiestr(void) {
char *cookieend;
char *isvalid;
char *cookie;

if (cookiestr != NULL) {
/* Does the cookie string contain one with our name? */
isvalid = ap_strstr_c(cookiestr, a);
if (isvalid != NULL) {
/* Move past the cookie name and equal sign */
isvalid += strlen(a) + 1;
/* Duplicate it into the pool */
cookie = apr_pstrdup(r->pool, isvalid);
/* Segregate just this cookie out of the string
* with a terminating nul at the first semicolon */
cookieend = ap_strchr(cookie, ';');
if (cookieend != NULL)
*cookieend = '\0';
return cookie;
}
}
return NULL;
}

return "-";
if (a != NULL) {
/* Fetch out the cookie header */
cookiestr = (char *) apr_table_get(r->headers_in, "cookie2");
if ((cookiebuf = check_cookiestr()) != NULL)
return cookiebuf;

/* Fetch out the cookie header */
cookiestr = (char *) apr_table_get(r->headers_in, "cookie");
if ((cookiebuf = check_cookiestr()) != NULL)
return cookiebuf;

/* Fetch out the cookie header */
cookiestr = apr_table_get(r->headers_out, "set-cookie");
if ((cookiebuf = check_cookiestr()) != NULL)
return cookiebuf;
}
return NULL;
}

/*static const char *extract_cookie(request_rec *r, char *a)
static const char *extract_cookie(request_rec *r, char *a)
{
logsql_state *cls = ap_get_module_config(r->server->module_config,
&log_sql_module);
logsql_state *cls = ap_get_module_config(r->server->module_config, &log_sql_module);

return extract_specific_cookie(r, (char *)cls->cookie_name);
}*/
return extract_specific_cookie(r, (char *)cls->cookie_name);
}

static const char *extract_unique_id(request_rec *r, char *a)
{
const char *tempid;

tempid = apr_table_get(r->subprocess_env, "UNIQUE_ID");
if (!tempid)
return "-";
else
return tempid;
return apr_table_get(r->subprocess_env, "UNIQUE_ID");
}

/* End declarations of various extract_ functions */
Loading