Commit graph

1996 commits

Author SHA1 Message Date
Jon Siwek
dacdf5424b Merge remote-tracking branch 'origin/topic/jsiwek/deprecate-zeekenv'
* origin/topic/jsiwek/deprecate-zeekenv:
  Deprecate zeekenv() and use getenv() directly
2021-02-01 12:13:47 -08:00
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
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
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
Jon Siwek
7803cd942d Update broker submodule, embedded CAF to 0.18 2021-01-25 12:33:16 -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
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
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
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
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
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
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
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
49ca8e2163 Merge branch 'topic/timw/fix-catalina'
* topic/timw/fix-catalina:
  Use xcode 11 on the Catalina CI image
2021-01-14 11:58:11 -07:00
Jon Siwek
8ff1604126 Merge remote-tracking branch 'origin/topic/vern/lambda-copy-semantics'
* origin/topic/vern/lambda-copy-semantics:
  Add NEWS entries for lambda/capture-list functionality
  Tweak vector append/move logic of Frame::SerializeCopyFrame()
  Switch FuncType capture-list storage to optional<vector<Capture>>
  Fix memory leaks in lambda capture/frame management
  tests added for new capture-by-reference closure semantics & errors
  documentation updates
  test suite updates and additions for new capture semantics & suppression of error cascades
  support for transmitting of capture-semantics closures via Broker, while keeping deprecated functionality
  minor simplifications in using type names, and unordered sets rather than vectors
  changes to Frames to support access to captured-by-copy-semantics variables
  changes to ScriptFunc's to track captures, and LambdaExpr's to check/manage them
  parsing of new []-style captures, and creation of associated data structures
  nit: fixed some 0/1 values that should instead be false/true
  no semantic changes: factored some of the complexity of begin_func() into a pair of static functions for clarity
  simple error propagation fix: don't complain about "unused" values that themselves are due to errors
  no semantic changes: corrected & reflowed some comments, plus a whitespace tweak
2021-01-11 18:12:23 -08:00
Jon Siwek
321a027d07 Remove unusable/broken RocksDB code and options
The Broker RockSDB data store backend was previously unusable
and broken, so all code and options related to it are now removed.
2021-01-11 11:12:59 -08:00
Jon Siwek
54b52eb197 Merge remote-tracking branch 'origin/topic/vern/script-inlining'
* origin/topic/vern/script-inlining:
  cleaner approach for localizing errors associated with duplicated ASTs: virtualize GetLocationInfo
  Add commentary to Frame::GetElement(int) about lack of offset adjustment
  Remove unused local in Inliner::Analyzer()
  Tweak FuncInfo memory management
  Switch InlineExpr from using IDPList* to vector<IDPtr>
  Insert contents of #included script-opt files directly
  Simplify some IntrusivePtr operations in Expr::Duplicate/Inline
  Remove Func::AsScriptFunc() methods
  Remove superflous std::move's from Inliner return values
  Remove SetupResult::parse_only field
  Rename Frame::IncreaseOffset() to Frame::AdjustOffset()
  Update alternative plugins.hooks baselines
  Superficial changes to script-opt related code
  merge glitch
  updates from test suite
  inlining of Zeek script functions
  inlining of Zeek script functions
2021-01-07 17:06:09 -08:00
Jon Siwek
1d24b8a857 Update cmake module to fix ZeekPluginDynamic's find_package(CAF)
Fixes GH-1347
2021-01-06 20:45:44 -08:00
Tim Wojtulewicz
fa61a715bc Merge remote-tracking branch 'origin/topic/jsiwek/add-lgtm-config'
* origin/topic/jsiwek/add-lgtm-config:
  Add LGTM config file
