Feature #478 » 0002-SCMalloc-result-check-strncpy-replaced-by-strlcpy-im.patch
src/log-httplog.c | ||
---|---|---|
LogFileCtx *file_ctx;
|
||
uint32_t flags; /** Store mode */
|
||
uint32_t cf_n; /** Total number of custom string format nodes */
|
||
LogHttpCustomFormatNode *cf_nodes[LOG_HTTP_MAXN_NODES]; /** Array of custom format string nodes */
|
||
LogHttpCustomFormatNode *cf_nodes[LOG_HTTP_MAXN_NODES]; /** Custom format string nodes */
|
||
} LogHttpFileCtx;
|
||
#define LOG_HTTP_DEFAULT 0
|
||
... | ... | |
MemBuffer *buffer;
|
||
} LogHttpLogThread;
|
||
static void CreateTimeString (const struct timeval *ts, char *str, size_t size) {
|
||
static void CreateTimeString (const struct timeval *ts, char *str, size_t size)
|
||
{
|
||
time_t time = ts->tv_sec;
|
||
struct tm local_tm;
|
||
struct tm *t = (struct tm *)SCLocalTime(time, &local_tm);
|
||
... | ... | |
}
|
||
/* Custom format logging */
|
||
static void LogHttpLogCustom(LogHttpLogThread *aft, htp_tx_t *tx, const struct timeval *ts, char *srcip, Port sp, char *dstip, Port dp){
|
||
static void LogHttpLogCustom(LogHttpLogThread *aft, htp_tx_t *tx, const struct timeval *ts,
|
||
char *srcip, Port sp, char *dstip, Port dp)
|
||
{
|
||
LogHttpFileCtx *httplog_ctx = aft->httplog_ctx;
|
||
uint32_t i;
|
||
char buf[128];
|
||
... | ... | |
struct tm local_tm;
|
||
struct tm *timestamp = (struct tm *)SCLocalTime(time, &local_tm);
|
||
|
||
|
||
for (i=0; i<httplog_ctx->cf_n; i++) {
|
||
for (i = 0; i < httplog_ctx->cf_n; i++) {
|
||
switch (httplog_ctx->cf_nodes[i]->type){
|
||
case LOG_HTTP_CF_LITERAL:
|
||
/* LITERAL */
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)httplog_ctx->cf_nodes[i]->data,strlen(httplog_ctx->cf_nodes[i]->data));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)httplog_ctx->cf_nodes[i]->data,
|
||
strlen(httplog_ctx->cf_nodes[i]->data));
|
||
break;
|
||
case LOG_HTTP_CF_TIMESTAMP:
|
||
/* TIMESTAMP */
|
||
if (httplog_ctx->cf_nodes[i]->data=='\0') {
|
||
strftime(buf,62,TIMESTAMP_DEFAULT_FORMAT, timestamp);
|
||
if (httplog_ctx->cf_nodes[i]->data == '\0') {
|
||
strftime(buf, 62, TIMESTAMP_DEFAULT_FORMAT, timestamp);
|
||
} else {
|
||
strftime(buf,62,httplog_ctx->cf_nodes[i]->data, timestamp);
|
||
strftime(buf, 62, httplog_ctx->cf_nodes[i]->data, timestamp);
|
||
}
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)buf,strlen(buf));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)buf,strlen(buf));
|
||
break;
|
||
case LOG_HTTP_CF_TIMESTAMP_U:
|
||
/* TIMESTAMP USECONDS */
|
||
snprintf(buf,62,"%06u", (unsigned int) ts->tv_usec);
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)buf,strlen(buf));
|
||
snprintf(buf, 62, "%06u", (unsigned int) ts->tv_usec);
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)buf,strlen(buf));
|
||
break;
|
||
case LOG_HTTP_CF_CLIENT_IP:
|
||
/* CLIENT IP ADDRESS */
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)srcip,strlen(srcip));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)srcip,strlen(srcip));
|
||
break;
|
||
case LOG_HTTP_CF_SERVER_IP:
|
||
/* SERVER IP ADDRESS */
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)dstip,strlen(dstip));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)dstip,strlen(dstip));
|
||
break;
|
||
case LOG_HTTP_CF_CLIENT_PORT:
|
||
/* CLIENT PORT */
|
||
MemBufferWriteString(aft->buffer,"%" PRIu16 "",sp);
|
||
MemBufferWriteString(aft->buffer, "%" PRIu16 "", sp);
|
||
break;
|
||
case LOG_HTTP_CF_SERVER_PORT:
|
||
/* SERVER PORT */
|
||
MemBufferWriteString(aft->buffer,"%" PRIu16 "",dp);
|
||
MemBufferWriteString(aft->buffer, "%" PRIu16 "", dp);
|
||
break;
|
||
case LOG_HTTP_CF_REQUEST_METHOD:
|
||
/* METHOD */
|
||
if (tx->request_method != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_method), bstr_len(tx->request_method));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_method),
|
||
bstr_len(tx->request_method));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
... | ... | |
case LOG_HTTP_CF_REQUEST_URI:
|
||
/* URI */
|
||
if (tx->request_uri != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_uri), bstr_len(tx->request_uri));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_uri),
|
||
bstr_len(tx->request_uri));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
break;
|
||
case LOG_HTTP_CF_REQUEST_HOST:
|
||
/* HOSTNAME */
|
||
if (tx->parsed_uri != NULL &&
|
||
tx->parsed_uri->hostname != NULL)
|
||
if (tx->parsed_uri != NULL && tx->parsed_uri->hostname != NULL)
|
||
{
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size, (uint8_t *)bstr_ptr(tx->parsed_uri->hostname), bstr_len(tx->parsed_uri->hostname));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(tx->parsed_uri->hostname),
|
||
bstr_len(tx->parsed_uri->hostname));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
... | ... | |
case LOG_HTTP_CF_REQUEST_PROTOCOL:
|
||
/* PROTOCOL */
|
||
if (tx->request_protocol != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
|
||
(uint8_t *)bstr_ptr(tx->request_protocol),
|
||
bstr_len(tx->request_protocol));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(tx->request_protocol),
|
||
bstr_len(tx->request_protocol));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
... | ... | |
h_request_hdr = table_getc(tx->request_headers, httplog_ctx->cf_nodes[i]->data);
|
||
}
|
||
if (h_request_hdr != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
|
||
(uint8_t *)bstr_ptr(h_request_hdr->value),
|
||
bstr_len(h_request_hdr->value));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(h_request_hdr->value),
|
||
bstr_len(h_request_hdr->value));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
... | ... | |
case LOG_HTTP_CF_RESPONSE_STATUS:
|
||
/* RESPONSE STATUS */
|
||
if (tx->response_status != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
|
||
(uint8_t *)bstr_ptr(tx->response_status),
|
||
bstr_len(tx->response_status));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(tx->response_status),
|
||
bstr_len(tx->response_status));
|
||
/* Redirect? */
|
||
if ((tx->response_status_number > 300) && ((tx->response_status_number) < 303)) {
|
||
if ((tx->response_status_number > 300) && ((tx->response_status_number) < 303)){
|
||
htp_header_t *h_location = table_getc(tx->response_headers, "location");
|
||
if (h_location != NULL) {
|
||
MemBufferWriteString(aft->buffer, "(");
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
|
||
(uint8_t *)bstr_ptr(h_location->value),
|
||
bstr_len(h_location->value));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(h_location->value),
|
||
bstr_len(h_location->value));
|
||
MemBufferWriteString(aft->buffer, ")");
|
||
}
|
||
}
|
||
... | ... | |
case LOG_HTTP_CF_RESPONSE_HEADER:
|
||
/* RESPONSE HEADER */
|
||
if (tx->response_headers != NULL) {
|
||
h_response_hdr = table_getc(tx->response_headers, httplog_ctx->cf_nodes[i]->data);
|
||
h_response_hdr = table_getc(tx->response_headers,
|
||
httplog_ctx->cf_nodes[i]->data);
|
||
}
|
||
if (h_response_hdr != NULL) {
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset, aft->buffer->size,
|
||
(uint8_t *)bstr_ptr(h_response_hdr->value),
|
||
bstr_len(h_response_hdr->value));
|
||
PrintRawUriBuf((char *)aft->buffer->buffer, &aft->buffer->offset,
|
||
aft->buffer->size, (uint8_t *)bstr_ptr(h_response_hdr->value),
|
||
bstr_len(h_response_hdr->value));
|
||
} else {
|
||
MemBufferWriteString(aft->buffer, LOG_HTTP_CF_NONE);
|
||
}
|
||
... | ... | |
const char *customformat = ConfNodeLookupChildValue(conf, "customformat");
|
||
/* If custom logging format is selected, lets parse it */
|
||
if (custom !=NULL && customformat!=NULL && ConfValIsTrue(custom)) {
|
||
if (custom != NULL && customformat != NULL && ConfValIsTrue(custom)) {
|
||
p=customformat;
|
||
httplog_ctx->flags |= LOG_HTTP_CUSTOM;
|
||
for (httplog_ctx->cf_n=0; httplog_ctx->cf_n<LOG_HTTP_MAXN_NODES-1 && p && *p!='\0'; httplog_ctx->cf_n++){
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]=SCMalloc(sizeof(LogHttpCustomFormatNode));
|
||
if (*p!='%'){
|
||
for (httplog_ctx->cf_n = 0; httplog_ctx->cf_n < LOG_HTTP_MAXN_NODES-1 && p && *p != '\0';
|
||
httplog_ctx->cf_n++){
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n] = SCMalloc(sizeof(LogHttpCustomFormatNode));
|
||
if (httplog_ctx->cf_nodes[httplog_ctx->cf_n] == NULL) {
|
||
for (n = 0; n < httplog_ctx->cf_n; n++) {
|
||
SCFree(httplog_ctx->cf_nodes[n]);
|
||
}
|
||
LogFileFreeCtx(file_ctx);
|
||
SCFree(httplog_ctx);
|
||
return NULL;
|
||
}
|
||
if (*p != '%'){
|
||
/* Literal found in format string */
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type=LOG_HTTP_CF_LITERAL;
|
||
np=strchr(p,'%');
|
||
if (np==NULL){
|
||
n=LOG_HTTP_NODE_STRLEN-1;
|
||
np=NULL; /* End */
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = LOG_HTTP_CF_LITERAL;
|
||
np = strchr(p, '%');
|
||
if (np == NULL){
|
||
n = LOG_HTTP_NODE_STRLEN-2;
|
||
np = NULL; /* End */
|
||
}else{
|
||
n=np-p;
|
||
n = np-p;
|
||
}
|
||
strncpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data,p,n);
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data[n]='\0';
|
||
p=np;
|
||
strlcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data,p,n+1);
|
||
p = np;
|
||
} else {
|
||
/* Non Literal found in format string */
|
||
p++;
|
||
if (*p=='{'){ /* Simple format char */
|
||
np=strchr(p,'}');
|
||
if (np!=NULL && np-p>1){
|
||
if (*p == '{') { /* Simple format char */
|
||
np = strchr(p, '}');
|
||
if (np != NULL && np-p > 1 && np-p < LOG_HTTP_NODE_STRLEN-2) {
|
||
p++;
|
||
n=np-p;
|
||
strncpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data,p,n);
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data[n]='\0';
|
||
p=np;
|
||
n = np-p;
|
||
strlcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data, p, n+1);
|
||
p = np;
|
||
}
|
||
p++;
|
||
} else {
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data[0]='\0';
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data[0] = '\0';
|
||
}
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type=*p;
|
||
if (*p=='%'){
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type=LOG_HTTP_CF_LITERAL;
|
||
strcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data,"%");
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = *p;
|
||
if (*p == '%'){
|
||
httplog_ctx->cf_nodes[httplog_ctx->cf_n]->type = LOG_HTTP_CF_LITERAL;
|
||
strcpy(httplog_ctx->cf_nodes[httplog_ctx->cf_n]->data, "%");
|
||
}
|
||
p++;
|
||
}
|
||
... | ... | |
OutputCtx *output_ctx = SCCalloc(1, sizeof(OutputCtx));
|
||
if (output_ctx == NULL) {
|
||
for (n=0; n<httplog_ctx->cf_n; n++) {
|
||
for (n = 0; n < httplog_ctx->cf_n; n++) {
|
||
SCFree(httplog_ctx->cf_nodes[n]);
|
||
}
|
||
LogFileFreeCtx(file_ctx);
|
||
... | ... | |
{
|
||
LogHttpFileCtx *httplog_ctx = (LogHttpFileCtx *)output_ctx->data;
|
||
uint32_t i;
|
||
for (i=0; i<httplog_ctx->cf_n; i++) {
|
||
for (i = 0; i < httplog_ctx->cf_n; i++) {
|
||
SCFree(httplog_ctx->cf_nodes[i]);
|
||
}
|
||
LogFileFreeCtx(httplog_ctx->file_ctx);
|
||
SCFree(httplog_ctx);
|
||
SCFree(output_ctx);
|
||
}
|
||
}
|