Commit graph

12318 commits

Author SHA1 Message Date
Tim Wojtulewicz
caba3dc151 GH-1644: Pass a larger structure to be calloc'd in patricia.c 2021-07-07 08:56:25 -07:00
Tim Wojtulewicz
fcee137b1a Fix multiple spelling errors in debug output 2021-07-07 08:55:48 -07:00
Tim Wojtulewicz
cf0745da9f Merge remote-tracking branch 'origin/topic/seth/subproject-build'
* origin/topic/seth/subproject-build:
  Removing a fix from another branch
  Update binpac pointer
  Update bifcl and binpac for building Zeek as a submodule
  Updated the cmake pointer
  Fix the builtin plugin preload mechanism
  Update submodule pointer for cmake to point at the appropriate branch
  Switch to more accurate source and binary references in cmake
2021-07-06 08:59:22 -07:00
Tim Wojtulewicz
2021df7418 Merge remote-tracking branch 'origin/topic/timw/coverity-findings'
* origin/topic/timw/coverity-findings:
  Fix a number of Coverity findings
2021-07-06 08:49:58 -07:00
Tim Wojtulewicz
c43a42fe95 Merge remote-tracking branch 'origin/topic/johanna/update-qtypes'
* origin/topic/johanna/update-qtypes:
  Add a few DNS query types.
2021-07-06 08:49:06 -07:00
Johanna Amann
132b9ef2cc Add a few DNS query types. 2021-07-06 10:40:22 +01:00
Robin Sommer
53f9f1c9ba Merge remote-tracking branch 'origin/topic/robin/new-update'
* origin/topic/robin/new-update:
  Add some more items to NEWS.
2021-07-06 08:47:52 +02:00
Christian Kreibich
5c74702ea1 Update submodule
[nomail]
2021-07-05 21:16:11 -07:00
Johanna Amann
7ec50bf434 Merge remote-tracking branch 'origin/topic/johanna/gh-859'
* origin/topic/johanna/gh-859:
  Add X509/SSL changes to NEWS
  X509: add check if function succeeds
  GH-1634: Address feedback
  Small indentation fixes in ssl-log-ext.zeek
  Fix memory leak in x509_check_cert_hostname bif
  Small bugfix and updates for external test hashes (SSL/X509)
  Baseline updates for recent SSL changes.
  Add ability to check if hostname is valid for a specific cert
  Add ssl_history field to ssl.log
  Add policy script suppressing certificate events
  Add new ssl-log-ext policy script
  Deprecate extract-certs-pem.zeek and add log-certs-base64.zeek
  Implement X509 certificate log caching
  Deprecate ICSI SSL notary script.
  Change SSL and X.509 logging format
  Enable OCSP logging by default.
  Split the code that handles X509 event hashing into its own file

Closes GH-859
2021-07-05 10:12:46 +01:00
Johanna Amann
8ed78408c3 Add X509/SSL changes to NEWS 2021-07-05 10:02:07 +01:00
Johanna Amann
43ef7d43fb X509: add check if function succeeds
Addresses feedback of GH-1634
2021-07-05 09:40:04 +01:00
Robin Sommer
c42c7a884d Add some more items to NEWS. 2021-07-05 08:59:28 +02:00
Christian Kreibich
42d2a5fe05 Merge branch 'topic/christian/global-log-filter-hooks'
* topic/christian/global-log-filter-hooks:
  Bump docs to pull in new log filter hooks documentation
  Add a global log policy hook to the logging framework
2021-07-02 12:51:06 -07:00
Christian Kreibich
8098d329f9 Bump docs to pull in new log filter hooks documentation 2021-07-02 12:45:51 -07:00
Christian Kreibich
795a7ea98e Add a global log policy hook to the logging framework
This addresses the need for a central hook on any log write, which
wasn't previously doable without a lot of effort. The log manager
invokes the new Log::log_stream_policy hook prior to any filter-specific
hooks. Like filter-level hooks, it may veto a log write. Even when
it does, filter-level hooks still get invoked, but cannot "un-veto".

