Skip to content

Fix lf location array from unknown syslog #1618

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

Merged
merged 3 commits into from
Jan 2, 2019
Merged

Fix lf location array from unknown syslog #1618

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48ebe14
Fix lf->location array from unknow syslog
atomicturtle Dec 31, 2018
55533d7
Remove duplicate line
atomicturtle Dec 31, 2018
d0c9074
Fix for strncpy
atomicturtle Jan 2, 2019
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
74 changes: 38 additions & 36 deletions src/analysisd/format/json_extended.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,18 @@ int W_isRootcheck(cJSON *root, int nested){
// ** TODO ** Regex instead str_cut
void W_JSON_ParseHostname(cJSON *root, char *hostname){
if(hostname[0] == '('){
char *e;
char string[strlen(hostname) + 1];
strcpy(string,hostname);
char *search;
char string[MAX_STRING];
strncpy(string,hostname,MAX_STRING);
int index;
e = strchr(string, ')');
index = (int)(e - string);
str_cut(string, index, -1);
str_cut(string, 0, 1);
cJSON_AddStringToObject(root, "hostname", string);
search = strchr(string, ')');
if(search){
index = (int)(search - string);
str_cut(string, index, -1);
str_cut(string, 0, 1);
cJSON_AddStringToObject(root, "hostname", string);
}

}else{
cJSON_AddStringToObject(root, "hostname", hostname);
}
Expand All @@ -276,36 +279,41 @@ void W_JSON_ParseHostname(cJSON *root, char *hostname){
// ** TODO ** Regex instead str_cut
void W_JSON_ParseAgentIP(cJSON *root, const Eventinfo *lf){
if(lf->hostname[0] == '('){
char *e;
char string[strlen(lf->hostname) + 1];
strcpy(string,lf->hostname);
char *search;
char string[MAX_STRING];
strncpy(string,lf->hostname,MAX_STRING);
int index;
e = strchr(string, ')');
index = (int)(e - string);
str_cut(string, 0, index);
str_cut(string, 0, 2);
e = strchr(string, '-');
index = (int)(e - string);
str_cut(string, index, -1);
cJSON_AddStringToObject(root, "agentip", string);
search = strchr(string, ')');
if(search){
index = (int)(search - string);
str_cut(string, 0, index);
str_cut(string, 0, 2);
search = strchr(string, '-');
index = (int)(search - string);
str_cut(string, index, -1);
cJSON_AddStringToObject(root, "agentip", string);
}
}

}
// The file location usually comes with more information about the alert (like hostname or ip) we will extract just the "/var/folder/file.log".
void W_JSON_ParseLocation(cJSON *root, const Eventinfo *lf, int archives){
if(lf->location[0] == '('){
char *e;
char string[strlen(lf->location)];
strcpy(string,lf->location);
char *search;
char string[MAX_STRING];
strncpy(string,lf->location,MAX_STRING);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another sloppy strncpy

int index;
e = strchr(string, '>');
index = (int)(e - string);
str_cut(string, 0, index);
str_cut(string, 0, 1);
if(archives == 1)
cJSON_AddStringToObject(root, "location_desc", string);
else
cJSON_AddStringToObject(root, "location", string);
search = strchr(string, '>');
if(search){
index = (int)(search - string);
str_cut(string, 0, index);
str_cut(string, 0, 1);

if(archives == 1)
cJSON_AddStringToObject(root, "location_desc", string);
else
cJSON_AddStringToObject(root, "location", string);
}
}else{
if(archives == 1)
cJSON_AddStringToObject(root, "location_desc", lf->location);
Expand Down Expand Up @@ -382,9 +390,3 @@ void trim(char * s) {

memmove(s, p, l + 1);
}
void removeChar( char * string, char letter ) {
unsigned int i;
for(i = 0; i < strlen( string ); i++ )
if( string[i] == letter )
strcpy( string + i, string + i + 1 );
}
2 changes: 0 additions & 2 deletions src/analysisd/format/to_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ char *Archiveinfo_to_jsonstr(const Eventinfo *lf)
cJSON_AddNumberToObject(decoder, "fts", lf->decoder_info->fts);
if (lf->decoder_info->accumulate)
cJSON_AddNumberToObject(decoder, "accumulate", lf->decoder_info->accumulate);
if (lf->decoder_info->accumulate)
cJSON_AddNumberToObject(decoder, "accumulate", lf->decoder_info->accumulate);

if (lf->decoder_info->parent)
cJSON_AddStringToObject(decoder, "parent", lf->decoder_info->parent);
Expand Down