Commit graph

2189 commits

Author SHA1 Message Date
Christian Kreibich
b5e9488389 Merge branch 'topic/bbannier/issue-1625'
* topic/bbannier/issue-1625:
  Switch published container image to debian:bullseye-slim
  Test container with BTest instead of container-structure-tests
  Add a minimal containerized environment
2021-09-24 11:15:35 -07:00
Tim Wojtulewicz
e5b163290d Merge remote-tracking branch 'origin/topic/vern/remove-uu'
* origin/topic/vern/remove-uu:
  fix up for linking w/ doc update
  documentation update
  script simplification that removes an unnecessary &is_assigned
  removing -uu functionality and associated script analysis now no longer needed
2021-09-24 10:31:56 -07:00
Robin Sommer
dd5d6e1756 Merge branch 'topic/foxds/dcerpc_auth' of ssh://github.com/fox-ds/zeek
* 'topic/foxds/dcerpc_auth' of ssh://github.com/fox-ds/zeek:
  Fix protocol forwarding in dce_rpc-auth
  Fix protocol forwarding in dce_rpc-auth
2021-09-23 17:50:00 +02:00
Robin Sommer
c5ebe299b1 Merge remote-tracking branch 'origin/topic/justin/conn-remove-empty-string-allocation'
* origin/topic/justin/conn-remove-empty-string-allocation:
  Avoid allocation of 0 length strings on new conns
2021-09-23 12:32:42 +02:00
Tim Wojtulewicz
0a0ed65306 Merge remote-tracking branch 'origin/topic/robin/gh-54-sanitize'
* origin/topic/robin/gh-54-sanitize:
  Sanitize log files names before they go into system().
2021-09-22 12:17:05 -07:00
Tim Wojtulewicz
a49dcc8954 Merge remote-tracking branch 'origin/topic/johanna/dpd-packet-limit'
* origin/topic/johanna/dpd-packet-limit:
  PIA - switch size to int64_t
  Introduce dpd_max_packets
2021-09-22 12:16:56 -07:00
Tim Wojtulewicz
c87e290bf1 Merge remote-tracking branch 'origin/topic/timw/fixing-homebrew-again'
* origin/topic/timw/fixing-homebrew-again:
  Use `brew update` instead of `brew update-reset` in CI macOS prepare script
2021-09-21 14:13:30 -07:00
Tim Wojtulewicz
a507d4294d Merge remote-tracking branch 'origin/topic/timw/test-disabling-profiling'
* origin/topic/timw/test-disabling-profiling:
  Disable script profiling/coverage on sanitizer builds
2021-09-21 09:44:55 -07:00
Robin Sommer
74680bf4e6 Merge remote-tracking branch 'origin/topic/justin/software-framework-parse-cache'
* origin/topic/justin/software-framework-parse-cache:
  Restore behavior of Software::register event
  Optimzie software framework version parsing
2021-09-21 18:00:46 +02:00
Tim Wojtulewicz
5c0669d9a4 Merge remote-tracking branch 'origin/topic/christian/rehash-comphash'
* origin/topic/christian/rehash-comphash:
  Add btests for new functionality
  Remove unused HashKey constructor and reorder for consistency
  Refactor CompHash class to use new HashKey buffering features
  Add debug string and ODesc support to HashKey class
  Refactor HashKey class to support read/write operations
  Add unit tests for memory helpers
  Add memory sizing/alignment helpers to util.cc/h
  Ensure table/set HashKey buffer reservation and writes happen in same order
2021-09-21 07:45:38 -07:00
Robin Sommer
31d3fb0f6c Merge https://github.com/gpotter2/zeek.
Changes during merge:
  - Add dedicated test (w/ trace "client_timestamp_enabled.pcapng" from Cloudshark)
  - Change types from signed to unsigned.
  - Add cast for bit-shifting operand.
  - clang-format run
2021-09-20 11:41:29 +02:00
Vern Paxson
95af08b8be elevate CHANGES descriptions and add a NEWS item for -O ZAM 2021-09-17 07:36:33 -07:00
Tim Wojtulewicz
9068b71750 Merge remote-tracking branch 'origin/topic/timw/386-clang-format'
* origin/topic/timw/386-clang-format:
  Minor fixes for build problems after reformatting
  Reformat the world
  Fixes for includes ahead of reformatting
  GH-386: Add clang-format config and scripts