Includes test cases.
2021-07-02 12:42:45 -07:00
Christian Kreibich
50c5968c30 Merge branch 'topic/christian/mallinfo2'
* topic/christian/mallinfo2:
  Use mallinfo2() instead of mallinfo() when available
2021-07-02 11:58:54 -07:00
Tim Wojtulewicz
5e00f78920 Fix a number of Coverity findings
- 1458048: Use-after-free in the SQLite logger
- 1457823: Missing a break statement in script-opt reduction
- 1453966: Dead code in CompHash
- 1445417: Unintialized variable in StaticHash64
- 1437716: Unintialized variables in FileInfo in scan.l
2021-07-02 11:18:19 -07:00
Tim Wojtulewicz
7dd18ec906 Merge remote-tracking branch 'origin/topic/neverlord/broker-fix'
* origin/topic/neverlord/broker-fix:
  Update Broker submodule
2021-07-02 10:16:58 -07:00
Johanna Amann
8972676e92 GH-1634: Address feedback
This commit addreses feedback for GH-1643, changing typos and renaming
one of the fields in x509.log.
2021-07-02 15:12:58 +01:00
Johanna Amann
2cee2a7fa0 Update submodule
[nomail]
2021-07-02 13:06:35 +01:00
Johanna Amann
6eff0594f3 Merge remote-tracking branch 'origin/topic/johanna/undate-cert-stuff'
* origin/topic/johanna/undate-cert-stuff:
  Update Mozilla CA list and CT anchors.
2021-07-02 13:05:04 +01:00
Johanna Amann
a6144c521e Update submodule
[nomail]
2021-07-02 12:59:38 +01:00
Dominik Charousset
fbd95973b4 Update Broker submodule 2021-07-02 13:17:56 +02:00
Christian Kreibich
63259ef9fa Use mallinfo2() instead of mallinfo() when available
glibc 2.33 deprecates mallinfo in favor of a struct that returns
its members as size_ts instead of ints.
2021-07-01 16:40:28 -07:00
Tim Wojtulewicz
727fca26e3 Minor NEWS formatting fixes 2021-07-01 09:24:55 -07:00
Tim Wojtulewicz
0b342b7bfa Merge remote-tracking branch 'origin/topic/vern/CPP-workflow2'
* origin/topic/vern/CPP-workflow2:
  low-level coding style fixes
  support for standalone compiled scripts to export globals with module qualifiers
  updates for documentation of functionality for compiling scripts to C++
  fixes for standalone C++ scripts making types & variables/functions available
  fixed bug limiting availability of load_CPP() BiF
  updates to development helper scripts to support new workflow
  simpler workflow for -O gen-C++ ; also some hooks for -O gen-standalone-C++
  ReplaceBody now deletes a body if the replacement is nil
  removal of can't-actually-be-executed code
2021-07-01 08:46:53 -07:00
Christian Kreibich
181063634d Merge branch 'topic/christian/input-framework-unset-field-fix'
* topic/christian/input-framework-unset-field-fix:
  Update NEWS [skip ci]
  Skip input framework entries with missing but non-optional fields
  Fix segfault in input framework when reading unset fields
2021-06-30 20:33:51 -07:00
Christian Kreibich
16e04cb53e Update NEWS [skip ci] 2021-06-30 20:32:08 -07:00
Christian Kreibich
937bdccab5 Skip input framework entries with missing but non-optional fields
The framework so far populated data structures with missing fields
even when those fields are defined without the &optional
attribute. When using the attribute, such entries continue to get
populated.

Update tests to reflect focus on unset fields.
2021-06-30 20:02:26 -07:00
Christian Kreibich
ef08605877 Fix segfault in input framework when reading unset fields
Unset fields could trigger unexpected null pointers in the input
manager. This also adds a warning such fields come up.
2021-06-30 20:02:25 -07:00
zeek-bot
38d4907903 Update doc submodule [nomail] [skip ci] 2021-07-01 00:36:49 +00:00
Tim Wojtulewicz
3c0bb8f1dd Merge remote-tracking branch 'origin/topic/seth/small-builtin-plugin-fixes'
* origin/topic/seth/small-builtin-plugin-fixes:
  Fix tests
  Removed a non-functional builtin plugin preload loading mechanism
  Load the builtin-plugin preload files and fix the dev path.
