Commit graph

11620 commits

Author SHA1 Message Date
Jon Siwek
a31ad5d9da Merge branch 'master' of https://github.com/dopheide-esnet/zeek
* 'master' of https://github.com/dopheide-esnet/zeek:
  Sometimes user_agent is missing
2021-03-24 17:03:26 -07:00
Jon Siwek
c553df5dfe Add bin_dir setting for default zkg config file
Which defaults to `${zeek_install_prefix}/bin`, same as what a
standalone `zkg autoconfig` would use.
2021-03-24 15:53:10 -07:00
Michael Dopheide
83d5b44462 Sometimes user_agent is missing 2021-03-24 15:48:09 -05:00
Tim Wojtulewicz
8fb30f1d62 Update CHANGES and VERSION since git failed to update the merge commit 2021-03-23 20:46:00 -07:00
Tim Wojtulewicz
f45df63cd0 Merge remote-tracking branch 'origin/topic/vern/zval'
* origin/topic/vern/zval: (42 commits)
  whitespace tweaks
  resolved some TODO comments
  remove unnecessary casts, and change necessary ones to use static_cast<>
  explain cmp_func default
  change functions for ZVal type management to static members
  fix some unsigned/signed integer warnings
  address lint concern about uninitialized variable
  Remove use of obsolete forward-declaration macros
  fix #include's that lack zeek/ prefixes
  explicitly populate holes created in vectors
  fixes for now-incorrect assumption that GetField always returns an existing ValPtr
  memory management for assignment to vector elements
  memory management for assignment to record fields
  destructor cleanup from ZAM_vector/ZAM_record
  fix #include's that lack zeek/ prefixes
  overlooked another way in which vector holes can be created
  initialize vector holes to the correct corresponding type
  explicitly populate holes created in vectors
  fix other instances of GetField().get() assuming long-lived ValPtr's
  fix for now-incorrect assumption that GetField always returns an existing ValPtr
  ...
2021-03-23 20:44:19 -07:00
Jon Siwek
569830526f Increase timeout of openflow.log-cluster btest 2021-03-23 19:34:34 -07:00
Jon Siwek
f46d3dec8f Merge remote-tracking branch 'origin/topic/vern/cpp-new-func'
- Removed a couple of dead statements during merge

* origin/topic/vern/cpp-new-func:
  option for deterministic descriptions of sets & tables
  determinism for concurrent Zeek test suite invocations; split out deprecations
  disambiguate descriptions of enums; include attributes when describing records
  more liberal view of attribute equality; allow suppressing attr type-checking
  support for operations on sets that return new values
  low-level addition of enum values
  sundry accessors/cast-ers; RE_Matcher's track their construction values
  convenience functions for comparing IP addresses
2021-03-23 19:27:11 -07:00
Jon Siwek
52b3e159a4 Merge remote-tracking branch 'origin/topic/vlad/configure_plugin_dir'
* origin/topic/vlad/configure_plugin_dir:
  Expose a configure-time option to set the plugin path.
2021-03-23 17:29:35 -07:00
Jon Siwek
fd7402e8d6 Merge remote-tracking branch 'origin/topic/timw/analyzer-iterators'
- During merge, simplified the API docs for Analyzer::DeleteChild()
  (found it unclear/unnecessary to refer to any `std` container types)

* origin/topic/timw/analyzer-iterators:
  Clean up iterator usage in Analyzer
2021-03-23 16:33:17 -07:00
Vern Paxson
d5b523cd2c whitespace tweaks 2021-03-22 21:23:15 -07:00
Vern Paxson
46e303b000 resolved some TODO comments 2021-03-22 21:20:52 -07:00
zeek-bot
94b03d4edd Update doc submodule [nomail] [skip ci] 2021-03-19 00:43:01 +00:00
Vern Paxson
9e4c87b112 option for deterministic descriptions of sets & tables 2021-03-18 16:18:32 -07:00
Vern Paxson
a808e166a4 determinism for concurrent Zeek test suite invocations; split out deprecations 2021-03-18 16:17:25 -07:00
Vern Paxson
245108e86e remove unnecessary casts, and change necessary ones to use static_cast<> 2021-03-18 13:24:25 -07:00
Tim Wojtulewicz
4f24c02cd5 Merge remote-tracking branch 'origin/topic/vern/cpp-prep-fixes'
* origin/topic/vern/cpp-prep-fixes:
  fix for associating current scope with the name of enums; name tidying
  avoid infinite recursion in same_type() if it is analyzing recursive types
  remove iffy reliance on type punning that relies on interpreter's behavior
  fixes for propagating optimization options, and pruning script function analysis
2021-03-18 12:53:14 -07:00
Tim Wojtulewicz
5de21f12cd Merge remote-tracking branch 'origin/topic/vern/cpp-prep-simple'
* origin/topic/vern/cpp-prep-simple:
  tidying with respect to "const", and streamlining OuterIDBindingFinder
  making Exec methods non-const, so execution can manage side-information
  removing unneeded BoolVal constructor that can cause overload ambiguity issues
  lint fixes: ensuring functions return values, robustness to nil Val's
  correcting some simple typos