2021-09-16 15:37:21 -07:00
Robin Sommer
6c128a21e1 Merge branch 'topic/foxds/dcerpc_ms-oaut' of ssh://github.com/fox-ds/zeek
* 'topic/foxds/dcerpc_ms-oaut' of ssh://github.com/fox-ds/zeek:
  Added four new opnum mappings for MS-OAUT IDispatch methods
2021-09-16 11:15:36 +02:00
Tim Wojtulewicz
619af69e42 Merge remote-tracking branch 'origin/topic/vern/zam-coverity'
* origin/topic/vern/zam-coverity:
  still more nit-squashing
  avoiding using back() for an empty std::string
  additional tweaks to address some compiler warnings
  tweaks to address some compiler warnings
  tweaks to address concerns flagged by Coverity
2021-09-14 18:39:44 -07:00
Tim Wojtulewicz
cc162e2ab0 Merge remote-tracking branch 'awelzel/table-val-contains'
* awelzel/table-val-contains:
  ignore_checksums_nets: Add test for multiple subnets
2021-09-14 13:01:03 -07:00
Tim Wojtulewicz
8414d13030 Merge remote-tracking branch 'origin/topic/vern/vector-hole-loops'
* origin/topic/vern/vector-hole-loops:
  fix for looping over vectors with holes per https://github.com/zeek/zeek/issues/1763
  btest for https://github.com/zeek/zeek/issues/1763
2021-09-08 12:04:56 -07:00
Tim Wojtulewicz
b7e264f8ef Merge remote-tracking branch 'origin/topic/seth/tsv-logs-utf8-by-default'
* origin/topic/seth/tsv-logs-utf8-by-default:
  Fix mis-usage of string::append that leads to an overflow
  Use json_escape_utf8 for all utf8 data in ODesc
  Switch the TSV Zeek logs to be UTF8 by default.
2021-09-08 12:04:13 -07:00
Tim Wojtulewicz
a251aa07f7 Merge remote-tracking branch 'origin/topic/vern/ZAM-remainder'
* origin/topic/vern/ZAM-remainder: (37 commits)
  fix race condition in btest output ordering
  whoops, forgot to canonicalize filenames in new btest
  extend btest to include a coercion overflow
  fixed a typo in a comment
  fixes for vector coercion overflows, typing, and holes
  factoring out logic to check for overflows during coercions
  test case for vector coercions, including holes
  low-level cleanups found by code review
  additional conversions of size() to empty() checks that were missed previously
  indentation nit
  flag loop that has slightly subtle logic
  use ## to start major sections
  a number of low-level tweaks from code review
  use std::find_if rather than explicit loop
  switch simple loops that don't need indices to being iterator-based
  use container empty() rather than size() where appropriate
  Baseline variants for "-a zam"
  new "-a ZAM" testing baseline alternative
  updates for usage issues: support for -uu, maybe/definitely distinctions
  enable reducer to track folding to enable constant propagation
  ...
2021-09-08 11:44:35 -07:00
Tim Wojtulewicz
0746ef7ecc Merge remote-tracking branch 'origin/topic/vlad/analyzer_coverage'
* origin/topic/vlad/analyzer_coverage:
  Add btests for DNS WKS and BINDS
  Add btest for DNS WKS RR.
  Add btest for DNS NSEC3PARAM RR.
2021-09-03 18:12:28 +00:00
Tim Wojtulewicz
a54ffd18f3 Merge remote-tracking branch 'origin/topic/vlad/snmp_asn1_oid_performance'
* origin/topic/vlad/snmp_asn1_oid_performance:
  Code modernization: use ranged-based for loop where possible
  Improve performance of asn1_oid_to_val string conversions.
2021-09-03 18:11:01 +00:00
Tim Wojtulewicz
0b708e3625 Merge remote-tracking branch 'origin/topic/timw/1500-disable-tsan-sqlite'
* origin/topic/timw/1500-disable-tsan-sqlite:
  Disable the scripts.base.frameworks.logging.sqlite.simultaneous-writes test under TSan
  Mark MsgThread::cnt_sent_{in,out} as atomic to avoid a data race
  Disable call to sqlite3_enable_shared_cache under ThreadSanitizer
