Commit graph

2206 commits

Author SHA1 Message Date
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
Tim Wojtulewicz
aa91f72b34 Merge remote-tracking branch 'origin/topic/vern/cpp-add-option2'
* origin/topic/vern/cpp-add-option2:
  reintroduction of "-O add-C++" option
2021-12-10 13:13:26 -07:00
Tim Wojtulewicz
56b421db9f Merge remote-tracking branch 'origin/topic/vern/cpp-maint-dec21'
* origin/topic/vern/cpp-maint-dec21:
  fixes for vector operations
  flag globals initialized to opaque values as non-compilable
  skip type signatures for lambdas
  fix for translating filenames beginning with numbers to C++ variable names
  remove unnecessary includes
2021-12-10 13:12:58 -07:00
Tim Wojtulewicz
79326ba62c Merge remote-tracking branch 'origin/topic/vern/cpp-record-constructor'
* origin/topic/vern/cpp-record-constructor:
  update script-to-C++ compilation for new record constructor internals
2021-12-10 13:11:45 -07:00
Tim Wojtulewicz
c105cbad6e Merge remote-tracking branch 'origin/topic/vern/ZAM-maint'
* origin/topic/vern/ZAM-maint:
  updates to ZAM to track recent changes in script semantics
2021-12-10 13:11:20 -07:00
Tim Wojtulewicz
7a6a81c200 Merge remote-tracking branch 'origin/topic/timw/1740-table-key-error'
* origin/topic/timw/1740-table-key-error:
  GH-1741: Print error if calling a non-hook with hook keyword
  GH-1740: Report a better error message if table key is not a list
2021-12-10 09:28:34 -07:00
Tim Wojtulewicz
b64a700838 Merge remote-tracking branch 'origin/topic/timw/1125-gre-aruba'
* origin/topic/timw/1125-gre-aruba:
  GH-1125: Support GRE ARUBA headers
  Fix ethertype for ARP in Geneve forwarding rules
2021-12-09 14:59:13 -07:00
Christian Kreibich
3b3a812477 Merge branch 'topic/christian/json-configurable-absent-fields'
* topic/christian/json-configurable-absent-fields:
  Add LogAscii::json_include_unset_fields flag to control unset field rendering
2021-12-09 13:45:49 -08:00
Johanna Amann
c02e33c811 Merge remote-tracking branch 'origin/topic/johanna/gh-1832'
* origin/topic/johanna/gh-1832:
  Improve error message for clash between variable and function name
2021-12-09 19:57:16 +00:00
Tim Wojtulewicz
8df195e35f Merge remote-tracking branch 'origin/topic/timw/1764-geneve-to-ip'
* origin/topic/timw/1764-geneve-to-ip:
  GH-1764: Update mappings for Geneve analyzer to IP4/IP6/ARP
2021-12-07 09:35:00 -07:00
Christian Kreibich
ea20b8e55e Merge branch 'topic/christian/doctest-in-packages'
* topic/christian/doctest-in-packages:
  Update cmake and auxil/zeek-aux submodules
  Remove the --enable-cpp-tests configure flag in Cirrus CI
  Add testcases for plugin with doctest usage
  Flip unit tests to being enabled by default
  Support for unit tests in plugins
  Alphabetically sort configure's enable/disable/with options
2021-12-06 17:08:27 -08:00
Tim Wojtulewicz
f44ea32df8 Merge remote-tracking branch 'origin/topic/timw/remove-tag-types'
* origin/topic/timw/remove-tag-types:
  Remove separate Tag types, note breaking change in NEWS
2021-12-06 11:29:49 -07:00
Tim Wojtulewicz
fbb411780a Merge remote-tracking branch 'origin/topic/timw/1768-log-stream-crash'
* origin/topic/timw/1768-log-stream-crash:
  GH-1768: Properly cleanup existing log stream when recreated on with the same ID
2021-12-06 09:15:34 -07:00
Tim Wojtulewicz
e7412e257f Merge remote-tracking branch 'bbannier/topic/bbannier/more-autoformating'
* bbannier/topic/bbannier/more-autoformating:
  Format Python scripts with yapf.
  Format shell scripts with shfmt.
2021-12-01 10:33:22 -07:00
Tim Wojtulewicz
6a7bbd5268 Merge remote-tracking branch 'origin/topic/vern/CPP-cond'
* origin/topic/vern/CPP-cond:
  fix btest comment to more accurately describe the test
  clang-format issue
  btests for erroneous script conditionals
  avoid compiling-to-C++ for functions potentially influenced by conditionals
  track the use of conditionals in functions and files
  AST profiles track the associated function/body/expression
2021-12-01 10:25:58 -07:00
Tim Wojtulewicz
6392ca0fec Merge remote-tracking branch 'origin/topic/timw/1873-tag-deprecations'
* origin/topic/timw/1873-tag-deprecations:
  GH-1873: Deprecate the tag types differently to avoid type clashes