2020-12-28 15:37:37 -07:00
Jon Siwek
f5b1d9c519 Update submodule(s) [nomail] 2020-12-23 10:39:01 -08:00
Jon Siwek
604fbea00d Merge remote-tracking branch 'origin/topic/johanna/1323'
* origin/topic/johanna/1323:
  TLS 1.3 changes: Address review feedback
  Add one more TLS 1.3 testcase and update NEWS
  Fix TLS 1.3 session resumption detection.
  Introduce ssl_probable_encrypted_handshake_message event
  SSL Analyzer: ignore CCS for TLS 1.3
  TLS analyzer: change logic to track TLS 1.3 connection establishment
2020-12-22 11:00:59 -08:00
Jon Siwek
b4968de3ea Merge remote-tracking branch 'origin/topic/christian/ci-big-sur-support'
* origin/topic/christian/ci-big-sur-support:
  Add MacOS Big Sur to CI, now that Cirrus supports it
2020-12-21 10:55:37 -08:00
Jon Siwek
ed4afa95d3 Merge remote-tracking branch 'origin/topic/neverlord/cmake-cleanup'
* origin/topic/neverlord/cmake-cleanup:
  Remove explicit use of config mode for finding CAF
2020-12-17 16:11:58 -08:00
Jon Siwek
b0d8ca06af Merge branch 'create-shadow-files-atomically' of https://github.com/awelzel/zeek
* 'create-shadow-files-atomically' of https://github.com/awelzel/zeek:
  logging/ascii: Atomically create .shadow files using rename()
2020-12-16 15:10:39 -08:00
Jon Siwek
206c674cc9 Merge EDNS ECS option parsing security/bug fixes 2020-12-15 08:03:40 -08:00
Jon Siwek
dd7bda6a1c Fix local.zeek compatibility test 2020-12-14 22:28:27 -08:00
Jon Siwek
3af403542f Update submodules 2020-12-14 21:23:30 -08:00
Jon Siwek
5f8b79ee3b Merge remote-tracking branch 'origin/topic/jsiwek/gh-1329-fuzzer-driver-cleanup'
* origin/topic/jsiwek/gh-1329-fuzzer-driver-cleanup:
  Rename a 'do_net_run' variable to 'do_run_loop'
  GH-1329: call Zeek's cleanup function from standalone fuzzer driver
2020-12-14 14:28:00 -08:00
Jon Siwek
144ca0f45b Update submodule(s) [nomail] 2020-12-14 10:56:08 -08:00
Jon Siwek
d1c659faa8 Merge remote-tracking branch 'origin/topic/christian/zkg-inclusion'
* origin/topic/christian/zkg-inclusion:
  Install zkg as part of the Zeek distribution.
2020-12-12 20:25:59 -08:00
Jon Siwek
9658271d19 Merge remote-tracking branch 'origin/topic/jsiwek/fix-coverity'
* origin/topic/jsiwek/fix-coverity:
  Update Coverity Scan GitHub Action

Fixes GH-1330
2020-12-12 13:40:11 -08:00
Jon Siwek
bb11ce47a0 Merge remote-tracking branch 'origin/topic/neverlord/caf-migration'
Merge adjustments:
- Fix the `--with-caf=` option from emitting messages about a variable
  having an unset value.
- Fix the `zeek-config --caf_root` option

* origin/topic/neverlord/caf-migration:
  Update submodule(s)
  Fix message ordering of Broker messages
  Fix UB in shutdown of Broker manager
  Preserve string output of Broker errors
  Migrate to CAF 0.18
2020-12-10 14:14:38 -08:00
Jon Siwek
2e6ef02750 Update submodule(s) [nomail] 2020-12-09 17:29:17 -08:00
Jon Siwek
2ae452d8aa Merge remote-tracking branch 'origin/topic/jsiwek/gh-1321-fix-connection-status-update-event'
* origin/topic/jsiwek/gh-1321-fix-connection-status-update-event:
  GH-1321: Prevent compounding of `connection_status_update` event timers
