Commit graph

14853 commits

Author SHA1 Message Date
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
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
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
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
Arne Welzel
547e1b6280 NEWS: Add entry for Community ID 2023-04-24 09:43:22 +02:00
Christian Kreibich
b90351b7e6 policy: Import zeek-community-id scripts into protocols/conn frameworks/notice
Slightly adapted for indentation.
2023-04-24 09:43:19 +02:00
Fupeng Zhao
161ffb4192 Add irc_dcc_send_ack event and fix missing fields 2023-04-24 07:29:51 +00:00
Arne Welzel
0b22f792a5 Merge remote-tracking branch 'origin/topic/awelzel/file-analysis-manager-runstate-include'
* origin/topic/awelzel/file-analysis-manager-runstate-include:
  file_analysis/Manager: Remove RunState.h include
2023-04-24 09:24:42 +02:00
Dominik Charousset
19cbb328a9 Fix install directory for plugins 2023-04-22 16:12:22 +02:00
zeek-bot
3f0eee5d9d Update doc submodule [nomail] [skip ci] 2023-04-22 00:22:52 +00:00
Christian Kreibich
4ab7ff262f Merge branch 'topic/jgras/cluster-init' of github.com:/J-Gras/zeek
* 'topic/jgras/cluster-init' of github.com:/J-Gras/zeek:
  Update NEWS to cover cluster framework changes.
  Add cluster_started restart tests.
  Add basic cluster_started tests.
  Add cluster_started and node_fully_connected events.
  Add hook into cluster connection setup.
  Add broadcast_topics set.
  Generalize Cluster::worker_count.
2023-04-21 14:05:19 -07:00
Christian Kreibich
99de7b7526 Add community_id_v1() based on corelight/zeek-community-id
"Community ID" has become an established flow hash for connection correlation
across different monitoring and storage systems. Other NSMs have had native
and built-in support for Community ID since late 2018. And even though the
roots of "Community ID" are very close to Zeek, Zeek itself has never provided
out-of-the-box support and instead required users to install an external plugin.

While we try to make that installation as easy as possible, an external plugin
always sets the bar higher for an initial setup and can be intimidating.
It also requires a rebuild operation of the plugin during upgrades. Nothing
overly complicated, but somewhat unnecessary for such popular functionality.

This isn't a 1:1 import. The options are parameters and the "verbose"
functionality  has been removed. Further, instead of a `connection`
record, the new bif works with `conn_id`, allowing computation of the
hash with little effort on the command line:

    $ zeek -e 'print community_id_v1([$orig_h=1.2.3.4, $orig_p=1024/tcp, $resp_h=5.6.7.8, $resp_p=80/tcp])'
    1:RcCrCS5fwYUeIzgDDx64EN3+okU

Reference: https://github.com/corelight/zeek-community-id/
2023-04-21 20:44:09 +02:00
Jan Grashoefer
2cf16ccf81 Update NEWS to cover cluster framework changes. 2023-04-21 19:04:52 +02:00
Jan Grashoefer
893d31e1aa Add cluster_started restart tests. 2023-04-21 19:04:52 +02:00
Jan Grashoefer
2dcca004d3 Add basic cluster_started tests. 2023-04-21 19:04:52 +02:00
Jan Grashoefer
0cd32ba07c Add cluster_started and node_fully_connected events. 2023-04-21 19:04:52 +02:00
Jan Grashoefer
88c86cc7d4 Add hook into cluster connection setup. 2023-04-21 19:04:52 +02:00
Jan Grashoefer
c7626d797f Add broadcast_topics set.
This set contains the topics to reach all cluster nodes. Due to broker's
forwarding mechanism, we cannot define a single broadcast topic, as it
would create routing loops.
2023-04-21 19:04:52 +02:00
Jan Grashoefer
3db8bb4a44 Generalize Cluster::worker_count. 2023-04-21 19:04:39 +02:00
Christian Kreibich
379624404c Merge branch 'topic/christian/news-edits'
* topic/christian/news-edits:
  Edit pass over the current 6.0 NEWS entries. [nomail] [skip ci]
2023-04-20 16:04:18 -07:00
Christian Kreibich
1c047786b4 Edit pass over the current 6.0 NEWS entries. [nomail] [skip ci] 2023-04-20 15:59:52 -07:00
zeek-bot
32926e8def Update doc submodule [nomail] [skip ci] 2023-04-20 00:34:37 +00:00
Arne Welzel
ba085630b3 Merge remote-tracking branch 'origin/topic/awelzel/2935-publish-hrw-rr-type-check'
* origin/topic/awelzel/2935-publish-hrw-rr-type-check:
  zeek.bif: Remove cat_sep() fully var_arg changes
  broker/messaging: Runtime type checks for pool
  bifcl: Bump for runtime-type checks in var_arg bifs
2023-04-19 20:05:41 +02:00
Arne Welzel
10dc1c4bc2 zeek.bif: Remove cat_sep() fully var_arg changes
These were introduced to better catch type violations at runtime. With
bifcl doing these checks, revert to a better documented version.
2023-04-19 19:30:46 +02:00
Arne Welzel
f44279cc3e broker/messaging: Runtime type checks for pool
publish_hrw() and publish_rr() are excluded from type checking due to their
variadic nature. Passing a wrong type for the pool argument previously triggered
an abort, now the result is runtime errors. This isn't great, but it's
better than crashing Zeek.

Closes #2935
2023-04-19 19:30:46 +02:00
Arne Welzel
5aae4381d7 bifcl: Bump for runtime-type checks in var_arg bifs 2023-04-19 19:30:41 +02:00