2021-03-18 12:44:41 -07:00
Vern Paxson
2faaccf10a explain cmp_func default 2021-03-18 11:32:34 -07:00
Vern Paxson
efe40204e0 change functions for ZVal type management to static members 2021-03-18 11:31:31 -07:00
Vern Paxson
ef3eaed3fb disambiguate descriptions of enums; include attributes when describing records 2021-03-18 10:53:36 -07:00
Vern Paxson
d5e6d8e249 more liberal view of attribute equality; allow suppressing attr type-checking 2021-03-18 10:42:49 -07:00
Vern Paxson
6898c36c51 support for operations on sets that return new values 2021-03-18 10:38:38 -07:00
Vern Paxson
b242430bd1 low-level addition of enum values 2021-03-18 10:36:52 -07:00
Vern Paxson
d53d2ac755 sundry accessors/cast-ers; RE_Matcher's track their construction values 2021-03-18 10:33:10 -07:00
Vern Paxson
17affdb858 convenience functions for comparing IP addresses 2021-03-18 10:28:32 -07:00
Vern Paxson
e407d8ab51 fix for associating current scope with the name of enums; name tidying 2021-03-18 08:58:03 -07:00
Vern Paxson
b3ee7ec675 avoid infinite recursion in same_type() if it is analyzing recursive types 2021-03-18 08:56:58 -07:00
Vern Paxson
b473bc48e1 remove iffy reliance on type punning that relies on interpreter's behavior 2021-03-18 08:46:18 -07:00
Vern Paxson
7294bb34be fixes for propagating optimization options, and pruning script function analysis 2021-03-18 08:40:48 -07:00
Vern Paxson
cde212ac18 tidying with respect to "const", and streamlining OuterIDBindingFinder 2021-03-18 08:24:14 -07:00
Vern Paxson
01bf4b8484 making Exec methods non-const, so execution can manage side-information 2021-03-18 08:22:55 -07:00
Vern Paxson
c6830193f3 removing unneeded BoolVal constructor that can cause overload ambiguity issues 2021-03-18 08:21:52 -07:00
Vern Paxson
5a8ba8c3e5 lint fixes: ensuring functions return values, robustness to nil Val's 2021-03-18 08:21:19 -07:00
Vern Paxson
e21c0f1115 correcting some simple typos 2021-03-18 08:19:46 -07:00
Tim Wojtulewicz
9fc8f491ff Merge remote-tracking branch 'origin/topic/jsiwek/freebsd-lsan-disable'
* origin/topic/jsiwek/freebsd-lsan-disable:
  Prevent use of LeakSanitizer on FreeBSD
2021-03-17 13:48:51 -07:00
Tim Wojtulewicz
44f558df7b Clean up iterator usage in Analyzer 2021-03-17 13:40:37 -07:00
Tim Wojtulewicz
f53fb9a22e Merge remote-tracking branch 'olaldiko/master'
* olaldiko/master:
  Add tests for ERSPAN Type I patch
  Add ERSPAN Type I patch
2021-03-17 10:37:14 -07:00
Gorka Olalde Mendia
ec8c5f6c07 Add tests for ERSPAN Type I patch
Co-authored-by: Markel Elorza Alvarez <melorzaalvarez@gmail.com>
Co-authored-by: Ivan Arrizabalaga Cupido <ivanarrcup@gmail.com>
2021-03-17 14:41:29 +01:00
Gorka Olalde Mendia
fcc866567c Add ERSPAN Type I patch
Co-authored-by: Markel Elorza Alvarez <melorzaalvarez@gmail.com>
Co-authored-by: Ivan Arrizabalaga Cupido <ivanarrcup@gmail.com>
2021-03-17 11:43:53 +01:00
Vlad Grigorescu
4557b0907c Expose a configure-time option to set the plugin path.
I believe that this is the last option presented during the build summary which wasn't available to be set by the user.
2021-03-12 21:22:01 -06:00
Jon Siwek
9665f63301 Prevent use of LeakSanitizer on FreeBSD 2021-03-12 13:22:35 -08:00
Jon Siwek
c9c0fea8d0 Update submodule(s) [nomail] 2021-03-12 13:14:48 -08:00
zeek-bot
85a0936ec6 Update doc submodule [nomail] [skip ci] 2021-03-12 00:37:21 +00:00
Jon Siwek
07bad2d40e Merge remote-tracking branch 'origin/topic/seth/fix-smb-ts-fields'
* origin/topic/seth/fix-smb-ts-fields:
  Updating external test commit pointers
  ts fields in SMB logs now default to network_time()
2021-03-11 12:44:04 -08:00
Jon Siwek
6a0eae28a2 Merge remote-tracking branch 'origin/topic/jsiwek/gh-1432-file-extraction-buffered-io'
* origin/topic/jsiwek/gh-1432-file-extraction-buffered-io:
  GH-1432: Use buffered IO for file extraction
2021-03-10 12:29:35 -08:00
Jon Siwek
04f7259e97 Merge remote-tracking branch 'origin/topic/jsiwek/faster-plugin-search'
* origin/topic/jsiwek/faster-plugin-search:
  Avoid searching a directory for dynamic plugins multiple times
2021-03-10 12:06:05 -08:00
Seth Hall
87950cb833 Updating external test commit pointers 2021-03-10 18:23:15 +00:00
Seth Hall
db7aba0835 ts fields in SMB logs now default to network_time()
This avoids a problem identified by amanbansal2709 in pull
request #1288. I fixed it in a different way than that pull request
by making sure the ts field is always set so that this isssue doesn't
return in the future.
2021-03-10 13:52:44 +00:00
Johanna Amann
1d46bcbb81 Merge remote-tracking branch 'origin/topic/johanna/file-framework-mime-type-detection'
* origin/topic/johanna/file-framework-mime-type-detection:
  Fix potential mime type detection bug in IRC/FTP file_transferred event
2021-03-10 13:00:59 +00:00
Johanna Amann
fa4d654a01 Fix potential mime type detection bug in IRC/FTP file_transferred event
The files framework uses strncpy to copy data into the buffer that is
used for IRC/FTP mime type detection. From all I can tell that means
that, in these cases, currently mime type detection will be messed up if
the data being passed in contains zero bytes.
2021-03-10 12:57:01 +00:00