2021-06-30 14:11:10 -07:00
Seth Hall
6c66f6ede5 Fix tests 2021-06-30 19:22:19 +00:00
Seth Hall
c118d1c2f4 Removing a fix from another branch 2021-06-30 17:46:41 +00:00
Tim Wojtulewicz
83fcf23f16 Merge remote-tracking branch 'origin/topic/timw/1500-thread-sanitizer'
* origin/topic/timw/1500-thread-sanitizer:
  GH-1500: Mark BasicThread::Done to be ignored by ThreadSanitizer
2021-06-30 08:50:51 -07:00
Tim Wojtulewicz
0c8a594d6f GH-1500: Mark BasicThread::Done to be ignored by ThreadSanitizer
There's a known false positive with the atomic variables in this method
that triggers a complaint from ThreadSanitizer. Marking it as ignored
avoids the warning.
2021-06-30 08:50:14 -07:00
Johanna Amann
6a6961b474 Small indentation fixes in ssl-log-ext.zeek 2021-06-30 15:16:49 +01:00
Johanna Amann
a193b08ecf Update Mozilla CA list and CT anchors.
This commit switches to only allowing the CT logs that are currently
accepted by Google Chrome - which makes much more sense for us since
this is (potentially) used for validation.

Additional CT logs can be added in user-scripts.
2021-06-30 15:14:22 +01:00
Johanna Amann
09229c58d7 Update submodule
This updates the bundled SQLite to 3.36.0.

 [nomail]
2021-06-30 13:19:19 +01:00
Johanna Amann
509b501e1b Merge remote-tracking branch 'origin/master' into topic/johanna/gh-859 2021-06-30 10:36:54 +01:00
Johanna Amann
4ad5d2031b Fix memory leak in x509_check_cert_hostname bif 2021-06-30 10:16:38 +01:00
Robin Sommer
40923fdd65 Merge remote-tracking branch 'origin/topic/robin/gh-1406-m1-tests'
* origin/topic/robin/gh-1406-m1-tests:
  Fix SMB tests on Apple M1.
2021-06-30 07:52:44 +02:00
Vern Paxson
30cb91fe35 low-level coding style fixes 2021-06-29 15:17:34 -07:00
Robin Sommer
369e42a6e4 Fix SMB tests on Apple M1.
Due to different double precision on M1, file IDs for SMB could end up
changing on M1 because the access time of a file goes into their
computation. The real solution for this would be changing Zeek's
internal "time" representation to uint64; that's planned, but requires
major surgery. For now, this PR changes the SMB code to also pass SMB's
original time representation (which is a uint64) into script-land, and
then use that for computing the file ID.

Closes #1406
2021-06-29 20:17:02 +02:00
Christian Kreibich
8942da72b5 Merge branch 'topic/christian/gh-1626-remove-idmef'
* topic/christian/gh-1626-remove-idmef:
  Remove remaining vestigial IDMEF support code
2021-06-29 11:15:20 -07:00
Tim Wojtulewicz
19ba95b716 Merge remote-tracking branch 'origin/topic/vern/ZAM-prep'
* origin/topic/vern/ZAM-prep:
  made RecordVal::AppendField protected: it's low-level & requires knowledge of internals
2021-06-29 10:39:49 -07:00
Vern Paxson
d1334b7bca made RecordVal::AppendField protected: it's low-level & requires knowledge of internals 2021-06-29 10:24:20 -07:00
Tim Wojtulewicz
80f0b099b5 Update submodule(s) [nomail] 2021-06-29 08:43:52 -07:00
Tim Wojtulewicz
e454c886a7 Merge remote-tracking branch 'origin/topic/neverlord/ci'
* origin/topic/neverlord/ci:
  Fix package name for CMake on CentOS 8
2021-06-29 08:38:56 -07:00
Johanna Amann
93d7778f97 Small bugfix and updates for external test hashes (SSL/X509) 2021-06-29 15:25:08 +01:00