Commit graph

2347 commits

Author SHA1 Message Date
Tim Wojtulewicz
c07559bca2 Merge remote-tracking branch 'origin/topic/timw/fix-bsd-getopt'
* origin/topic/timw/fix-bsd-getopt:
  Update 3rdparty submodule for bsd-getopt-long fix
2022-03-08 09:30:48 -07:00
Robin Sommer
597c2d43fa
Merge remote-tracking branch 'origin/topic/robin/improve-broker-error-msg'
* origin/topic/robin/improve-broker-error-msg:
  Improve error message when receiving unexpected record content via Broker.
2022-03-07 12:37:39 +01:00
Johanna Amann
ff4f3f359c Merge remote-tracking branch 'origin/topic/vern/rec-constr-check'
* origin/topic/vern/rec-constr-check:
  associated btest
  fix base scripts to include mandatory fields in record constructors
  restored record constructor checking for missing-but-mandatory fields
2022-03-02 13:49:31 +00:00
Johanna Amann
f264a9eccf Merge remote-tracking branch 'origin/topic/christian/gh-1982'
* origin/topic/christian/gh-1982:
  The is_num(), is_alpha(), and is_alnum() BiFs now return F on empty string
  Expand testcases around is_num(), is_alpha(), is_alnum(), is_ascii() BiFs
  Clarify is_ascii() BiF docstring re behavior on empty strings
  Fix minor indentation bugs in strings.bif
2022-03-02 08:25:41 +00:00
Johanna Amann
d38923cfcf Merge remote-tracking branch 'origin/topic/johanna/tls12-decryption'
Documentation is missing and will be added in the next couple of hours.

* origin/topic/johanna/tls12-decryption: (24 commits)
  TLS decryption: add test, fix small issues
  Address PR feedback
  TLS decryption: refactoring, more comments, less bare pointers
  Small code fix and test baseline update.
  SSL decryption: refactor TLS12_PRF
  SSL decryption: small style changes, a bit of documentation
  Deprecation and warning fixes
  Clang-format updates
  add missing call to EVP_KDF_CTX_set_params
  TLS decryption: remove payload from ssl_encrypted_data again.
  TLS 1.2 decryption: adapt OpenSSL 3.0 changes for 1.1
  ssl: adapt TLS-PRF to openSSL 3.0
  ssl/analyzer: potentially fix memory leaks caused by bytestrings
  analyzer/ssl: several improvements
  analyzer/ssl: defensive key length check + more debug logging
  testing: feature gate ssl/decryption test
  testing: add ssl/decryption test
  analyzer/ssl: handle missing <openssl/kdf.h>
  analyzer/ssl: silence warning in DTLS analyzer
  analyzer/ssl: move proc-{client,server}-hello into the respective analyzers
  ...
2022-03-02 08:20:39 +00:00
Tim Wojtulewicz
9b184c3d4a Merge remote-tracking branch 'origin/topic/timw/1980-zeek-config-caf-root'
* origin/topic/timw/1980-zeek-config-caf-root:
  GH-1980: Deprecate and return warning for zeek-config's caf-root option
2022-02-24 09:11:12 -07:00
Tim Wojtulewicz
4a667eb050 Merge remote-tracking branch 'origin/topic/timw/1949-inactivity-timeout'
* origin/topic/timw/1949-inactivity-timeout:
  GH-1949: Remove unused timer_mgr_inactivity_timeout global
2022-02-23 10:52:09 -07:00
Tim Wojtulewicz
1de8191c86 Merge remote-tracking branch 'matthewluckie/remove-deprecated-types-1898'
* matthewluckie/remove-deprecated-types-1898:
  remove deprecated union and timer types, addressing #1898
2022-02-21 18:17:24 -07:00
Christian Kreibich
d77fd8305d Merge branch 'topic/christian/github-workflow-tweaks'
* topic/christian/github-workflow-tweaks:
  Minor modernizations to Github workflows
2022-02-11 09:30:28 -08:00
Christian Kreibich
40fa1a0769 Merge branch 'topic/christian/controller-renaming'
* topic/christian/controller-renaming:
  Bump external cluster testsuite to reflect Management framework reorg
  Bump zeek-client to reflect Management framework reorg
  Reorg of the cluster controller to new "Management framework" layout
2022-02-10 18:10:08 -08:00
Tim Wojtulewicz
dad237c682 Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
* origin/topic/timw/coverity-fixes:
  Fixing a big pile of Coverity issues
