Commit graph

575 commits

Author SHA1 Message Date
Tim Wojtulewicz
0772e205ec Update broker submodule for pybind11 + cmake changes 2023-08-07 08:15:09 -07:00
Vern Paxson
91d70e6dd4 support for discarding ASTs once compiled via ZAM script optimization 2023-07-26 13:32:00 -07:00
Tim Wojtulewicz
461f6b59d1 Updating submodule(s) [nomail] 2023-07-05 13:22:33 -07:00
Benjamin Bannier
47c549790c Bump Spicy to latest release.
This is the `master` branch companion patch for `release/6.0`'s
d6ad7f56c5.

Closes #3101.
2023-07-05 18:22:53 +02:00
Tim Wojtulewicz
e10e12e256 Update binpac, bifcl, and broker submodules for funsigned-char change 2023-07-02 14:56:45 -07:00
Tim Wojtulewicz
f6f9dd2620 Update package-manager submodule [nomail] 2023-06-30 13:31:23 -07:00
Arne Welzel
123dfafc56 Update zeekjs submodule to 0.9.4 2023-06-30 17:32:59 +02:00
Vern Paxson
4a5a7f975d bug fixes for script optimization intermediate forms 2023-06-30 09:36:14 +02:00
Tim Wojtulewicz
87081a728c Update zeekjs submodule 2023-06-21 15:36:48 -07:00
Tim Wojtulewicz
6278c81b08 Update broker submodule 2023-06-21 15:34:37 -07:00
Tim Wojtulewicz
4314bdfd38 Merge remote-tracking branch 'origin/topic/timw/update-broker'
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
2023-06-12 15:27:42 -07:00
Tim Wojtulewicz
b8c3d99842 Update broker submodule [nomail] 2023-06-12 12:31:12 -07:00
Tim Wojtulewicz
27575df917 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump `auxil/spicy`.
  Update link to slack in README.md
  Updating CHANGES and VERSION.
2023-06-12 11:07:03 -07:00
Benjamin Bannier
bef857e68c Bump auxil/spicy. 2023-06-09 12:51:16 +02:00
Tim Wojtulewicz
c3c42756cd Update zeekctl for pysubnetree/patricia upgrade 2023-06-01 10:56:19 +02:00
Tim Wojtulewicz
1cea0f8e6a Update bifcl, binpac, and broker repos for cmake changes 2023-05-31 13:16:03 -07:00
Tim Wojtulewicz
2cde6e1703 Switch broker submodule back to master 2023-05-31 12:08:05 +02:00
Tim Wojtulewicz
e39f953b33 Update broker submodule to 2.6.0 release tag [nomail] [skip ci] 2023-05-31 12:05:27 +02:00
Tim Wojtulewicz
3ac28ba5a2 Merge remote-tracking branch 'origin/topic/timw/update-broker'
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
2023-05-26 12:31:12 -07:00
Tim Wojtulewicz
8ae477c32d Update broker submodule [nomail] 2023-05-26 11:15:14 -07:00
Arne Welzel
6ac7a9e62a Update ZeekJS submodule to 0.9.1 2023-05-26 19:07:11 +02:00
Tim Wojtulewicz
ee79a88265 Update broker submodule [nomail] 2023-05-23 11:41:15 -07:00
Tim Wojtulewicz
a9f8bd5166 Update binpac and bifcl to released versions [nomail] 2023-05-23 11:00:53 -07:00
Tim Wojtulewicz
cf996a66e6 Updating submodule(s) [nomail] 2023-05-23 10:52:57 -07:00
Tim Wojtulewicz
3757a350cd Updating submodule(s) [nomail] 2023-05-19 09:50:22 -07:00
Robin Sommer
10477b38aa
Move Spicy submodule a layer up.
This moves `auxil/spicy/spicy` to `auxil/spicy`. It relocates the
pieces previously inside that intermediary directory. The main change
is that now tweak the compilation flags for Spicy through target
options.

This is on top of `topic/robin/spicy-plugin`.
2023-05-16 12:09:12 +02:00
Robin Sommer
0040111955
Integrate the Spicy plugin into Zeek proper.
This reflects the `spicy-plugin` code as of `d8c296b81cc2a11`.

In addition to moving the code into Zeek's source tree, this comes
with a couple small functional changes:

- `spicyz` no longer tries to infer if it's running from the build
  directory. Instead `ZEEK_SPICY_LIBRARY` can be set to a custom
  location. `zeek-set-path.sh` does that now.

- ZEEK_CONFIG can be set to change what `spicyz -z` print out. This is
  primarily for backwards compatibility.

Some further notes on specifics:

