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

added feature to extract filename from http attachment #2037

Merged
merged 9 commits into from
Jul 11, 2023
Merged

added feature to extract filename from http attachment #2037

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfc9c11
added feature to extract filename from http attachment
ChiaraMaggi Jul 7, 2023
15af1ad
fixed some issues
ChiaraMaggi Jul 7, 2023
a6b7abb
added check for filename format
ChiaraMaggi Jul 7, 2023
12d6d10
added check for filename format
ChiaraMaggi Jul 7, 2023
fb54de0
remove an unnecessary print
ChiaraMaggi Jul 7, 2023
0b479a5
changed the size from 952 to 960
ChiaraMaggi Jul 10, 2023
450db6d
modified some test result files
ChiaraMaggi Jul 11, 2023
b4af523
small changes string size
ChiaraMaggi Jul 11, 2023
01c1033
comment removed and mallocs checked
ChiaraMaggi Jul 11, 2023
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
21 changes: 13 additions & 8 deletions src/lib/protocols/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ static ndpi_protocol_category_t ndpi_http_check_content(struct ndpi_detection_mo
flow->guessed_category = flow->category = NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT;
ndpi_set_binary_application_transfer(ndpi_struct, flow, str);
NDPI_LOG_INFO(ndpi_struct, "Found executable HTTP transfer");
//return(flow->category);
}
}
}
Expand All @@ -296,21 +295,27 @@ static ndpi_protocol_category_t ndpi_http_check_content(struct ndpi_detection_mo
if(packet->content_disposition_line.ptr[packet->content_disposition_line.len-1] != '\"'){
//case: filename="file_name
flow->http.filename = ndpi_malloc(filename_len);
IvanNardi marked this conversation as resolved.
Show resolved Hide resolved
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len+1, filename_len-1);
flow->http.filename[filename_len-1] = '\0';
if(flow->http.filename != NULL){
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len+1, filename_len-1);
Copy link
Member

Choose a reason for hiding this comment

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

Assignment not necessary

flow->http.filename[filename_len-1] = '\0';
}
}
else{
//case: filename="file_name"
flow->http.filename = ndpi_malloc(filename_len-1);
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len+1, filename_len-2);
flow->http.filename[filename_len-2] = '\0';
flow->http.filename = ndpi_malloc(filename_len-1);
if(flow->http.filename != NULL){
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len+1, filename_len-2);
Copy link
Member

Choose a reason for hiding this comment

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

Assignment not necessary

flow->http.filename[filename_len-2] = '\0';
}
}
}
else{
//case: filename=file_name
flow->http.filename = ndpi_malloc(filename_len+1);
IvanNardi marked this conversation as resolved.
Show resolved Hide resolved
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len, filename_len);
flow->http.filename[filename_len] = '\0';
if(flow->http.filename != NULL){
flow->http.filename = strncpy(flow->http.filename, (char*)packet->content_disposition_line.ptr+attachment_len, filename_len);
Copy link
Member

Choose a reason for hiding this comment

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

Assignment not necessary

flow->http.filename[filename_len] = '\0';
}
}

if(filename_len > ATTACHMENT_LEN) {
Expand Down
Loading