2021-12-01 09:44:22 -07:00
Johanna Amann
94ee837398 Fix for the recent patch that allows segment offloaded packets.
We recently added support for segment offloaded packets. It turns out
that this can lead to problems in UDP/ICMP based parsers since I missed
correctly also updating the payloadlength there, and using the capture
length instead when segment offloading is enabled.

Credit to OSS-Fuzz for discovery
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41391
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41394
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41395
(Link to details becomes public 30 days after patch release)
2021-11-30 11:55:30 -07:00
Tim Wojtulewicz
6a5b51eba8 Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
* origin/topic/timw/coverity-fixes:
  Fix a number of Coverity findings
2021-11-29 13:47:08 -07:00
Tim Wojtulewicz
fbcebb85a1 Merge remote-tracking branch 'origin/topic/vern/CPP-trim'
* origin/topic/vern/CPP-trim:
  suppress unneeded initializations
  address clang 10 warnings
2021-11-29 13:46:14 -07:00
Tim Wojtulewicz
8e1d770966 Merge remote-tracking branch 'origin/topic/vern/record-empty-vector-fix'
* origin/topic/vern/record-empty-vector-fix:
  fixes for constructing and assigning records with fields that are empty vectors
2021-11-24 13:32:45 -07:00
Tim Wojtulewicz
e0b4659488 Merge remote-tracking branch 'origin/topic/vern/CPP-speedup'
* origin/topic/vern/CPP-speedup:
  use iterator-based idiom for check-if-present-then-access
  const-ify member function
  switch looping over vectors to use iterators
  remove unused local variables
  efficiency fix - return a reference rather than a copy of a map
  fix for case-sensitive file systems
  geez sometimes it's signed sometimes it's not
  documentation updates
  remove -O add-C++ and -O update-C++ options
  extensive rewrite of generation & execution of run-time initialization
  factoring out CPPEscape to be a standalone function
  removing unused SubNetType class
2021-11-23 19:44:57 -07:00
Tim Wojtulewicz
e86a606d18 Merge remote-tracking branch 'origin/topic/timw/1571-move-tunnel-analyzers-2'
* origin/topic/timw/1571-move-tunnel-analyzers-2:
  Update NEWS and some minor fixes for docs/zeekygen
  Remove the old session-based tunnel analyzers
  Add GTPv1 packet analyzer, disable old analyzer
  Add Teredo packet analyzer, disable old analyzer
  Add VXLAN packet analyzer, disable old analyzer
  Add Geneve packet analyzer, disable old analyzer
  Add AYIYA packet analyzer, disable old analyzer
  Add PacketAnalyzer::register_for_port(s) functions
  Add analyzer_confirmation and analyzer_violation events
  Add utility function for tunnel analyzers to setup encapsulation
  Store some additional information in the packet during processing
  Minor fix in UDP to avoid duplicating tunnels
  Fix error text in IPTunnel analyzer
  Change Packet::ip_hdr to be a shared_ptr so it can be copied into EncapsulatingConn
  Add method for packet analyzers to register for protocol detection
  Add concept of "parent" tag namespaces
  Unify plugin::Component and plugin::TaggedComponent into a single class
  Remove uses of deprecated Tag types
  Unify all of the Tag types into one type
2021-11-23 19:42:15 -07:00
Johanna Amann
3fe6ad1a82 Merge remote-tracking branch 'origin/topic/johanna/gh-1829-test'
* origin/topic/johanna/gh-1829-test:
  Add testcase for TCP segment offloading.
2021-11-23 15:35:35 +00:00
Johanna Amann
3846f69f38 Merge remote-tracking branch 'origin/topic/johanna/openssl-3-compat'
* origin/topic/johanna/openssl-3-compat:
  Update cmake submodule for OpenSSL 3.0 changes
  OpenSSL 3: normalize self-signed-cert error message
  Make cmake & ci like OpenSSL 3.0
  Add OpenSSL 3.0 CI test
  OpenSSL 3: fix warnings and tests
  Switch OpaqueVal hashing back to legacy OpenSSL implementation

Fixes GH-1379
2021-11-23 13:48:26 +00:00
Johanna Amann
48ee7db3c1 Merge remote-tracking branch 'origin/topic/johanna/gh-1829'
* origin/topic/johanna/gh-1829:
  Add documentation for GH-1829
  Packets with TSO: address review feedback.
  Accept packets that use tcp segment offloading.

Fixes GH-1829
2021-11-23 10:20:07 +00:00
Christian Kreibich
c9229b68cf Merge branch 'topic/christian/fix-docker-doublebuild'
* topic/christian/fix-docker-doublebuild:
  Clean up fully after successful Docker btests
2021-11-17 11:58:13 -08:00
Christian Kreibich
bdb5222c27 Merge branch 'topic/christian/docker-tag-fix'
* topic/christian/docker-tag-fix:
  Fix ref-naming typo in the Github Docker workflow