2021-09-03 18:09:31 +00:00
Tim Wojtulewicz
f1f7ab5870 Merge remote-tracking branch 'origin/topic/timw/1589-ip-regexes'
* origin/topic/timw/1589-ip-regexes:
  GH-1589: Avoid extracting IP-like strings from SMTP headers
2021-09-03 17:36:36 +00:00
Robin Sommer
6997f83e57 Merge remote-tracking branch 'origin/topic/johanna/gh-1709'
* origin/topic/johanna/gh-1709:
  Fix signed integer overflow in PIA on big sequence number holes
2021-08-31 15:58:48 +02:00
Robin Sommer
1e5161a469 Merge branch 'topic/bbannier/non_debug_-B' of ssh://github.com/bbannier/zeek
* 'topic/bbannier/non_debug_-B' of ssh://github.com/bbannier/zeek:
  Allow `-B` flag in non-Debug builds, but ignore it.
2021-08-31 15:56:29 +02:00
Robin Sommer
4bb59cdaeb Updating CHANGES and VERSION. 2021-08-31 15:54:49 +02:00
Tim Wojtulewicz
fe22d7cbb4 Merge remote-tracking branch 'origin/topic/timw/1581-utf8-escaping'
* origin/topic/timw/1581-utf8-escaping:
  Return fully-escaped string if utf8 conversion fails
2021-08-19 09:39:35 -07:00
Tim Wojtulewicz
b28fc77054 Merge remote-tracking branch 'origin/topic/bbannier/issue-1726'
* origin/topic/bbannier/issue-1726:
  Fix option length computation in Geneve analyzer.
2021-08-18 08:40:57 -07:00
Tim Wojtulewicz
7a4d3400d6 Merge remote-tracking branch 'origin/topic/timw/1713-less-realloc'
* origin/topic/timw/1713-less-realloc:
  GH-1713: Avoid unneeded reallocs in SerializationFormat::WriteData
2021-08-12 09:58:08 -07:00
Tim Wojtulewicz
cdfa50ddec Merge remote-tracking branch 'origin/topic/johanna/ignore-checksums-nets'
* origin/topic/johanna/ignore-checksums-nets:
  Do not lookup ignore_checksums_nets for every packet
2021-08-06 13:29:46 -07:00
Johanna Amann
d24cecf268 Merge remote-tracking branch 'origin/topic/timw/sessions-unordered-map'
* origin/topic/timw/sessions-unordered-map:
  Only sort sessions during Drain() if a random seed is set
  Use unordered_map to store sessions for performance reasons
2021-08-04 10:01:37 +01:00
Johanna Amann
ec6b954499 Merge branch 'master' of https://github.com/sowmyaramapatruni/zeek
Fixes GH-1689

* 'master' of https://github.com/sowmyaramapatruni/zeek:
  Fix issue-1689
2021-08-03 10:25:26 +01:00
Johanna Amann
8b506ca113 Merge branch 'topic/jgvt/issue-1598' of https://github.com/ThalesGroup/zeek
* 'topic/jgvt/issue-1598' of https://github.com/ThalesGroup/zeek:
  Fix when HTTP header are on several packet
  Fix HTTP evasion     - Happen when there is no CRLF at the end of HTTP     - Fix by adding CRLF when packet is complete (in relation to content-length in header)
2021-08-03 10:21:41 +01:00
Tim Wojtulewicz
d343dbbd76 Merge remote-tracking branch 'origin/topic/timw/patricia-rebase'
* origin/topic/timw/patricia-rebase:
  Fix failing test due to patricia change
  Rebase patricia code on upstream version
2021-08-02 11:10:15 -07:00
Tim Wojtulewicz
e89a743901 Merge remote-tracking branch 'origin/topic/timw/1654-exclude-cmake-dot-git'
* origin/topic/timw/1654-exclude-cmake-dot-git:
  GH-1654: Exclude the .git directory when installing cmake files
2021-07-30 08:52:56 -07:00
Tim Wojtulewicz
2a717e05cc Merge remote-tracking branch 'origin/topic/timw/1692-binary-to-int64-shifting'
* origin/topic/timw/1692-binary-to-int64-shifting:
  GH-1692: Add some safety to ASN's binary_to_int64 to avoid bad shifts
