Commit graph

15378 commits

Author SHA1 Message Date
zeek-bot
605e749133 Update doc submodule [nomail] [skip ci] 2023-04-28 00:28:42 +00:00
Tim Wojtulewicz
eb9d851a07 Fix a few warnings from recent changes 2023-04-27 15:38:02 -07:00
Arne Welzel
f4bb8fae33 record_fields: Include information about optionality of fields
This was reported as a wish for log schema generation, so add it...
2023-04-27 21:18:35 +02:00
Tim Wojtulewicz
f3f139deab Merge remote-tracking branch 'origin/topic/timw/windows-ci-unit-testing'
* origin/topic/timw/windows-ci-unit-testing:
  Modify Windows test cmd file to actually run tests
  Add template file and cmake call for zeek-path setup on Windows
2023-04-27 11:26:00 -07:00
Arne Welzel
0374d0fe42 Update zeek-aux submodule [nomail] 2023-04-27 15:17:11 +02:00
Arne Welzel
a3ef8783b1 Merge remote-tracking branch 'origin/topic/neverlord/gh-2806'
* origin/topic/neverlord/gh-2806:
  test/builtin-plugins: Add plugin using ZEEK_VERSION_NUMBER
  Revert putting plugins into a fresh scope for now
  Propagate zeek-version.h skip via CMake properties
2023-04-27 13:23:14 +02:00
Arne Welzel
004dce2cf2 Merge remote-tracking branch 'origin/topic/awelzel/zeekctl-multiple-loggers'
* origin/topic/awelzel/zeekctl-multiple-loggers:
  NEWS: Add entry for ZeekControl and multi-loggers
  Bump zeekctl to multi-logger version
  logging: Support rotation_postprocessor_command_env
2023-04-27 12:17:02 +02:00
Arne Welzel
ee91201785 Merge remote-tracking branch 'origin/topic/awelzel/topic/bump-zeekjs-0-9-0'
* origin/topic/awelzel/topic/bump-zeekjs-0-9-0:
  Update ZeekJS submodule to 0.9.0
2023-04-27 09:09:44 +02:00
Tim Wojtulewicz
b65697633f Merge remote-tracking branch 'origin/topic/vern/func-coverage'
* origin/topic/vern/func-coverage:
  extend ZEEK_PROFILER_FILE profiling to include summaries for functions/hooks/event handlers
2023-04-26 12:43:00 -07:00
Vern Paxson
5b98538c8b extend ZEEK_PROFILER_FILE profiling to include summaries for functions/hooks/event handlers 2023-04-26 12:23:52 -07:00
Jan Grashoefer
342d88fbd4 Simplify btests using cluster_started event. 2023-04-26 20:00:44 +02:00
Jan Grashoefer
4ddf7562b9 Remove old cluster start tests.
These tests should be redundant to the cluster_started tests found in
policy/frameworks/cluster.
2023-04-26 19:29:55 +02:00
Tim Wojtulewicz
ca2616e573 Modify Windows test cmd file to actually run tests 2023-04-26 09:17:52 -07:00
Arne Welzel
8f262df192 Merge remote-tracking branch 'origin/topic/awelzel/bump-af-packet'
* origin/topic/awelzel/bump-af-packet:
  Update AF-Packet submodule
  btest: Add af_packet to TestDirs
  Update AF-Packet submodule
2023-04-26 15:38:17 +02:00
Arne Welzel
cc7e35b39a Update AF-Packet submodule
Include Tim's cleanup and modernization fixes, too.
2023-04-26 15:36:50 +02:00
Arne Welzel
83dd7cf580 test/builtin-plugins: Add plugin using ZEEK_VERSION_NUMBER 2023-04-26 10:29:06 +02:00
Tim Wojtulewicz
08a039446f Add template file and cmake call for zeek-path setup on Windows 2023-04-25 15:15:04 -07:00
Tim Wojtulewicz
dd26990410 Merge remote-tracking branch 'origin/topic/timw/2324-llc-snap-and-novell-oh-my'
* origin/topic/timw/2324-llc-snap-and-novell-oh-my:
  Update docs and NEWS to include LLC, SNAP, and Novell packet analyzers
  Fix length checks in VLAN/Ethernet analyzers for non-ethertype protocols
  Add forwarding from VLAN analyzer into LLC, SNAP, and Novell 802.3 analyzers
  Remove non-standard way of forwarding out of the Ethernet analyzer
  Add basic LLC, SNAP, and Novell 802.3 packet analyzers
  ARP: add support for IEEE802 hardware type
