Commit graph

13262 commits

Author SHA1 Message Date
Tim Wojtulewicz
a7fd34375f GH-572: Mark MemoryAllocation() and related methods deprecated 2021-06-28 11:07:58 -07:00
Tim Wojtulewicz
e6e41ac5d9 Merge remote-tracking branch 'origin/topic/timw/silly-coverity-fix'
* origin/topic/timw/silly-coverity-fix:
  Check for -1 return from FieldOffset() in Val::HasField()
2021-06-28 11:06:51 -07:00
Tim Wojtulewicz
98a9ae9572 Check for -1 return from FieldOffset() in Val::HasField()
Fixes Coverity 1457804
2021-06-28 11:06:16 -07:00
Tim Wojtulewicz
67b45bc502 Merge remote-tracking branch 'origin/topic/vern/ZAM-prep'
* origin/topic/vern/ZAM-prep: (45 commits)
  whoops overlooked the need to canonicalize filenames
  another set of tweaks per review comments
  addressed a number of code review comments
  baseline updates for merge
  support "any" coercions for "-O gen-C++"
  better descriptions for named record constructors
  test suite baseline updates for "-a opt" optimize-AST alternative
  test suite baseline updates for "-a xform" alternative / AST transformation
  error propagation fix for AST reduction
  updates to "-a inline" test suite alternative baseline
  updates for the main test suite baseline
  updates to test suite tests for compatibility with upcoming ZAM functionality
  "-O compile-all" option to specify compilation of inlined functions
  compile inlined functions if they're also used indirectly
  provide ZAM-generated code with low-level access to record fields
  fix for cloning records with fields of type "any"
  direct access for ZAM to VectorVal internal vector
  ZVal constructors, accessors & methods in support of ZAM
  switch ZVal representation of types from Type objects to TypeVal's
  revised error-reporting interface for ZVal's, to accommodate ZAM inner loop
  ...
2021-06-28 11:03:13 -07:00
Tim Wojtulewicz
4a674f50d7 Update submodule(s) [nomail] 2021-06-28 08:51:25 -07:00
Seth Hall
8b1259088f Update binpac pointer 2021-06-28 13:23:59 +00:00
Seth Hall
c946c4532a Update bifcl and binpac for building Zeek as a submodule 2021-06-28 13:15:04 +00:00
Tim Wojtulewicz
bea3a615b6 Merge remote-tracking branch 'origin/topic/christian/gh-1600'
* origin/topic/christian/gh-1600:
  Remove unnecessary -B arguments from Zeek invocations in testsuite
  Fix perftools-enabled build
  Minor tweaks to single-character command line option handling
2021-06-27 10:50:37 -07:00
Tim Wojtulewicz
c1b2989035 Merge remote-tracking branch 'htonl/weird_segfault'
* htonl/weird_segfault:
  Add btest test case
  Fix typo
  Fix segfault with incomplete connection
2021-06-27 10:46:30 -07:00
Luke Cesarz
70c9ae7de9 Add btest test case 2021-06-25 12:10:50 -07:00
Florian Wilkens
946d74674a ssl/analyzer: potentially fix memory leaks caused by bytestrings 2021-06-25 17:23:06 +02:00
Florian Wilkens
ebea26a065 analyzer/ssl: several improvements
- use better data structures for secret and key material storage
- add documentation to the new methods in the analyzer
2021-06-25 12:34:45 +02:00
Florian Wilkens
aaaff39e12 analyzer/ssl: defensive key length check + more debug logging 2021-06-25 11:05:29 +02:00
Florian Wilkens
a7fe2bd9c5 testing: feature gate ssl/decryption test 2021-06-25 11:05:29 +02:00
Florian Wilkens
8c67b9c8fc testing: add ssl/decryption test 2021-06-25 11:05:29 +02:00
Florian Wilkens
979bf20769 analyzer/ssl: handle missing <openssl/kdf.h> 2021-06-25 11:05:20 +02:00
Christian Kreibich
0b55c55140 Remove unnecessary -B arguments from Zeek invocations in testsuite
Now that Zeek no longer silently accepts -B when not compiled in debug
mode, these tests were failing.
2021-06-24 17:05:32 -07:00
Vern Paxson
50c21e8c07 made RecordVal::AppendField protected: it's low-level & requires knowledge of internals 2021-06-24 16:47:28 -07:00
Christian Kreibich
cd066f09bf Fix perftools-enabled build 2021-06-24 16:02:45 -07:00
Christian Kreibich
a2e5251796 Minor tweaks to single-character command line option handling
- Use of "-B" now triggers usage output and errors out when Zeek
  wasn't built with debugging support.

- Always keep the perftools options (-m, -M) in the optparse string,
  for consistency with other flags dependent on configuration. We
  still fall through to usage and erroring out as before.

- Minor indentation fix.
2021-06-24 16:02:45 -07:00
Seth Hall
e7f190fb6d Updated the cmake pointer 2021-06-24 17:06:36 +00:00
Seth Hall
9eb55a1da2 Merge remote-tracking branch 'origin/master' into topic/seth/subproject-build 2021-06-24 17:05:52 +00:00
Johanna Amann
b04c611058 Update submodule
[nomail]
2021-06-24 14:30:46 +01:00
Tim Wojtulewicz
b80eb6f05a Merge remote-tracking branch 'origin/topic/timw/test-catalina-build'
* origin/topic/timw/test-catalina-build:
  Call brew update-reset in ci/macos/prepare.sh
  GH-1368: Use --osx-sysroot for macOS CI builds
