Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 21:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/christian/inputframework-reporter-filenames' of https://github.com/ckreibich/zeek

Browse source 
* 'topic/christian/inputframework-reporter-filenames' of https://github.com/ckreibich/zeek:
  Add input file name to additional ASCII reader warning messages
This commit is contained in:
Jon Siwek 2019-05-24 17:06:08 -07:00
commit 9192d9289e
8 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-338 | 2019-05-24 17:06:08 -0700
* Add input file name to additional ASCII reader warning messages (Christian Kreibich, Corelight)
2.6-336 | 2019-05-24 10:23:20 -0700 2.6-336 | 2019-05-24 10:23:20 -0700
* GH-378: check validity of missing 'val' field in Input::add_table (Jon Siwek, Corelight) * GH-378: check validity of missing 'val' field in Input::add_table (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.6-336 2.6-338

10
src/input/readers/ascii/Ascii.cc
View file

@ -243,8 +243,8 @@ bool Ascii::ReadHeader(bool useCached)
map<string, uint32_t>::iterator fit2 = ifields.find(field->secondary_name); map<string, uint32_t>::iterator fit2 = ifields.find(field->secondary_name);
if ( fit2 == ifields.end() ) if ( fit2 == ifields.end() )
{ {
FailWarn(fail_on_file_problem, Fmt("Could not find requested port type field %s in input data file.", FailWarn(fail_on_file_problem, Fmt("Could not find requested port type field %s in input data file %s.",
field->secondary_name), true); field->secondary_name, fname.c_str()), true);
return false; return false;
} }
@ -387,8 +387,8 @@ bool Ascii::DoUpdate()
if ( (*fit).position > pos || (*fit).secondary_position > pos ) if ( (*fit).position > pos || (*fit).secondary_position > pos )
{ {
FailWarn(fail_on_invalid_lines, Fmt("Not enough fields in line %s. Found %d fields, want positions %d and %d", FailWarn(fail_on_invalid_lines, Fmt("Not enough fields in line '%s' of %s. Found %d fields, want positions %d and %d",
line.c_str(), pos, (*fit).position, (*fit).secondary_position)); line.c_str(), fname.c_str(), pos, (*fit).position, (*fit).secondary_position));
if ( fail_on_invalid_lines ) if ( fail_on_invalid_lines )
{ {
@ -410,7 +410,7 @@ bool Ascii::DoUpdate()
if ( val == 0 ) if ( val == 0 )
{ {
Warning(Fmt("Could not convert line '%s' to Val. Ignoring line.", line.c_str())); Warning(Fmt("Could not convert line '%s' of %s to Val. Ignoring line.", line.c_str(), fname.c_str()));
error = true; error = true;
break; break;
} }

4
testing/btest/Baseline/scripts.base.frameworks.input.invalidnumbers/.stderrwithoutfirstline
View file

@ -1,8 +1,8 @@
warning: ../input.log/Input::READER_ASCII: Number '12129223372036854775800' out of supported range. warning: ../input.log/Input::READER_ASCII: Number '12129223372036854775800' out of supported range.
warning: ../input.log/Input::READER_ASCII: Could not convert line '12129223372036854775800 121218446744073709551612' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line '12129223372036854775800 121218446744073709551612' of ../input.log to Val. Ignoring line.
warning: ../input.log/Input::READER_ASCII: Number '9223372036854775801TEXTHERE' contained non-numeric trailing characters. Ignored trailing characters 'TEXTHERE' warning: ../input.log/Input::READER_ASCII: Number '9223372036854775801TEXTHERE' contained non-numeric trailing characters. Ignored trailing characters 'TEXTHERE'
warning: ../input.log/Input::READER_ASCII: Number '1Justtext' contained non-numeric trailing characters. Ignored trailing characters 'Justtext' warning: ../input.log/Input::READER_ASCII: Number '1Justtext' contained non-numeric trailing characters. Ignored trailing characters 'Justtext'
warning: ../input.log/Input::READER_ASCII: String 'Justtext' contained no parseable number warning: ../input.log/Input::READER_ASCII: String 'Justtext' contained no parseable number
warning: ../input.log/Input::READER_ASCII: Could not convert line 'Justtext 1' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line 'Justtext 1' of ../input.log to Val. Ignoring line.
received termination signal received termination signal
>>> >>>

4
testing/btest/Baseline/scripts.base.frameworks.input.invalidset/.stderrwithoutfirstline
View file

@ -1,8 +1,8 @@
warning: ../input.log/Input::READER_ASCII: Invalid value for subnet: 127.0.0.1 warning: ../input.log/Input::READER_ASCII: Invalid value for subnet: 127.0.0.1
warning: ../input.log/Input::READER_ASCII: Error while reading set or vector warning: ../input.log/Input::READER_ASCII: Error while reading set or vector
warning: ../input.log/Input::READER_ASCII: Could not convert line 'name 127.0.0.1' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line 'name 127.0.0.1' of ../input.log to Val. Ignoring line.
warning: ../input.log/Input::READER_ASCII: Invalid value for subnet: 127.0.0.1 warning: ../input.log/Input::READER_ASCII: Invalid value for subnet: 127.0.0.1
warning: ../input.log/Input::READER_ASCII: Error while reading set or vector warning: ../input.log/Input::READER_ASCII: Error while reading set or vector
warning: ../input.log/Input::READER_ASCII: Could not convert line 'name 127.0.0.1' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line 'name 127.0.0.1' of ../input.log to Val. Ignoring line.
received termination signal received termination signal
>>> >>>

4
testing/btest/Baseline/scripts.base.frameworks.input.invalidset/out
View file

@ -1,12 +1,12 @@
TableErrorEvent, Invalid value for subnet: 127.0.0.1, Reporter::WARNING TableErrorEvent, Invalid value for subnet: 127.0.0.1, Reporter::WARNING
TableErrorEvent, Error while reading set or vector, Reporter::WARNING TableErrorEvent, Error while reading set or vector, Reporter::WARNING
TableErrorEvent, Could not convert line 'name\x09127.0.0.1' to Val. Ignoring line., Reporter::WARNING TableErrorEvent, Could not convert line 'name\x09127.0.0.1' of ../input.log to Val. Ignoring line., Reporter::WARNING
Event, [s={ Event, [s={
}] }]
EventErrorEvent, Invalid value for subnet: 127.0.0.1, Reporter::WARNING EventErrorEvent, Invalid value for subnet: 127.0.0.1, Reporter::WARNING
EventErrorEvent, Error while reading set or vector, Reporter::WARNING EventErrorEvent, Error while reading set or vector, Reporter::WARNING
EventErrorEvent, Could not convert line 'name\x09127.0.0.1' to Val. Ignoring line., Reporter::WARNING EventErrorEvent, Could not convert line 'name\x09127.0.0.1' of ../input.log to Val. Ignoring line., Reporter::WARNING
{ {
[name] = [s={ [name] = [s={

4
testing/btest/Baseline/scripts.base.frameworks.input.invalidtext/.stderrwithoutfirstline
View file

@ -1,6 +1,6 @@
warning: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number warning: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number
warning: ../input.log/Input::READER_ASCII: Could not convert line ' l' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line ' l' of ../input.log to Val. Ignoring line.
warning: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number warning: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number
warning: ../input.log/Input::READER_ASCII: Could not convert line ' l' to Val. Ignoring line. warning: ../input.log/Input::READER_ASCII: Could not convert line ' l' of ../input.log to Val. Ignoring line.
received termination signal received termination signal
>>> >>>

8
testing/btest/Baseline/scripts.base.frameworks.input.invalidtext/out
View file

@ -1,8 +1,8 @@
TableErrorEvent, String 'l' contained no parseable number, Reporter::WARNING TableErrorEvent, String 'l' contained no parseable number, Reporter::WARNING
TableErrorEvent, Could not convert line '\x09l' to Val. Ignoring line., Reporter::WARNING TableErrorEvent, Could not convert line '\x09l' of ../input.log to Val. Ignoring line., Reporter::WARNING
EventErrorEvent, String 'l' contained no parseable number, Reporter::WARNING
EventErrorEvent, Could not convert line '\x09l' of ../input.log to Val. Ignoring line., Reporter::WARNING
Event, [c=5]
{ {
[] = [c=5] [] = [c=5]
} }
EventErrorEvent, String 'l' contained no parseable number, Reporter::WARNING
EventErrorEvent, Could not convert line '\x09l' to Val. Ignoring line., Reporter::WARNING
Event, [c=5]