mirror of
https://github.com/zeek/zeek.git
synced 2025-10-16 21:48:21 +00:00

- Several places were just using old variable names or not loading scripts correctly after they'd been renamed/moved. - Revert/adjust a change in how HTTP file handles are generated that broke partial content responses. - Turn some libmagic builtin checks back on; seems some are actually useful (e.g. text detection seems to be a builtin). The rule going forward probably will be only to turn off a builtin if we confirm it causes issues. - Removed some tests that are redundant or not necessary anymore because the generic file analysis tests cover them. - A couple FTP tests still fail that I think need an actual solution via script changes.
36 lines
873 B
Text
36 lines
873 B
Text
##! This script is for optionally adding a body excerpt to the SMTP
|
|
##! entities log.
|
|
|
|
@load base/protocols/smtp/entities
|
|
|
|
module SMTP;
|
|
|
|
export {
|
|
redef record SMTP::Entity+= {
|
|
## The entity body excerpt.
|
|
excerpt: string &log &default="";
|
|
};
|
|
|
|
## This is the default value for how much of the entity body should be
|
|
## included for all MIME entities. The lesser of this value and
|
|
## :bro:see:`default_file_bof_buffer_size` will be used.
|
|
const default_entity_excerpt_len = 0 &redef;
|
|
}
|
|
|
|
event file_new(f: fa_file) &priority=5
|
|
{
|
|
if ( ! f?$source ) return;
|
|
if ( f$source != "SMTP" ) return;
|
|
if ( ! f?$bof_buffer ) return;
|
|
if ( ! f?$conns ) return;
|
|
|
|
for ( cid in f$conns )
|
|
{
|
|
local c: connection = f$conns[cid];
|
|
|
|
if ( ! c?$smtp ) next;
|
|
|
|
if ( default_entity_excerpt_len > 0 )
|
|
c$smtp$entity$excerpt = f$bof_buffer[0:default_entity_excerpt_len];
|
|
}
|
|
}
|