Commit graph

15378 commits

Author SHA1 Message Date
Tim Wojtulewicz
ad8e829a49 Merge remote-tracking branch 'origin/topic/bbannier/zeek-config_dev_path'
* origin/topic/bbannier/zeek-config_dev_path:
  Add toplevel build dir to `PATH` for dev helper scripts.
2022-10-13 15:12:30 -05:00
Tim Wojtulewicz
1d6cad635f Merge remote-tracking branch 'origin/topic/timw/fix-bif-dwarf-information-for-debugger-line-contexts'
* origin/topic/timw/fix-bif-dwarf-information-for-debugger-line-contexts:
  Update bifcl submodule to get fixes for DWARF information for lldb
2022-10-13 15:10:59 -05:00
Tim Wojtulewicz
e1dc695abb Update bifcl submodule to get fixes for DWARF information for lldb 2022-10-13 13:59:35 -05:00
jasonlue
6c052bf926
Merge branch 'zeek:master' into topic/jasonlu/dict-clone-performance 2022-10-13 11:41:50 -07:00
Tim Wojtulewicz
16601eafa2 Merge remote-tracking branch 'origin/topic/vern/ZAM-Oct22-maint'
* origin/topic/vern/ZAM-Oct22-maint:
  ZAM maintenance for recent test suite changes (and fixups missed last time)
2022-10-13 08:57:59 -05:00
Arne Welzel
0bc7d0905e Include in Jan's AF_PACKET plugin as builtin plugin
This has come up a few times and the motivation is mainly better "first timer"
experience with Zeek. Concretely, if one wants to run a Zeek cluster with
multiple workers and reasonable load balancing on Linux, AF_PACKET is a decent
start. Without AF_PACKET support being built into Zeek, however, a new user's
next experience is that of setting up a development environment in order
to compile an external plugin (think compiler, kernel headers, zkg, ...).
Only to get what could be termed basic functionality.

This is using the ZEEK_INCLUDE_PLUGINS infrastructure. I've used the all
upper case spelling of AF_PACKET in the help output because it seems everyone
else references/writes it like that. I think we should also write it
like that in the docs.
2022-10-13 13:29:27 +02:00
zeek-bot
73d386a7e6 Update doc submodule [nomail] [skip ci] 2022-10-13 00:43:15 +00:00
Tim Wojtulewicz
a53aa11eb9 Updating CHANGES and VERSION. 2022-10-12 15:57:19 -05:00
Tim Wojtulewicz
4ea0d0365f Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
* origin/topic/timw/coverity-fixes:
  Update gen-zam and paraglob submodules for Coverity/clang-tidy fixes
  Fix some compiler warnings in script_opt
  Fix recent Coverity findings
2022-10-12 15:56:23 -05:00
Tim Wojtulewicz
75dab6e878 Update gen-zam and paraglob submodules for Coverity/clang-tidy fixes 2022-10-12 15:56:03 -05:00
Tim Wojtulewicz
ec14589206 Fix some compiler warnings in script_opt 2022-10-12 15:56:03 -05:00
Tim Wojtulewicz
31a6ef266a Fix recent Coverity findings
1491334: AUTO_CAUSES_COPY due to a for loop using auto& instead of const auto&
1498652: AUTO_CAUSES_COPY due to a for loop using auto& instead of const auto&
1498745: AUTO_CAUSES_COPY due to a for loop using auto& instead of const auto&
2022-10-12 15:56:03 -05:00
Jason Lu
967119e981 add performance based growth strategy 2022-10-12 12:17:29 -07:00
Vern Paxson
64ec7d0728 ZAM maintenance for recent test suite changes (and fixups missed last time) 2022-10-12 11:29:52 -07:00
Robin Sommer
f35e337746 Merge remote-tracking branch 'origin/topic/robin/disable-packet-analyzers-in-component'
* origin/topic/robin/disable-packet-analyzers-in-component:
  Move API for disabling packet analyzers into component.
  Suppress warning on an existing packet analyzer being remapped.
2022-10-12 20:07:55 +02:00
Arne Welzel
048f2201fb plugins: Reject dynamic plugins matching names of built-in ones
This goes the hard-exit on conflicts route as IMO it provides better
messaging that something is wrong, rather than defaulting to something
the user may not expect.