2023-04-25 13:08:06 -07:00
Tim Wojtulewicz
965b36fe65 Update docs and NEWS to include LLC, SNAP, and Novell packet analyzers 2023-04-25 13:00:12 -07:00
Tim Wojtulewicz
7facd94e6f Fix length checks in VLAN/Ethernet analyzers for non-ethertype protocols 2023-04-25 12:29:55 -07:00
Tim Wojtulewicz
7aa7909c94 Add forwarding from VLAN analyzer into LLC, SNAP, and Novell 802.3 analyzers 2023-04-25 12:29:55 -07:00
Tim Wojtulewicz
c5b8603218 Remove non-standard way of forwarding out of the Ethernet analyzer 2023-04-25 12:29:55 -07:00
Tim Wojtulewicz
7e88a2b3fb Add basic LLC, SNAP, and Novell 802.3 packet analyzers 2023-04-25 12:29:54 -07:00
Tim Wojtulewicz
31afe082ac ARP: add support for IEEE802 hardware type 2023-04-25 12:12:49 -07:00
Tim Wojtulewicz
ff6ebb9257 Merge branch 'topic/timw/2167-aruba-expansion'
* topic/timw/2167-aruba-expansion:
  Add NEWS entry about 802.11 and ARUBA changes
  Remove workaround for tunnels from IEEE 802.11 analyzer
  PPP in the GRE analyzer is actually PP*T*P
  Add support for 802.11 A-MSDU aggregates
  Fix IEEE 802.11 analyzer to properly forward tunneled packets
  Fix IEEE 802.11 analyzer to skip packets with the Protected bit enabled
  Expand support for Aruba protocol types in GRE analyzer
  Default tunnel_type in iosource::Packet to NONE
2023-04-25 11:37:51 -07:00
Tim Wojtulewicz
43a2b39c05 Add NEWS entry about 802.11 and ARUBA changes 2023-04-25 11:37:30 -07:00
Tim Wojtulewicz
f62f8e5cc9 Remove workaround for tunnels from IEEE 802.11 analyzer 2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
934207c05b PPP in the GRE analyzer is actually PP*T*P 2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
2d05beac06 Add support for 802.11 A-MSDU aggregates 2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
5b1c6216bd Fix IEEE 802.11 analyzer to properly forward tunneled packets
This mostly happens with Aruba, but could possibly happen with other tunnels too.
2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
e4a1c30828 Fix IEEE 802.11 analyzer to skip packets with the Protected bit enabled 2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
69d72f3bbb Expand support for Aruba protocol types in GRE analyzer
This also fixes the GRE analyzer to forward into the IEEE 802.11 analyzer
if it encounters Aruba packets with the proper protocol types. This way
the QoS header can be handled correctly.
2023-04-25 09:28:20 -07:00
Tim Wojtulewicz
1e6cc76c83 Default tunnel_type in iosource::Packet to NONE 2023-04-25 09:28:20 -07:00
Dominik Charousset
9971121509 Revert putting plugins into a fresh scope for now 2023-04-25 17:20:33 +02:00
Dominik Charousset
cd7430bcce Allow plugins to call find_package(Zeek) 2023-04-25 16:50:39 +02:00
Arne Welzel
aaf68a4e2c btest: Add af_packet to TestDirs 2023-04-25 14:51:18 +02:00
Arne Welzel
e856e953b8 Merge remote-tracking branch 'origin/topic/christian/sync-ignore_checksums-from-cli'
* origin/topic/christian/sync-ignore_checksums-from-cli:
  Given the -C flag, set script-layer ignore_checksums to true.
  Add btest for "-C" flag vs the script-layer ignore_checksums global.