2021-06-23 13:54:13 -07:00
Tim Wojtulewicz
1a61771d2f Call brew update-reset in ci/macos/prepare.sh
This fixes some issues with the Catalina builds when it prepares the image
and the base Cirrus image has old recipes for Homebrew. The VM then has
to build a bunch of packages it shouldn't need to.
2021-06-23 13:09:23 -07:00
Tim Wojtulewicz
cbd4c5ebf9 GH-1368: Use --osx-sysroot for macOS CI builds 2021-06-23 13:09:00 -07:00
Seth Hall
6602b54d42 Fix the builtin plugin preload mechanism 2021-06-23 10:40:18 +00:00
Seth Hall
e9f8997029 Update submodule pointer for cmake to point at the appropriate branch 2021-06-23 10:34:25 +00:00
Seth Hall
d08230ef8c Switch to more accurate source and binary references in cmake
This is mostly involved with moving CMAKE_SOURCE_DIR and
CMAKE_BINARY_DIR to PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR because it
enables zeek to be built as a subproject of another.

There is another branch in the cmake repository with the same name that
is also required for this to fully work.
2021-06-23 10:26:17 +00:00
Seth Hall
adb8ee16cb Removed a non-functional builtin plugin preload loading mechanism 2021-06-23 10:19:20 +00:00
Seth Hall
0470b06537 Load the builtin-plugin preload files and fix the dev path. 2021-06-23 10:12:57 +00:00
Christian Kreibich
239ea51f22 Update submodules [nomail] 2021-06-22 14:14:55 -07:00
zeek-bot
790656f351 Update doc submodule [nomail] [skip ci] 2021-06-22 00:31:06 +00:00
Tim Wojtulewicz
30973af94a Merge remote-tracking branch 'origin/topic/johanna/remove-stepping-stone'
* origin/topic/johanna/remove-stepping-stone:
  Remove the Stepping Stone analyzer
2021-06-21 16:14:25 -07:00
Christian Kreibich
84c3cee7ef Merge branch 'topic/christian/ci-drop-fedora-32'
* topic/christian/ci-drop-fedora-32:
  Drop Fedora 32 from CI, now past EOL
2021-06-21 15:44:50 -07:00
Christian Kreibich
4fa1709505 Merge branch 'topic/christan/fix-redundant-test-certs'
* topic/christan/fix-redundant-test-certs:
  Remove a double-defined TLS cert from a Broker btest
2021-06-21 15:41:16 -07:00
Christian Kreibich
0f0104293c Remove a double-defined TLS cert from a Broker btest 2021-06-21 13:16:06 -07:00
Robin Sommer
6559d56dbf Merge remote-tracking branch 'origin/topic/vlad/page_hostnames'
* origin/topic/vlad/page_hostnames:
  Expand the tests, and have email_admin email src contacts in one e-mail, and dst contacts in another.
  Simplify the logic a big by making Notice$email_dest have a default rather than be optional
  Missed some baselines
  Update hashes in external testing repos
  Update notice.log baselines
  Remove unneccessary @load
  Add tests for e-mail actions, and cleanup the new logic a bit.
  Fixup priorities
  Add a new field to the notice, which defines where to send the e-mail
  Add page and email_admin to hostnames extension
2021-06-21 11:21:17 +02:00
Luke Cesarz
35334a7681 Fix typo 2021-06-20 08:14:10 -07:00
Luke Cesarz
d29a43fb79 Fix segfault with incomplete connection
Add required HasField check before GetFieldAs call
2021-06-20 07:51:46 -07:00
Christian Kreibich
0b510c9679 Drop Fedora 32 from CI, now past EOL 2021-06-17 18:32:02 -07:00
zeek-bot
2de38750fd Update doc submodule [nomail] [skip ci] 2021-06-18 00:30:05 +00:00
Vlad Grigorescu
9d1e9a20e4 Expand the tests, and have email_admin email src contacts in one e-mail, and dst contacts in another. 2021-06-17 14:49:24 -05:00
Vlad Grigorescu
9d0bd96e1f Simplify the logic a big by making Notice$email_dest have a default rather than be optional 2021-06-17 10:31:04 -05:00
Johanna Amann
a995d73fdf Merge remote-tracking branch 'origin/topic/bbannier/issue-1590'
* origin/topic/bbannier/issue-1590:
  Change SSH version field to be `&optional`.
  Reformat function in SSH base script.

Changes during merge:
  * rename weirds to fit into our naming scheme
  * add NEWS entry

Closes GH-1590
2021-06-17 10:52:49 +01:00
Benjamin Bannier
daa9537f92 Change SSH version field to be &optional.
In 3769ed6c66 we added handling for SSH version 1.99 which unsed a SSH
version of 0 to indicate weird cases where no version could be
determined.

This patch is a fixup for that patch. Instead of using a magic version
of 0 we now use an `&optional` version value. If no SSH version can be
extracted the version will be unset; additionally a `conn_weird` event
will be raised.

Closes #1590.
2021-06-17 09:24:46 +02:00
Benjamin Bannier
e6e30240ec Reformat function in SSH base script. 2021-06-16 15:03:43 +02:00
Tim Wojtulewicz
0bf475f055 Update submodule(s) [nomail] 2021-06-15 11:35:48 -07:00
Christian Kreibich
a82fe94bcc Merge branch 'topic/christian/gh-1591'
* topic/christian/gh-1591:
  Bump Highwayhash submodule to pull in fix for FreeBSD
2021-06-14 16:21:15 -07:00
Vlad Grigorescu
bfb26b9227 Missed some baselines 2021-06-12 12:56:15 -05:00