Fixes #2403
2022-10-12 18:45:17 +02:00
Tim Wojtulewicz
c2159eaa93 Merge remote-tracking branch 'origin/topic/timw/avoid-smtp-entity-errors'
* origin/topic/timw/avoid-smtp-entity-errors:
  smtp: Prevent script errors when smtp$entity is not set
2022-10-12 09:32:48 -07:00
Benjamin Bannier
7774a548ea Add toplevel build dir to PATH for dev helper scripts.
We already added the toplevel build dir to the paths exposed by
`build/zeek-path-dev`, but never made the matching change for
`build/zeek-path-dev.[sh,csh]`. Due to that a shell would have never
found `zeek-config` from the build env like it would have been found for
installations, and could potentially even have picked up a different
one.
2022-10-11 14:32:35 +02:00
Tim Wojtulewicz
a91d363e56 smtp: Prevent script errors when smtp$entity is not set
This is the same issue presented in 38e226bf75 but
for SMTP instead of HTTP.
2022-10-10 11:26:08 -07:00
Tim Wojtulewicz
a4ad4a34b2 Merge remote-tracking branch 'origin/topic/timw/2392-ordered-dict-iteration'
* origin/topic/timw/2392-ordered-dict-iteration:
  Disable robust iteration for ordered dictionaries
  Add support for itertors with ordered dictionaries
  Add equality, inequality, copy, and move operators to HashKey
2022-10-10 11:10:45 -07:00
Tim Wojtulewicz
20292b0210 Disable robust iteration for ordered dictionaries
This also includes some minor commenting cleanup in that class
2022-10-10 10:08:58 -07:00
Tim Wojtulewicz
57ae03dd7d Add support for itertors with ordered dictionaries 2022-10-10 10:08:58 -07:00
Tim Wojtulewicz
3b69dd38f3 Add equality, inequality, copy, and move operators to HashKey 2022-10-10 10:08:58 -07:00
Robin Sommer
b114850283 Move API for disabling packet analyzers into component.
Before, that API was part of the analyzers themselves, which meant we
couldn't disable a packet analyzer before it had been instantiated.
That's different from protocol/file analyzers, where we disable them
through the corresponding component. The lack of the component-side
API prevented Spicy from replacing packet analyzers at startup.

The reason we had put this into analyzer originally was performance so
that we don't need a component lookup for every packet. This change
keeps that optimization by caching the on/off state in the analyzer
itself as well, but now with the component being the one controlling
it.
2022-10-10 08:26:26 +02:00
Robin Sommer
a84d06a2c3 Suppress warning on an existing packet analyzer being remapped.
There was a check generating an internal warning if a new packet
analyzer mapping overwrote an existing one. However, replacing
an existing analyzer with a new one seems a legitimate use case (and
will be supported by Spicy soon). So removing that warning.
2022-10-10 08:25:51 +02:00
Tim Wojtulewicz
a5b2e44e57 Disable annoying bugprone-easily-swappable-parameters clang-tidy check [skip ci] 2022-10-07 16:15:47 -07:00
Tim Wojtulewicz
a7ea14ece5 Update zeekctl submodule [nomail] [skip ci] 2022-10-07 09:22:56 -07:00
zeek-bot
7b0005bf9c Update doc submodule [nomail] [skip ci] 2022-10-07 00:47:23 +00:00
Tim Wojtulewicz
541f450581 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-plugin'
* origin/topic/bbannier/bump-spicy-plugin:
  Remove stray `/` at the end of directory name.
  Remove commented out code.
  Bump spicy-plugin to v1.3.19.
2022-10-06 14:18:29 -07:00
Tim Wojtulewicz
2fce5b3a34 Merge remote-tracking branch 'origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs'
* origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs:
  Update CT log list.
2022-10-06 14:16:41 -07:00
Johanna Amann
3d9a1157f9 Update CT log list.
This uses the v3 json as a source for the first time. The test needed
some updating because Google removed a couple more logs - in the future
this should hopefully not be neccessary anymore because I think v3
should retain all logs.