- We raise the minimum Spicy version to 1.8 (i.e., current `main`
  branch).

- Renamed the `compiler/` subdirectory to `spicyz` to avoid
  include-path conflicts with the Spicy headers.

- In `cmake/`, the corresponding PR brings a new/extended version of
  `FindZeek`, which Spicy analyzer packages need. We also now install
  some of the files that the Spicy plugin used to bring for testing,
  so that existing packages keep working.

- For now, this all remains backwards compatible with the current
  `zkg` analyzer templates so that they work with both external and
  integrated Spicy support. Later, once we don't need to support any
  external Spicy plugin versions anymore, we can clean up the
  templates as well.

- All the plugin's tests have moved into the standard test suite. They
  are skipped if configure with `--disable-spicy`.

This holds off on adapting the new code further to Zeek's coding
conventions, so that it remains easier to maintain it in parallel to
the (now legacy) external plugin. We'll make a pass over the
formatting for (presumable) Zeek 6.1.
2023-05-16 10:17:45 +02:00
Tim Wojtulewicz
eb5de051e3 Update broker submodule [nomail] 2023-05-12 12:44:31 -07:00
Tim Wojtulewicz
eba7f2c01e Update broker submodule [nomail] 2023-05-12 11:32:59 -07:00
Christian Kreibich
d305e09c9e Updating auxil/zeek-client submodule [nomail] 2023-05-11 13:26:31 -07:00
Jan Grashoefer
c12640b048 Add timestamps to manually published broker events. 2023-05-11 12:53:52 +02:00
Tim Wojtulewicz
2a587ad9c9 Updating submodule(s) [nomail] 2023-05-09 12:52:28 -07:00
Arne Welzel
9330a74fe1 Merge remote-tracking branch 'origin/topic/awelzel/zeek-archiver-multiple-loggers'
* origin/topic/awelzel/zeek-archiver-multiple-loggers:
  cluster/supervisor: Multi-logger awareness
  Bump zeek-archiver submodule
2023-05-09 15:20:53 +02:00
Arne Welzel
2f035dbc07 Bump zeek-archiver submodule 2023-05-05 12:24:18 +02:00
Arne Welzel
0374d0fe42 Update zeek-aux submodule [nomail] 2023-04-27 15:17:11 +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
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
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
Arne Welzel
5aae4381d7 bifcl: Bump for runtime-type checks in var_arg bifs 2023-04-19 19:30:41 +02:00
Arne Welzel
1b1d4c47c7 Bump zeekctl to multi-logger version 2023-04-18 15:41:36 +02:00
Arne Welzel
f0b9c59adb Add experimental JavaScript support when libnode is available
zeek.on('zeek_init', () => {
        console.log('Hello, Zeek!');
    });

For interaction with external systems and HTTP APIs, JavaScript and the
Node.js ecosystem beat Zeek script. Make it more easily accessible by
including ZeekJS with Zeek directly.

When a recent enough libnode version is found on the build system, ZeekJS is
added as a builtin plugin. This behavior can be disabled via
``--disable-javascript``. Linux distributions providing such a package are
Ubuntu (22.10) and Debian (testing/bookworm) as libnode-dev.
Fedora provides it as nodejs-devel.

This plugin takes over loading of .js or .cjs files. When no such files
are provided to Zeek, Node and the V8 engine are not initialized and
should not get into the way.

This should be considered experimental.
2023-04-14 11:26:41 +02:00
Dominik Charousset
9aeed5284d Redesign subdir-libs and plugin scaffolding 2023-04-13 22:23:46 +02:00
Tim Wojtulewicz
a7a895b178 Only use -Wno-changes-meaning if it exists 2023-04-11 14:35:56 -07:00
Tim Wojtulewicz
ca35c85983 Ignore -Wchanges-meaning warning in Spicy
This fixes a build failure with GCC 13. It's meant as a short-term fix to avoid
the failure in Zeek, but probably should be fixed more correctly upstream in
the Spicy repo.
2023-04-11 11:55:34 -07:00
Tim Wojtulewicz
a0dbfd2822 Update broker submodule to pull in GCC 13 fix 2023-04-11 11:55:34 -07:00
Tim Wojtulewicz
0d4f842190 Update gen-zam submodule for std::move warnings 2023-04-04 09:02:05 -07:00
Benjamin Bannier
53652a0673 Bump Spicy and spicy-plugin to their latest development snapshots. 2023-03-29 16:54:41 +02:00
Christian Kreibich
a9cec2e4f4 Bump zeekctl and doc submodule for updates regarding Site::local_nets 2023-03-22 13:34:54 -07:00