Commit graph

11378 commits

Author SHA1 Message Date
Jon Siwek
85b1cfd321 Merge remote-tracking branch 'origin/topic/jsiwek/include-zeek-dir'
* origin/topic/jsiwek/include-zeek-dir:
  Add missing zeek/ to header includes
2021-01-29 21:09:12 -08:00
Jon Siwek
8a8a983c49 Add missing zeek/ to header includes
Related to https://github.com/zeek/zeek/pull/1377
2021-01-29 19:16:29 -08:00
Jon Siwek
79f9979f80 Merge branch 'master' of https://github.com/zeek/zeek 2021-01-29 16:41:08 -08:00
Jon Siwek
1ca85f0221 Merge remote-tracking branch 'origin/topic/timw/deprecation-cleanup'
Merge adjustments:
- Removed some stale str_split() references from docs
- Renumbered TypeTag enum comments
- Simplified test-case for @unload (don't need .bro files anymore)

* origin/topic/timw/deprecation-cleanup:
  Doc updates
  Fix language.init-in-anon-function btest due to changes to log filter predicates
  Remove deprecated log filter predicates for 4.1
  Remove Plugin::HookCallFunction and fix tests related to it
  Remove support for .bro script extension and BRO_ environment variables
  Remove deprecated ICMP events
  Remove some deprected methods/events from bif files
  Remove TYPE_COUNTER
  Remove all of the random single-file deprecations
  Remove all fully-deprecated files
  Update bifcl submodule to remove deprecations from generated code
2021-01-29 16:40:54 -08:00
zeek-bot
229739c0ae Update doc submodule [nomail] [skip ci] 2021-01-30 00:34:42 +00:00
Jon Siwek
48354e1409 Merge remote-tracking branch 'origin/topic/christian/fix-inputframework-negints'
* origin/topic/christian/fix-inputframework-negints:
  Skip negative integers in input framework where not type-permissible
2021-01-29 10:32:13 -08:00
Tim Wojtulewicz
447b40d89e Merge remote-tracking branch 'origin/topic/jsiwek/fix-broken-links'
* origin/topic/jsiwek/fix-broken-links:
  Fix various broken links in script documentation
2021-01-29 09:54:17 -07:00
Christian Kreibich
38d6b6a98b Skip negative integers in input framework where not type-permissible
Script-layer counts, when provided as negative integers in an input
file, got cast to unsigned values because strtoull() does not complain
about negative values. For example, input string "-1" would lead to
value 18446744073709551615 (an all-ones 64-bit int) on x86_64. This is
more likely to be an error than an intent to get very large,
platform-dependent values, so these input lines are now skipped with
according messaging in the reporter.log/stderr.

This also affected ports: -1/tcp got cast to unsigned and only thrown
out because PortVal rejects values > 65535, mapping them to 0. We now
skip such inputs as well.

Updates existing input framework tests to capture the new behavior.
2021-01-28 23:46:43 -08:00
Jon Siwek
e82824b638 Fix various broken links in script documentation 2021-01-28 17:46:58 -08:00
Tim Wojtulewicz
5c1a068076 Doc updates 2021-01-27 10:52:41 -07:00
Tim Wojtulewicz
00868e00d3 Fix language.init-in-anon-function btest due to changes to log filter predicates 2021-01-27 10:52:41 -07:00
Christian Kreibich
4ce3bf3cd2 Remove deprecated log filter predicates for 4.1
Update the logging framework tests: since hooks operate
by name, they cannot be anonymous. I'm also dropping the &optional
attribute from the status field, since here know that the values are
actually defined, and access to an optional status field should
normally be guarded by the existence test operator.

Also includes baseline update for plugins.hooks, which picks up the
fact that the pred record field is now gone.
2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
5f09793ce1 Remove Plugin::HookCallFunction and fix tests related to it 2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
725e759560 Remove support for .bro script extension and BRO_ environment variables 2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
44ad614094 Remove deprecated ICMP events 2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
7292b52f66 Remove some deprected methods/events from bif files 2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
b819c9d18c Remove TYPE_COUNTER
This causes some test changes because of the use of Type::Describe in the fnv1a32
BIF method called by hash_hrw::get_site. Since the enum values change with removal
of TYPE_COUNTER, the output from Type::Describe changes slightly.
2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
0618be792f Remove all of the random single-file deprecations
These are the changes that don't require a ton of changes to other files outside
of the original removal.
2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
7e9d89db0a Remove all fully-deprecated files 2021-01-27 10:52:40 -07:00
Tim Wojtulewicz
a8d28df569 Update bifcl submodule to remove deprecations from generated code 2021-01-27 10:52:40 -07:00
Jon Siwek
d845f01b27 Update submodule(s) [nomail] [skip ci] 2021-01-25 21:18:39 -08:00
Jon Siwek
7803cd942d Update broker submodule, embedded CAF to 0.18 2021-01-25 12:33:16 -08:00
Jon Siwek
9b9b05f396 Update submodule(s) [nomail] [skip ci] 2021-01-25 12:16:27 -08:00
zeek-bot
303dccb63b Update doc submodule [nomail] [skip ci] 2021-01-23 01:08:00 +00:00
Jon Siwek
989cc6f607 Update submodule(s) [nomail] [skip ci] 2021-01-21 22:20:58 -08:00
Jon Siwek
3449bc81af Merge remote-tracking branch 'origin/topic/johanna/update-tls-constants-which-changed-a-lot-since-I-last-looked-which-just-shows-i-should-really-look-at-them-more-regularly-but-luckily-they-are-not-really-used-for-anything-so-it-does-not-really-matter-that-much'
* origin/topic/johanna/update-tls-constants-which-changed-a-lot-since-I-last-looked-which-just-shows-i-should-really-look-at-them-more-regularly-but-luckily-they-are-not-really-used-for-anything-so-it-does-not-really-matter-that-much:
  Update SSL consts
2021-01-21 17:33:36 -08:00
Jon Siwek
efba91cd26 Merge branch 'topic/oakljon/gh-1352-smtp-header-parsing' of https://github.com/theavgjojo/zeek
* 'topic/oakljon/gh-1352-smtp-header-parsing' of https://github.com/theavgjojo/zeek:
  GH-1352: Added flag to stop processing SMTP headers in attached messages
2021-01-21 17:01:13 -08:00
Jon Siwek
a70de68b55 Update submodule(s) [nomail] 2021-01-21 16:23:12 -08:00
Jon Siwek
7f3f5a868f Merge remote-tracking branch 'origin/topic/jsiwek/gh-1296-fix-list-type-checks'
* origin/topic/jsiwek/gh-1296-fix-list-type-checks:
  GH-1296: fix type-checks related to list-type equality
2021-01-21 14:00:07 -08:00
Jon Siwek
042a1ca9d6 Merge remote-tracking branch 'origin/topic/jsiwek/coverity-1443771'
* origin/topic/jsiwek/coverity-1443771:
  Guard against nullptr deref after AST-reduction consistency checks
2021-01-21 13:53:53 -08:00
Jon Siwek
8164ea6517 Merge remote-tracking branch 'origin/topic/christian/zeek-install-btest'
* origin/topic/christian/zeek-install-btest:
  Install BTest with Zeek
2021-01-21 13:37:40 -08:00
Jon Oakley
25de6f28e5 GH-1352: Added flag to stop processing SMTP headers in attached
messages
2021-01-21 14:55:10 -05:00
Tim Wojtulewicz
931a39b0c1 Update submodule(s) [nomail] 2021-01-21 10:29:34 -07:00
Johanna Amann
079d4164c0 Merge remote-tracking branch 'origin/topic/christian/fix-config-segfault'
* origin/topic/christian/fix-config-segfault:
  Btest tweak for improved type rendering in config framework errors and set types
  More precise type information in a config framework error message
  Explicitly don't support sets with multiple index types in input/config frameworks
2021-01-21 11:30:36 +00:00
Christian Kreibich
a6e086b662 Install BTest with Zeek
Configuring with --disable-btest skips the installation. The main
reason for doing this is that many Zeek packages come with testsuites
that nearly always require btest, so providing btest out of the box
makes sense. Note that zkg's recent additions to its PATH environment
variable management mean that this btest instance is automatically
found also when the Zeek installation's binary folder isn't in the
path.
2021-01-20 13:52:14 -08:00
Jon Siwek
65675eeb58 Fix logo/website link in README [skip ci] 2021-01-20 11:04:17 -08:00
Johanna Amann
8ff05bae1b Update SSL consts
There have been a bunch of mostly TLS 1.3 related changes.
2021-01-20 14:14:47 +00:00
Jon Siwek
a98012a8fb Merge remote-tracking branch 'origin/topic/christian/osx-macos-renaming'
* origin/topic/christian/osx-macos-renaming:
  Update Cirrus CI naming update for MacOS images
2021-01-19 21:08:28 -08:00
Christian Kreibich
b7b63e889d Update Cirrus CI naming update for MacOS images
The docs on https://cirrus-ci.org/guide/macOS/ changed from
"osx_instance" to "macos_instance", so let's reflect that.
2021-01-19 17:14:44 -08:00
Jon Siwek
12f9ba5f37 Guard against nullptr deref after AST-reduction consistency checks
Addresses Coverity issue 1443771
2021-01-19 11:22:52 -08:00
Tim Wojtulewicz
5bc9c818ad Merge remote-tracking branch 'origin/topic/jsiwek/superfluous-nullptr-checks'
* origin/topic/jsiwek/superfluous-nullptr-checks:
  Remove superfluous nullptr checks in Val/RecordVal methods
2021-01-18 19:14:56 -07:00
Jon Siwek
bd0c1bcde7 Merge remote-tracking branch 'origin/topic/timw/dict-iterators'
* origin/topic/timw/dict-iterators:
  Implement standard-library-compatible iterators for Dictionary
2021-01-14 19:31:17 -08:00
Jon Siwek
0d6394e008 Remove superfluous nullptr checks in Val/RecordVal methods 2021-01-14 16:07:36 -08:00
Jon Siwek
16942f3859 Merge remote-tracking branch 'origin/topic/vern/script-xform'
* origin/topic/vern/script-xform: (30 commits)
  Adjust some Reducer ref-counting and IntrusivePtr usage
  Fix reference counting in ListExpr inline/reduce methods
  Simplify WhileStmt::CondPredStmt()
  Use std::move() in Case::UpdateBody()
  Switch some Stmt transform/reduce logic to use IntrusivePtr
  Switch some Expr transform/reduce logic to use IntrusivePtr
  Adjust how some Expr::SetOpX() calls use std::move()
  Add missing header-includes to Reduce.h
  Add std::move() for args to an assign_to_index call
  Adjust memory management for &default argument expression type-check
  Use string for TempVar::name
  Switch AnalyOpt::only_func to optional<string>
  Fix a signed/unsigned comparison warning
  simplified some vestigial complexity I noticed when flipping through diffs
  canonicalization for an error message in one of the alternative test baselines
  baseline differences for "xform" alternative: changes generally reflect exposure of transformed code, or error propagation stopping earlier due to error now occurring in an assignment (to a temporary)
  new testing alternative for script transformation (= xform)
  bug in correctly inspecting test output file
  split bifs.string_utils into a non-error test and an only-errors test, to help control for differing error propagation
  logic for driving the script optimization process
  ...
2021-01-14 15:15:22 -08:00
Tim Wojtulewicz
892124378c Implement standard-library-compatible iterators for Dictionary 2021-01-14 13:49:40 -07:00
Tim Wojtulewicz
9e9998c6e5 Merge remote-tracking branch 'origin/topic/vern/bvu-remove'
* origin/topic/vern/bvu-remove:
  Use static_cast instead of dynamic_cast for Val conversions
  Remove GET_FIELD_AS macro, replace with template methods
  Add templated As() method to Val, use in various places we were using dynamic_cast
  Move ValImpl classes into detail namespace
  Some review cleanup in Val.cc
  Changes addressing pending issues per PR discussion
  Remove BroValUnion by hoisting underlying Val subclass values into subclasses
2021-01-14 13:28:06 -07:00
Tim Wojtulewicz
99e719318b Use static_cast instead of dynamic_cast for Val conversions 2021-01-14 11:58:59 -07:00
Tim Wojtulewicz
4962986df1 Remove GET_FIELD_AS macro, replace with template methods 2021-01-14 11:58:59 -07:00
Tim Wojtulewicz
a94fcad957 Add templated As() method to Val, use in various places we were using dynamic_cast 2021-01-14 11:58:59 -07:00
Tim Wojtulewicz
a7b5915b1a Move ValImpl classes into detail namespace 2021-01-14 11:58:59 -07:00