2020-12-09 10:59:14 -08:00
Jon Siwek
07c4662dc4 Fix narrowing conversion compiler error in SMB error-response logic 2020-12-07 16:56:07 -08:00
Jon Siwek
0b8535b879 Merge remote-tracking branch 'origin/topic/vlad/gh-1286'
Merge adjustments:
- Rewrote the check for error response as a switch statement to
  fix compiler warning about signed/unsigned comparison and also
  to just simplify/clarify the logic.
- Changed the btest to use `zeek -b`.

* origin/topic/vlad/gh-1286:
  Add tests for new SMB3 multichannel support
  Fix SMB2 response status parsing. Fixes #1286
2020-12-07 16:08:04 -08:00
Johanna Amann
8955e6c060 Merge branch 'master' of github.com:zeek/zeek 2020-12-07 18:23:18 +00:00
Johanna Amann
c85d6d6112 Merge remote-tracking branch 'origin/topic/christian/gh-1307-baseline-refresh'
* origin/topic/christian/gh-1307-baseline-refresh:
  Additional use of btest-diff --binary
  Update btest-diff calls on binary files to using "--binary"
  Switch to btest-diff with --binary support
  Update external baseline commit hashes
  Fix binary baseline & line-end problem
  Fix diff-remove-abspath on OSX
  Bump submodules for btest 0.64 update
  Canonifier improvements for the scripts.base.frameworks.logging.ascii-double test
  Baseline refresh to reflect btest 0.64
  Make diff-remove-abspath canonifier match on non-whitespace paths only
  Harden diff-remove-timestamps canonifier
2020-12-07 18:12:29 +00:00
Jon Siwek
94366fdfd9 Merge remote-tracking branch 'origin/topic/jsiwek/fix-zeekygen-misassociations'
* origin/topic/jsiwek/fix-zeekygen-misassociations:
  Fix misassociation of Zeekygen-style comments within function scopes
2020-12-07 09:43:07 -08:00
Jon Siwek
6323b0a8c2 Remove an extraneous Zeekygen-style comment 2020-12-04 19:20:57 -08:00
Jon Siwek
27ea03db2e Update submodule(s) [nomail] 2020-12-04 11:18:44 -08:00
Johanna Amann
47ceac2491 Merge remote-tracking branch 'origin/topic/johanna/GH-348'
* origin/topic/johanna/GH-348:
  Sumstats: allow users to manage epoch manually
  Sumstats: epoch_finished was not called under certain circumstances
2020-12-04 18:49:53 +00:00
Jon Siwek
4228fbca0b Merge remote-tracking branch 'origin/topic/johanna/static-ci'
* origin/topic/johanna/static-ci:
  Fix cirrus config for static broker test.
  Add a test for compiling with static broker/binpac
2020-12-03 18:02:55 -08:00
Tim Wojtulewicz
c643ed2fe4 Merge remote-tracking branch 'origin/topic/robin/gh-1179-plugin-loading-fixes'
* origin/topic/robin/gh-1179-plugin-loading-fixes:
  Fix a couple of life-time issues when plugin loading fails.
2020-12-03 09:36:02 -07:00
Jon Siwek
71f9340e75 Merge branch 'add-X-to-double' of https://github.com/ynadji/zeek
- Minor whitespace/grammar/doc tweaks during merge

* 'add-X-to-double' of https://github.com/ynadji/zeek:
  Add `count_to_double` and `int_to_double` bif functions
2020-12-02 12:54:08 -08:00
Jon Siwek
05618dc8a8 Merge remote-tracking branch 'origin/topic/jsiwek/update-minimum-cmake'
* origin/topic/jsiwek/update-minimum-cmake:
  Update minimum required CMake to 3.5
2020-12-02 11:11:45 -08:00
Tim Wojtulewicz
49293c080d Merge remote-tracking branch 'origin/topic/timw/1184-additional-weird-info'
* origin/topic/timw/1184-additional-weird-info:
  GH-1184: Add 'source' field to weird log denoting where the weird was reported
2020-12-01 10:18:00 -07:00