In theory this might be neat in 5.1.
2022-10-06 15:10:59 +01:00
Johanna Amann
97291efec8 Merge branch 'topic/jgras/dependabot-updates' of https://github.com/J-Gras/zeek
* 'topic/jgras/dependabot-updates' of https://github.com/J-Gras/zeek:
  Bump actions/checkout from 2 to 3
  Bump actions/upload-artifact from 2 to 3
  Bump dawidd6/action-send-mail from 3.6.1 to 3.7.0
  Bump actions/setup-python from 2 to 4
  Bump docker/login-action from 1 to 2
2022-10-06 13:56:29 +01:00
Johanna Amann
41680bc209 Update submodule pointer
[nomail]
2022-10-06 12:06:34 +01:00
Jan Grashoefer
2a749a246e Merge remote-tracking branch 'github/dependabot/github_actions/dawidd6/action-send-mail-3.7.0' into topic/jgras/dependabot-updates 2022-10-06 13:00:30 +02:00
Jan Grashoefer
8eccde799f Merge remote-tracking branch 'github/dependabot/github_actions/actions/checkout-3' into topic/jgras/dependabot-updates 2022-10-06 12:59:43 +02:00
Jan Grashoefer
a889f71029 Merge remote-tracking branch 'github/dependabot/github_actions/actions/setup-python-4' into topic/jgras/dependabot-updates 2022-10-06 12:57:28 +02:00
Jan Grashoefer
84deef91d5 Merge remote-tracking branch 'github/dependabot/github_actions/actions/upload-artifact-3' into topic/jgras/dependabot-updates 2022-10-06 12:57:09 +02:00
Jan Grashoefer
93cb7b648e Merge remote-tracking branch 'github/dependabot/github_actions/docker/login-action-2' into topic/jgras/dependabot-updates 2022-10-06 12:56:18 +02:00
zeek-bot
f920f06c59 Update doc submodule [nomail] [skip ci] 2022-10-06 00:44:28 +00:00
Robin Sommer
6fcbb55ccd Merge remote-tracking branch 'origin/topic/awelzel/analyzer-module-enable-disable-file-analyzer'
* origin/topic/awelzel/analyzer-module-enable-disable-file-analyzer:
  analyzer: Add file_analyzer support to enable_analyzer()/disable_analyzer()
2022-10-05 13:27:23 +02:00
dependabot[bot]
f1778da5f4
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 09:40:28 +00:00
dependabot[bot]
98a1c5df5b
Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 09:40:25 +00:00
Benjamin Bannier
ace80793a8 Remove stray / at the end of directory name.
This variable is used to construct a path where the trailing `/` lead to
full paths like `/foo/spicy-plugin//spicyz`.
2022-10-04 11:03:24 +02:00
Benjamin Bannier
30ee2d703f Remove commented out code. 2022-10-04 11:02:10 +02:00
Benjamin Bannier
2144cef77c Bump spicy-plugin to v1.3.19. 2022-10-04 10:47:50 +02:00
zeek-bot
b0b928b305 Update doc submodule [nomail] [skip ci] 2022-10-04 00:45:59 +00:00
Tim Wojtulewicz
b68d33a317 Merge remote-tracking branch 'origin/topic/timw/update-broker'
* origin/topic/timw/update-broker:
  Update broker submodule [nomail]
2022-10-03 12:14:22 -07:00
Tim Wojtulewicz
bf98c1e9c8 Merge remote-tracking branch 'origin/topic/vern/CPP-global-init'
* origin/topic/vern/CPP-global-init:
  updates to -O C++ user and maintenance documentation
  use dynamic rather than static initialization of globals for scripts compiled to C++
  safety checking for initializing scripts compiled to C++
  fixes for initializing scripts compiled to C++
  restructured tracking of initializations of globals for script compilation
2022-10-03 09:45:19 -07:00
Tim Wojtulewicz
37d4a28816 Merge remote-tracking branch 'origin/topic/awelzel/http-no-current-entity'
* origin/topic/awelzel/http-no-current-entity:
  http: Prevent script errors when http$current_entity is not set
2022-10-03 09:44:46 -07:00
Tim Wojtulewicz
32d922a576 Update broker submodule [nomail] 2022-10-03 09:34:22 -07:00