2022-02-10 10:35:23 -07:00
Christian Kreibich
9efc214d42 Merge branch 'topic/christian/build-docs-on-prs'
* topic/christian/build-docs-on-prs:
  Expand generate-docs Github workflow to test docs build on PRs
2022-02-09 15:15:48 -08:00
Christian Kreibich
2b7cc130c4 Merge branch 'topic/christian/fix-docbuild'
* topic/christian/fix-docbuild:
  Updates to the cluster controller scripts to fix the docs build
2022-02-09 13:14:55 -08:00
Christian Kreibich
b5c89cf384 Merge branch 'topic/christian/fix-when-deprec'
* topic/christian/fix-when-deprec:
  Add capture to a Sumstats when-statement
2022-02-07 14:20:04 -08:00
Robin Sommer
5f1f005142
Merge remote-tracking branch 'origin/topic/neverlord/hide-caf'
* origin/topic/neverlord/hide-caf:
  Fix GCC builds and string output for Broker errors
  Update to latest Broker without public CAF dep
2022-02-07 16:25:22 +01:00
Tim Wojtulewicz
8513bcef9d Merge remote-tracking branch 'origin/topic/timw/string-view-constructors'
* origin/topic/timw/string-view-constructors:
  String/StringVal: Replace char*/string constructors with string_view
2022-02-07 08:14:58 -07:00
Tim Wojtulewicz
16ee942a8d Merge remote-tracking branch 'origin/topic/vern/use-C++-fix'
* origin/topic/vern/use-C++-fix:
  fix existing checks for looking to use C++ when it's not available
2022-02-04 10:33:55 -07:00
Tim Wojtulewicz
db706d9cf9 Merge remote-tracking branch 'origin/topic/vern/ZAM-profile-fix'
* origin/topic/vern/ZAM-profile-fix:
  fixes for ZAM profiling, which didn't get fully integrated originally
  minor enhancements for ZAM inlining
2022-02-04 10:32:59 -07:00
Christian Kreibich
9a7d5c986e Merge branch 'topic/christian/cluster-controller-get-nodes'
* topic/christian/cluster-controller-get-nodes:
  Bump external cluster testsuite
  Bump zeek-client for the get-nodes command
  Add ClusterController::API::get_nodes_request/response event pair
  Support optional listening ports for cluster nodes
  Don't auto-publish Supervisor response events in the cluster agent
  Make members of the ClusterController::Types::State enum all-caps
  Be more conservative with triggering request timeout events
  Move redefs of ClusterController::Request::Request to their places of use
  Simplify ClusterController::API::set_configuration_request/response
2022-02-03 13:19:34 -08:00
Johanna Amann
b1415dd364 Merge remote-tracking branch 'origin/topic/johanna/gh-1952'
* origin/topic/johanna/gh-1952:
  Match DPD TLS signature on one-sided connections.

Fixes GH-1952
2022-02-03 11:24:34 +00:00
Robin Sommer
88c73f4680
Updating CHANGES and VERSION. 2022-02-02 12:48:41 +01:00
Robin Sommer
d957770c93
Merge remote-tracking branch 'origin/topic/robin/tcp-analyzer-checks'
* origin/topic/robin/tcp-analyzer-checks:
  Let our TCP-based application analyzers operate without any TCP parent analyzer.
2022-02-02 09:37:05 +01:00
Tim Wojtulewicz
0793a38cc5 Merge remote-tracking branch 'origin/topic/vern/vec-slice-bug'
* origin/topic/vern/vec-slice-bug:
  btest to catch vector slice assignment issues
  bug fix for vector slice assignment
2022-01-25 13:52:19 -07:00
Johanna Amann
5411c431dc Merge remote-tracking branch 'origin/topic/vern/de-bro-comments'
* origin/topic/vern/de-bro-comments:
  updated Bro->Zeek in comments in the source tree
2022-01-25 12:26:13 +00:00
Christian Kreibich
fab8f9f2fe Merge branch 'topic/christian/ci-updates'
* topic/christian/ci-updates:
  CI update: add Ubuntu 21.10
  CI update: remove OpenSUSE Leap 15.2 (EOL)
  CI update: add CentOS Stream 9
2022-01-24 13:42:01 -08:00
Johanna Amann
becc966106 Merge remote-tracking branch 'origin/topic/vern/vec-del-bug'
* origin/topic/vern/vec-del-bug:
  new btest to catch regressions to previous behavior/crash
  fix for adding a non-managed type to an empty vector