2021-07-29 13:24:02 -07:00
Tim Wojtulewicz
56ee21b97b Merge remote-tracking branch 'origin/topic/timw/shutdown-use-after-free'
* origin/topic/timw/shutdown-use-after-free:
  Fix a use-after-free during shutdown
2021-07-27 09:36:26 -07:00
Tim Wojtulewicz
6acc3418e0 Merge remote-tracking branch 'origin/topic/timw/1693-robust-iterator-invalidation'
* origin/topic/timw/1693-robust-iterator-invalidation:
  GH-1693: Fix potential crash with elements being modified during robust iteration
2021-07-26 13:03:20 -07:00
Tim Wojtulewicz
36972ba9e1 Merge remote-tracking branch 'origin/topic/timw/1684-run-state-time-updates'
* origin/topic/timw/1684-run-state-time-updates:
  GH-1684: Ensure that the time gets updated every pass if we're reading live traffic
2021-07-23 09:29:00 -07:00
Tim Wojtulewicz
9383c926ad Merge remote-tracking branch 'origin/topic/johanna/gh-1687'
* origin/topic/johanna/gh-1687:
  Fix handling of timers when cloning TableVals
2021-07-21 11:41:34 -07:00
Tim Wojtulewicz
f4016f34e8 Merge remote-tracking branch 'origin/topic/christian/btest-fodder-news'
* origin/topic/christian/btest-fodder-news:
  Cover in NEWS the inclusion of btest tooling in the installation
2021-07-20 09:58:27 -07:00
Tim Wojtulewicz
2d95c38148 Merge remote-tracking branch 'origin/topic/timw/send-email-on-docs-action-failure'
* origin/topic/timw/send-email-on-docs-action-failure:
  Fix generate-docs github action to send email when it fails
2021-07-20 09:56:17 -07:00
Tim Wojtulewicz
d8b0ee0853 Merge remote-tracking branch 'origin/topic/christian/bump-highwayhash'
* origin/topic/christian/bump-highwayhash:
  Bump highwayhash to pull in FreeBSD 14 fix
2021-07-19 08:56:59 -07:00
Tim Wojtulewicz
58a5118149 Merge remote-tracking branch 'origin/topic/robin/update-doctest'
* origin/topic/robin/update-doctest:
  Update 3rdparty submodule to pull in doctest to 2.4.6.
2021-07-19 08:55:19 -07:00
Tim Wojtulewicz
449a5e0fc3 Merge remote-tracking branch 'origin/topic/robin/fix-plugin-port-registration'
* origin/topic/robin/fix-plugin-port-registration:
  Fix registration of protocol analyzers from inside plugins.
2021-07-19 08:54:42 -07:00
Tim Wojtulewicz
6e3d2d4516 Merge remote-tracking branch 'origin/topic/timw/caf-0-18-5'
* origin/topic/timw/caf-0-18-5:
  Update broker submodule for new CAF version
2021-07-16 22:44:18 -07:00
Tim Wojtulewicz
3c7a2b1450 Merge remote-tracking branch 'origin/topic/vlad/dns_rr_fixes'
* origin/topic/vlad/dns_rr_fixes:
  Add a TODO to return a correct status for ParseRR_WKS
  Remove unnecessary if
  Generate dns_WKS_reply event
  dns_HINFO_reply event was never being generated.
2021-07-15 11:33:44 -07:00
Tim Wojtulewicz
62aa2fe7ba Merge remote-tracking branch 'origin/topic/robin/vector-string-tests'
* origin/topic/robin/vector-string-tests:
  Remove tests for deprecated operators.
  Add tests for operations on vectors of string.
2021-07-15 09:50:36 -07:00
Tim Wojtulewicz
09c4908573 Merge remote-tracking branch 'origin/topic/christian/fix-inputframework-test-race'
* origin/topic/christian/fix-inputframework-test-race:
  Fix race conditions in scripts.base.frameworks.input.reread
  Fix race condition in scripts.base.frameworks.input.invalid*
2021-07-14 15:01:29 -07:00
Tim Wojtulewicz
5d38bb029a Merge remote-tracking branch 'origin/topic/timw/structure-packing'
* origin/topic/timw/structure-packing:
  Reorder fields in some classes for more compact memory layout
  Redo how reassembled flag is accessed in IP_Hdr, filling in a memory hole
2021-07-14 15:00:23 -07:00