2021-11-15 10:11:27 -08:00
Tim Wojtulewicz
3cd9387eab Merge remote-tracking branch 'origin/topic/timw/1736-update-libkqueue'
* origin/topic/timw/1736-update-libkqueue:
  Update libkqueue submodule
2021-11-12 13:46:52 -07:00
Tim Wojtulewicz
362df3f1db Merge remote-tracking branch 'origin/topic/timw/1620-unprocessed-packets'
* origin/topic/timw/1620-unprocessed-packets:
  Added plugin.unprocessed_packet_hook btest
  Fix whitespace in help output
  Add command-line option to write unprocessed packets to a file
  GH-1620: Add event and plugin hook to track packets not processed
2021-11-12 09:31:10 -07:00
Tim Wojtulewicz
87d17cf56d Merge remote-tracking branch 'origin/topic/bbannier/install-3rdparty-headers'
* origin/topic/bbannier/install-3rdparty-headers:
  Install include headers from `src/3rdparty/`.
2021-11-10 10:20:13 -07:00
Johanna Amann
d451fb8184 Merge branch 'topic/AbdelSaTd/case-insensitive-find'
* topic/AbdelSaTd/case-insensitive-find:
  testing-do-find-str_case-insensitive
  case-insensitive-search-features-for-do_find_str

I did a few small style-fixes while merging this and expanded the test
a bit. I also removed unecessary commits.

Closes GH-1828
2021-11-10 11:33:47 +00:00
Robin Sommer
1bb21bfcb4 Merge remote-tracking branch 'origin/topic/robin/gh-1757-loadfile2'
* origin/topic/robin/gh-1757-loadfile2:
  Tweaking a couple of debug message.
  Add new hook `HookLoadFileExtended` that allows plugins to supply Zeek script code to parse.
  Move logic to execute `HookLoadFile` for signatures into rule matcher code.
2021-11-10 11:28:53 +01:00
Tim Wojtulewicz
0604df01e3 Merge remote-tracking branch 'origin/topic/bbannier/issue-1780'
* origin/topic/bbannier/issue-1780:
  Add Github action exercising pre-commit
  Add pre-commit config.
  Format code with `clang-format`
  Remove stale files `src/DebugCmdInfoConstants.*`
  Disable formatting for files in `testing/btest/plugins`
  Move 3rdparty source files to `3rdparty/`
2021-11-09 10:30:14 -07:00
Tim Wojtulewicz
8429ef746d Merge remote-tracking branch 'origin/topic/timw/1819-hashing-segfault'
* origin/topic/timw/1819-hashing-segfault:
  GH-1819: Handle recursive types when describing type in binary mode
2021-11-09 09:46:08 -07:00
Tim Wojtulewicz
9fdc70634f Merge remote-tracking branch 'origin/topic/timw/remove-false-teredo-test'
* origin/topic/timw/remove-false-teredo-test:
  Remove no-op false-teredo test
2021-11-09 09:28:43 -07:00
Christian Kreibich
4974402be7 Merge branch 'topic/christian/ci-update'
* topic/christian/ci-update:
  Only push CI's Docker images when we're on the main repo
  Add macOS Monterey and drop Catalina in CI
  Add Fedora 35 to CI
2021-11-05 12:50:43 -07:00
Christian Kreibich
f080a814c4 Merge branch 'fix-set-intersection' of github.com:/ynadji/zeek
* 'fix-set-intersection' of github.com:/ynadji/zeek:
  Curse you tabs!
  Remove unused tbl
  Add reverse order intersection check
  Fix C++ Intersection code
  Change set intersection test to be correct
2021-11-04 14:31:41 -07:00
Tim Wojtulewicz
a23a4c7d66 Merge remote-tracking branch 'origin/topic/timw/693-pcap-append'
* origin/topic/timw/693-pcap-append:
  GH-693: use pcap_dump_open_append where supported
2021-11-03 09:37:10 -07:00
Tim Wojtulewicz
4feb4198c7 Merge branch 'topic/timw/1781-git-blame-ignore-revs'
* topic/timw/1781-git-blame-ignore-revs:
  GH-1781: Add .git-blame-ignore-revs file
2021-11-03 09:35:27 -07:00
Tim Wojtulewicz
86e5aec477 Merge remote-tracking branch 'origin/topic/timw/myricom-fix'
* origin/topic/timw/myricom-fix:
  Fix issue with broken libpcaps that return repeat packets
2021-11-01 09:20:28 -07:00
Tim Wojtulewicz
20d1b89caa Merge remote-tracking branch 'origin/topic/timw/clang-format-update'
* origin/topic/timw/clang-format-update:
  Apply some missing clang-format changes
2021-10-21 17:24:02 -07:00
Tim Wojtulewicz
3621fa943b Merge branch 'topic/timw/trailing-whitespace'
* topic/timw/trailing-whitespace:
  Remove trailing whitespace from script files
2021-10-20 11:13:36 -07:00