2022-01-17 10:35:51 +00:00
Tim Wojtulewicz
3d9d6e953b Merge remote-tracking branch 'origin/topic/vern/when-lambda'
* origin/topic/vern/when-lambda:
  explicitly provide the frame for evaluating a "when" timeout expression
  attempt to make "when" btest deterministic
  tests for new "when" semantics/errors
  update existing test suite usage of "when" statements to include captures
  update uses of "when" in base scripts to include captures
  captures for "when" statements update Triggers to IntrusivePtr's and simpler AST traversal introduce IDSet type, migrate associated "ID*" types to "const ID*"
  logic (other than in profiling) for assignments that yield separate values
  option for internal use to mark a function type as allowing non-expression returns
  removed some now-obsolete profiling functionality
  minor commenting clarifications
2022-01-14 14:41:42 -07:00
Tim Wojtulewicz
c6078cd6d5 Merge remote-tracking branch 'origin/topic/johanna/fedora-33-eol'
* origin/topic/johanna/fedora-33-eol:
  Remove Fedora 33 from CI.
2022-01-14 12:22:19 -07:00
Tim Wojtulewicz
cdf39840bb Merge remote-tracking branch 'origin/topic/timw/make-dist-cleanup'
* origin/topic/timw/make-dist-cleanup:
  Have `make dist` cleanup a few more wayward files before tarring
2022-01-14 12:21:34 -07:00
Johanna Amann
1f52366ffc Merge remote-tracking branch 'origin/topic/johanna/StringValconst'
* origin/topic/johanna/StringValconst:
  Make some StringVal functions const
2022-01-14 16:00:23 +00:00
Tim Wojtulewicz
3932fd930f Merge remote-tracking branch 'origin/topic/timw/fix-freebsd-jemalloc'
* origin/topic/timw/fix-freebsd-jemalloc:
  Fix --with-jemalloc configure option on FreeBSD
2022-01-12 10:16:46 -07:00
Tim Wojtulewicz
2accf6dfbf Merge remote-tracking branch 'origin/topic/vern/CPP-type-switch'
* origin/topic/vern/CPP-type-switch:
  support for compiling type-based switches to C++
  make encountering uncompilable "standalone" functions to be a hard error
  fix: ZAM could misinterpret a "type" switch that starts with a "default"
  fix: don't treat pseudo-identifiers in type cases as local variables
  removed development helper scripts now obsolete with --optimize-files=
2022-01-11 15:02:52 -07:00
Tim Wojtulewicz
ce9ca91d6e Merge remote-tracking branch 'origin/topic/timw/add-null-check'
* origin/topic/timw/add-null-check:
  Bump CI sanitizer task to Ubuntu 20.04
  Fix uninitialized variable warning
  Enable null check for UBSan
2022-01-11 14:58:13 -07:00
Tim Wojtulewicz
ebc4d45004 Merge remote-tracking branch 'origin/topic/vern/nil-closure-fix'
* origin/topic/vern/nil-closure-fix:
  fix for avoiding de-ref of nil pointer
2022-01-10 10:31:13 -07:00
Robin Sommer
964293209b
Merge remote-tracking branch 'origin/topic/robin/gh1844-host'
* origin/topic/robin/gh1844-host:
  Fix host header normalization in intel framework.
  Switch to recording unmodified HTTP header.
2022-01-10 14:43:30 +01:00
Tim Wojtulewicz
0064554d71 Merge remote-tracking branch 'origin/topic/timw/1624-migrate-checkandpromote'
* origin/topic/timw/1624-migrate-checkandpromote:
  GH-1624: Migrate check_and_promote and a few Expr methods to IntrusivePtr
2022-01-07 12:34:46 -07:00
Tim Wojtulewicz
4c1b3c82d9 Merge remote-tracking branch 'origin/topic/vern/record-constructor-bug'
* origin/topic/vern/record-constructor-bug:
  bug fix for reporting poorly formed record constructors
2022-01-06 15:07:13 -07:00
Tim Wojtulewicz
ac8301481f Merge remote-tracking branch 'origin/topic/johanna/centos8-ci'
* origin/topic/johanna/centos8-ci:
  Remove CentOS 8 from CI.
