Merge remote-tracking branch 'origin/topic/awelzel/ftp-clear-fuid-after-logging'

* origin/topic/awelzel/ftp-clear-fuid-after-logging:
  testing: Update zeek-testing-private commit hash
  ftp: Reset fuid after logging
This commit is contained in:
Arne Welzel 2024-02-22 12:21:35 +01:00
commit 036bcfe919
12 changed files with 54 additions and 27 deletions

View file

@ -207,13 +207,13 @@ function ftp_message(c: connection)
if ( s?$cmdarg && s$command in logged_commands)
Log::write(FTP::LOG, s);
# The MIME and file_size fields are specific to file transfer commands
# and may not be used in all commands so they need reset to "blank"
# values after logging.
# The MIME and file_size, data_channel and fuid fields are specific to
# file transfer commands and may not be used in all commands so they
# need reset to "blank" values after logging.
delete s$mime_type;
delete s$file_size;
# Same with data channel.
delete s$data_channel;
delete s$fuid;
}
event sync_add_expected_data(s: Info, chan: ExpectedDataChannel) &is_used