2023-04-25 12:39:27 +02:00
Arne Welzel
ef7e714afd Update AF-Packet submodule
* Mask VLAN ID from tp_vlan_tci field to fix vlan > 4095 reported by Zeek
  when PCP and/or DEI bits are set.
* Descriptive error message when interface is down. Instead of
  "Invalid argument", Zeek now reports "interface is down".
2023-04-25 11:15:53 +02:00
Arne Welzel
d2c09676bb Update ZeekJS submodule to 0.9.0
* Performance improvements for the Redis Log::log_stream_policy example
  around PortVal wrapping and caching field offsets for property lookups.
* Debug output is now channeled through PLUGIN_DBG_LOG() and available via
  zeek -B plugin-Zeek-JavaScript instead of unconditionally on stderr.
* Reduced CMake output when Node.js isn't found
2023-04-25 11:03:48 +02:00
Christian Kreibich
ce4494d8d3 Given the -C flag, set script-layer ignore_checksums to true. 2023-04-24 21:19:05 -07:00
Christian Kreibich
1a1feec887 Add btest for "-C" flag vs the script-layer ignore_checksums global. 2023-04-24 21:19:05 -07:00
zeek-bot
cb9379b44d Update doc submodule [nomail] [skip ci] 2023-04-25 00:24:45 +00:00
Tim Wojtulewicz
5041efd8e7 Remove references to bro_broker in broker/Manager.h 2023-04-24 15:21:09 -07:00
Arne Welzel
1b69b4d26f Merge branch 'topic/amazingpp/irc-fuid-missing' of github.com:AmazingPP/zeek
* 'topic/amazingpp/irc-fuid-missing' of github.com:AmazingPP/zeek:
  Add irc_dcc_send_ack event and fix missing fields

I've moved IRC_Data back into the zeek::analyzer::file namespace, but
we did move the declaration from protocol/file/File.h to protocol/irc/IRC.h.
But, if someone actually customized IRC_Data and didn't include protocol/irc/IRC.h
for other reasons, I'll be surprised (and also just suggest to update the include).
2023-04-24 18:22:50 +02:00
Dominik Charousset
1715028986 Propagate zeek-version.h skip via CMake properties
Add a define for `ZEEK_CONFIG_SKIP_VERSION_H` to static plugins as well
as to dynamic plugins that we build alongside Zeek. When including
`zeek-config.h` with this macro defined, the header skips including
`zeek-version.h`.
2023-04-24 17:51:25 +02:00
Arne Welzel
9b1bfe63f4 Merge remote-tracking branch 'origin/topic/awelzel/replace-more-bro-plugin-install-path'
* origin/topic/awelzel/replace-more-bro-plugin-install-path:
  cmake: Fixup BRO_PLUGIN_INSTALL_PATH references
2023-04-24 14:36:53 +02:00
Arne Welzel
2891b8af44 cmake: Fixup BRO_PLUGIN_INSTALL_PATH references
Commit 19cbb328a9 removed setting of
BRO_PLUGIN_INSTALL_PATH in favor of ZEEK_PLUGIN_DIR. Replace left-over
references the former.
2023-04-24 12:15:37 +02:00
Arne Welzel
1b710d5534 Merge remote-tracking branch 'origin/topic/neverlord/plugin-dir'
* origin/topic/neverlord/plugin-dir:
  Fix install directory for plugins
2023-04-24 10:33:40 +02:00
Arne Welzel
ffb73e4de9 Merge remote-tracking branch 'origin/topic/awelzel/add-community-id'
* origin/topic/awelzel/add-community-id:
  testing/external: Bump hashes for community_id addition
  NEWS: Add entry for Community ID
  policy: Import zeek-community-id scripts into protocols/conn frameworks/notice
  Add community_id_v1() based on corelight/zeek-community-id
2023-04-24 10:12:56 +02:00
Arne Welzel
0bbd7cab1b testing/external: Bump hashes for community_id addition 2023-04-24 09:43:22 +02:00