2022-01-06 14:05:00 -07:00
Tim Wojtulewicz
3e7472cc71 Merge remote-tracking branch 'origin/topic/vern/ZAM-leaks-and-test-suite'
* origin/topic/vern/ZAM-leaks-and-test-suite:
  test suite alternative baseline fixes for recent test renaming
  addressed a couple of memory leaks in ZAM execution
2022-01-06 13:54:52 -07:00
Tim Wojtulewicz
e803748403 Merge remote-tracking branch 'leres/master'
* leres/master:
  Make FreeBSD more flexible, don't look for jemalloc unless we were given a specific path for it.
  Set JEMALLOC_FOUND when on FreeBSD (suggested by Tim Wojtulewicz)
  FreeBSD: don't look for jemalloc as a package, it's in the base system
2022-01-05 09:14:07 -07:00
Tim Wojtulewicz
e0ecbc76f2 Merge remote-tracking branch 'origin/topic/johanna/gh-1919'
* origin/topic/johanna/gh-1919:
  Fix return type of double_to_int
2022-01-05 09:12:54 -07:00
Tim Wojtulewicz
c3839d9871 Merge remote-tracking branch 'origin/topic/timw/update-rapidjson'
* origin/topic/timw/update-rapidjson:
  Update rapidjson submodule to latest upstream master
2022-01-04 14:59:32 -07:00
Tim Wojtulewicz
5400d789fe Merge remote-tracking branch 'origin/topic/vern/local-scope-work'
* origin/topic/vern/local-scope-work:
  added notice of deprecation to NEWS
  test suite update
  deprecation warning on use of out-of-scope local
2022-01-03 13:56:27 -07:00
Tim Wojtulewicz
a75b46bd12 Merge remote-tracking branch 'origin/topic/robin/gh1822-bittorrent-re'
* origin/topic/robin/gh1822-bittorrent-re:
  Switch BitTorrent analyzer to Zeek's regex engine
  Adding test for BitTorrent tracker.
2022-01-03 13:55:18 -07:00
Christian Kreibich
8a61a3689e Updating CHANGES, VERSION, and NEWS. 2022-01-03 12:13:07 -08:00
Tim Wojtulewicz
2376fe414c Merge remote-tracking branch 'origin/topic/vern/usage-usage'
* origin/topic/vern/usage-usage:
  fixes for double-delete and reducing '?' operator with constant alternatives
  additional test suite updates for "-u" usage issues
  test suite updates for "xform" and "usage" alternatives, plus test name change
  removed unused script variable
  correct usage info for -u flag; -uu no longer supported
  fix typo in btest filename
2021-12-14 16:54:26 -07:00
Tim Wojtulewicz
4920b6affb Merge remote-tracking branch 'origin/topic/vern/cpp-incr'
* origin/topic/vern/cpp-incr:
  tweak to keep clang-format happy
  minor note regarding improving performance of C++-generated code
  factoring of generating C++ initializations, no semantic changes
  restored support for incremental compilation of scripts to C++
  fixes for -O gen-standalone-C++
  new ZEEK_FILE_ONLY and ZEEK_FUNC_ONLY environment variables for debugging script optimization - replaces ZEEK_ONLY
  fix for compiling record constructors to C++
  fixes for compiling vector operations to C++
  fixed for profiling missing some profile elements
  removing vestigial methods
  minor efficiency tweak for ZAM record construction
2021-12-14 11:35:11 -07:00
Tim Wojtulewicz
1b1cf8142d Merge remote-tracking branch 'origin/topic/timw/1860-double-to-int'
* origin/topic/timw/1860-double-to-int:
  GH-1860: Add double_to_int() bif
2021-12-14 09:23:59 -07:00
Tim Wojtulewicz
f2b74d21f7 Merge remote-tracking branch 'origin/topic/timw/null-checks'
* origin/topic/timw/null-checks:
  Check for sets before attempting to check for same Yield types
  Add early bail-outs to same_type()
  Fix types for Analyzer::register_for_port(s) to be the same
2021-12-13 09:41:48 -07:00
Tim Wojtulewicz
05e7ddcfd9 Merge remote-tracking branch 'origin/topic/vern/which-opt2'
* origin/topic/vern/which-opt2:
  btests for new --optimize-funcs and --optimize-files
  update btest to no longer use (unsupported) %S formatting, no longer needed
  replace --optimize-only with --optimize-funcs and --optimize-files
2021-12-10 15:35:49 -07:00