Commit graph

3053 commits

Author SHA1 Message Date
Arne Welzel
007bcefd09 Merge remote-tracking branch 'origin/topic/awelzel/2326-import-quic'
* origin/topic/awelzel/2326-import-quic:
  ci/btest: Remove spicy-quic helper, disable Spicy on CentOS 7
  btest/core/ppp: Run test in bare mode
  btest/quic: Update other tests
  testing/quic: Fixups and simplification after Zeek integration
  quic: Integrate as default analyzer
  quic: Include Copyright lines to the analyzer's source code contributed by Fox-IT
  quic: Squashed follow-ups: quic.log, tests, various fixes, performance
  quic: Initial implementation
2023-10-11 18:05:14 +02:00
Arne Welzel
01bf1d4764 Merge remote-tracking branch 'origin/topic/awelzel/update-zeekygen-docs-show-stderr'
* origin/topic/awelzel/update-zeekygen-docs-show-stderr:
  ci/update-zeekygen-docs.sh: Do output stderr by default
  zeekygen: Disable zeek_init() handlers causing error output
  zeekygen/example: Squelch unused function warning
2023-10-11 15:21:31 +02:00
Arne Welzel
ffc35d90ba Merge remote-tracking branch 'origin/topic/awelzel/ldap-follow-up'
* origin/topic/awelzel/ldap-follow-up:
  protocol/ldap: Add doc-id/doc-description to .evt file
  spicy/manager: Ensure Zeekygen knows identifier for registered types
2023-10-11 14:09:32 +02:00
Arne Welzel
72df1a0216 Merge remote-tracking branch 'origin/topic/bbannier/issue-3234'
* origin/topic/bbannier/issue-3234:
  Introduce dedicated `LDAP::Info`
  Remove redundant storing of protocol in LDAP logs
  Use LDAP `RemovalHook` instead of implementing `connection_state_remove`
  Tidy up LDAP code by using local references
  Pluralize container names in LDAP types
  Move LDAP script constants to their own file
  Name `LDAP::Message` and `LDAP::Search` `*Info`
  Make ports for LDAP analyzers fully configurable
  Require have-spicy for tests which log spicy-ldap information
  Fix LDAP analyzer setup for when Spicy analyzers are disabled
  Bump zeek-testing-private
  Integrate spicy-ldap test suite
  Move spicy-ldap into Zeek protocol analyzer tree
  Explicitly use all of spicy-ldap's modules
  Explicitly list `asn1.spicy` as spicy-ldap source
  Remove uses of `zeek` module in spicy-ldap
  Fix typos in spicy-ldap
  Remove project configuration files in spicy-ldap
  Integrate spicy-ldap into build
  Import zeek/spicy-ldap@57b5eff988
2023-10-10 20:07:03 +02:00
Arne Welzel
48b27f30c9 Merge remote-tracking branch 'origin/topic/awelzel/plugin-hooks-bare-mode'
* origin/topic/awelzel/plugin-hooks-bare-mode:
  btest/plugins/hooks: Run in bare mode
2023-10-09 16:27:10 +02:00
Arne Welzel
4a8f868471 Merge remote-tracking branch 'origin/topic/awelzel/dump-events-in-bare-mode'
* origin/topic/awelzel/dump-events-in-bare-mode:
  btest/coverage: Add record-fields test
  btest/dump-events: Run in bare mode, load conn and smtp scripts only
2023-10-09 14:15:49 +02:00
Benjamin Bannier
8793cde485 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 2023-10-06 16:09:05 +02:00
Christian Kreibich
26897bf906 Merge branch 'topic/christian/normalize-file-paths'
* topic/christian/normalize-file-paths:
  Btest for normalized reporter path reporting
  Normalize file paths in find_file_in_path()
2023-10-04 22:46:54 -07:00
Arne Welzel
0630bdbbd5 Merge remote-tracking branch 'origin/topic/awelzel/3314-lambda-redefinition-segfault'
* origin/topic/awelzel/3314-lambda-redefinition-segfault:
  Var/Func: Render function parameters using comma, not semicolon
  Var: Fix null-pointer deref on redefinition of lambdas
2023-10-04 20:16:29 +02:00
Tim Wojtulewicz
ff1d07b548 Merge remote-tracking branch 'origin/topic/awelzel/3330-get-current-packet-docs'
* origin/topic/awelzel/3330-get-current-packet-docs:
  get_current_packet: Add note/warning to docs
2023-10-02 11:51:07 -07:00
Tim Wojtulewicz
21024c22e0 Merge remote-tracking branch 'origin/topic/awelzel/3316-exit-earlier-on-errors'
* origin/topic/awelzel/3316-exit-earlier-on-errors:
  zeek-setup: Early exit when parsing failed
2023-10-02 11:44:32 -07:00
Tim Wojtulewicz
9dcf1b4cd1 Merge remote-tracking branch 'origin/topic/awelzel/3342-fix-broker-composite-key-tables-deletion'
* origin/topic/awelzel/3342-fix-broker-composite-key-tables-deletion:
  broker/Manager: Fix deletion of composite keys
  Add btest for brokerstore delete with complex index.
2023-10-02 11:43:19 -07:00
Tim Wojtulewicz
bf103738a1 Merge remote-tracking branch 'origin/topic/vern/CPP-Oct23-maint'
* origin/topic/vern/CPP-Oct23-maint:
  minor updates to -O gen-C++ maintenance notes and scripts
  ZAM fix for inlining bug when a local is assigned to a function parameter
  ZAM fixes for record creation and table indexing potentially having side-effects
  removed order-of-evaluation ambiguity from new BTest
  introduce internal "mask" expression node to avoid mixed-type overloading of "/"
  fix bug in failing to concretize empty vectors
  ZAM BTest update to match recent change to one of the tests
  fixed ZAM reduction bug in += / -= operators
2023-10-02 11:09:26 -07:00
Tim Wojtulewicz
3df30be833 Merge remote-tracking branch 'origin/topic/awelzel/generate-docs-increase-ccache-size'
* origin/topic/awelzel/generate-docs-increase-ccache-size:
  generate-docs: Bump ccache from 500M to 2000M
2023-10-02 10:13:13 -07:00
Tim Wojtulewicz
3bdc709829 Merge remote-tracking branch 'origin/topic/bbannier/hilti-cxx-compiler-launcher'
* origin/topic/bbannier/hilti-cxx-compiler-launcher:
  Enable ccache-backed Spicy JIT for users of developer scripts.
2023-10-02 10:10:36 -07:00
Tim Wojtulewicz
0424eefd96 Merge remote-tracking branch 'origin/topic/awelzel/3309-dns-mgr-revents-ouch'
* origin/topic/awelzel/3309-dns-mgr-revents-ouch:
  DNS_Mgr: Fix | vs & for pollfd.revents
2023-10-02 10:09:02 -07:00
Benjamin Bannier
eb18530d52 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-master' 2023-10-02 14:39:21 +02:00
Arne Welzel
409f40270f Merge remote-tracking branch 'origin/topic/awelzel/ubuntu22-on-benchmark-nightly'
* origin/topic/awelzel/ubuntu22-on-benchmark-nightly:
  cirrus/ci: Run ubuntu22_task on benchmark-nightly, too
2023-09-28 20:29:56 +02:00
Benjamin Bannier
2833eee3c8 Merge branch 'topic/bbannier/spicy-bitfield-visitation' 2023-09-28 10:01:11 +02:00
Arne Welzel
5c1df2b706 Merge remote-tracking branch 'origin/topic/awelzel/ubuntu22-spicy-task'
* origin/topic/awelzel/ubuntu22-spicy-task:
  cirrus/ci: Add ubuntu22_spicy_task and ubuntu22_spicy_head_task
  cirrus/ci: Add pre_build_script mechanism
2023-09-27 16:53:29 +02:00
Arne Welzel
c6486e70ef Merge remote-tracking branch 'origin/topic/awelzel/3309-dns-mgr-fd-set-size-1024'
* origin/topic/awelzel/3309-dns-mgr-fd-set-size-1024:
  auxil/libunistd: Bump for poll() inclusion
  DNS_Mgr: Replace ares_fds() with ares_getsock()
2023-09-26 18:42:37 +02:00
Arne Welzel
a11961dffe Merge remote-tracking branch 'origin/topic/bbannier/btest-issue-98'
* origin/topic/bbannier/btest-issue-98:
  Use unique port for test `scripts.base.utils.active-http`
  Do not automatically load Spicy modules in dot paths.
  Exclude dot directories when searching ZEEK_PLUGIN_PATH
2023-09-26 16:24:15 +02:00
Arne Welzel
599037d215 Merge remote-tracking branch 'origin/topic/awelzel/embed-record-val'
* origin/topic/awelzel/embed-record-val:
  VectorVal: Embed vector_val
  RecordVal: Embed record_val
2023-09-26 11:07:33 +02:00
Benjamin Bannier
03597d210d Merge branch 'origin/topic/bbannier/spicy-reject_protocol-during-teardown' 2023-09-25 14:59:40 +02:00
Arne Welzel
9fedab9845 ci/benchmark: Also send CIRRUS_TASK_NAME to benchmarker API
We otherwise cannot distinguish between different benchmarking jobs when
we introduce them (think ubuntu22_jemalloc or ubuntu22_spicy).
2023-09-25 13:50:50 +02:00
Tim Wojtulewicz
5ff24dad23 Merge remote-tracking branch 'origin/topic/timw/disable-tsan-ci-task'
* origin/topic/timw/disable-tsan-ci-task:
  CI: Disable tsan task until it can be fixed
2023-09-22 14:38:38 -07:00
Benjamin Bannier
0c1a8f8fc4 Bump spicy [nomail] 2023-09-22 15:12:17 +02:00
Arne Welzel
193ad0d87b Merge remote-tracking branch 'origin/topic/bbannier/format-spicy_add_analyzer'
* origin/topic/bbannier/format-spicy_add_analyzer:
  Fix formatting of `spicy_add_analyzer`
2023-09-22 12:13:39 +02:00
Robin Sommer
b5aecece68
Merge remote-tracking branch 'origin/topic/gh-196-spicy-docs'
* origin/topic/gh-196-spicy-docs:
  Add check to docs CI whether Spicy docs are up to date.
  Bump zeek-docs.
  Enable Spicy when generating docs.
  Zeekygen: Merge in Spicy analyzer documentation.
  Zeekygen: Refine location tracking for Spicy events.
  Zeekygen: Refactor code documenting analyzers.
  Add `%doc-*` tags to Syslog and Finger analyzers.
  Spicy: Support additional documentation tags inside EVT files.
  Fix lack of namespace qualification inside an include file.
  Exclude script from documentation that interferes with other locations.
2023-09-21 10:56:14 +02:00
Robin Sommer
a9de8eec21
Merge remote-tracking branch 'origin/topic/robin/gh-3298-bitfields'
* origin/topic/robin/gh-3298-bitfields:
  Spicy: Fix support for exporting bitfields.
  Bump Spicy.
2023-09-21 09:56:51 +02:00
Benjamin Bannier
0b940d8b3c Merge branch 'topic/bbannier/spicyz-export-with-debug-output' 2023-09-20 13:05:04 +02:00
Arne Welzel
4a7f03ee0c Merge remote-tracking branch 'origin/topic/awelzel/ci-benchmark-more-parameters'
* origin/topic/awelzel/ci-benchmark-more-parameters:
  ci/benchmark: Send more Cirrus, GitHub and Zeek version information
2023-09-19 19:56:54 +02:00
Tim Wojtulewicz
e6ffa41aad Merge remote-tracking branch 'origin/topic/timw/telemetry-includes'
* origin/topic/timw/telemetry-includes:
  Remove some unnecessary includes of telemetry headers
2023-09-18 10:46:44 -07:00
Arne Welzel
2c4f64bc15 Merge remote-tracking branch 'origin/topic/awelzel/zeekjs-0-9-5'
* origin/topic/awelzel/zeekjs-0-9-5:
  Update zeekjs submodule
2023-09-15 12:11:32 +02:00
Tim Wojtulewicz
8c559915f7 Merge remote-tracking branch 'origin/topic/timw/fix-master-tests'
* origin/topic/timw/fix-master-tests:
  Update dump-events test baseline after latest master changes
2023-09-12 17:00:39 -07:00
Arne Welzel
cca5a8ca5d Merge remote-tracking branch 'origin/topic/awelzel/deferred-default-non-const-v4'
* origin/topic/awelzel/deferred-default-non-const-v4:
  CreationInitsOptimizer: Use PreTypedef() instead of PreType()
  Fix deferred record initialization
  testing/btest: Un-deferred record initalization tests
2023-09-12 20:52:17 +02:00
Tim Wojtulewicz
b783441428 Merge branch 'topic/timw/file-analyzer-dict-hash'
* topic/timw/file-analyzer-dict-hash:
  Move allocation of analyzer_hash to file_mgr
2023-09-11 10:16:05 -07:00
Arne Welzel
f4322f9584 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Sep23'
* origin/topic/vern/script-opt-maint.Sep23:
  fix for ZAM statement-level profiling (broken by GH-3199)
  ZAM fixes for compatibility with GH-3249 changes
  -O gen-C++ fixes for compatibility with GH-3249 changes minor -O gen-C++ BTest updates
  minor BTest reordering to diminish differences with script optimization
2023-09-08 16:47:29 +02:00
Arne Welzel
02184625b0 Merge remote-tracking branch 'origin/topic/awelzel/3267-avoid-unnecessary-inits'
* origin/topic/awelzel/3267-avoid-unnecessary-inits:
  ID/Stmt: Introduce INIT_SKIP and use in ForStmt
  CompositeHash: Skip record initialization when recovering vals
2023-09-08 13:48:47 +02:00
Arne Welzel
057bc673a8 Merge remote-tracking branch 'origin/topic/bbannier/issue-3276'
* origin/topic/bbannier/issue-3276:
  Propagate failure reason in `spicy::decline_input`/`zeek::reject_protocol`.
2023-09-07 16:18:20 +02:00
Arne Welzel
2fd83acc49 Merge remote-tracking branch 'origin/topic/awelzel/3275-fix-with-python'
* origin/topic/awelzel/3275-fix-with-python:
  ci: update-alternative to have python3 be python3.9
  Add OpenSUSE Leap 15.5 to ci
  configure/CMakelists: Use Python_EXECUTABLE as hint for interpreter
2023-09-07 14:28:16 +02:00
Arne Welzel
6e6a2bee8a Merge remote-tracking branch 'origin/topic/awelzel/3278-spicy-fix-port-range-off-by-one'
* origin/topic/awelzel/3278-spicy-fix-port-range-off-by-one:
  spicy: Do not register port N+1 for port N in .evt file
2023-09-07 13:29:03 +02:00
Arne Welzel
1441b83411 Merge remote-tracking branch 'origin/topic/awelzel/dns-mgr-fixes'
* origin/topic/awelzel/dns-mgr-fixes:
  DNS_Mgr: Use Process() for timeout expiration
  DNS_Mgr: Fix GetNextTimeout() returning absolute values
2023-09-05 19:57:10 +02:00
Arne Welzel
7e11501d3c Merge remote-tracking branch 'origin/topic/jazoff/gh-3268t '
* origin/topic/jazoff/gh-3268:
  Fix check for emailed notices

Changes: Added a test-case printing email_delay_tokens to compare email vs
non-email notice types. Previously, both notice types would have email
delay tokens at that point in the flow.
2023-09-04 14:01:23 +02:00
Arne Welzel
14a2c02f9d Merge remote-tracking branch 'origin/topic/awelzel/1705-http-pending-requests'
* origin/topic/awelzel/1705-http-pending-requests:
  http: Prevent request/response de-synchronization and unbounded state growth
2023-09-01 11:54:10 +02:00
Arne Welzel
4b71b7d05c Merge branch 'topic/awelzel/no-telemetry-log-in-external-baselines'
* topic/awelzel/no-telemetry-log-in-external-baselines:
  testing/external: Exclude telemetry.log from baselines
2023-08-30 11:25:39 +02:00
Tim Wojtulewicz
19719b1862 Merge remote-tracking branch 'origin/topic/neverlord/gh-3247'
* origin/topic/neverlord/gh-3247:
  Forward OpenSSL include path to plugins
2023-08-29 12:14:04 -07:00
Tim Wojtulewicz
c9f4bacd73 Revert "Merge remote-tracking branch 'origin/topic/neverlord/gh-3247'"
This reverts commit 1673f1db05, reversing
changes made to 619113f674.
2023-08-29 12:13:40 -07:00
Tim Wojtulewicz
1673f1db05 Merge remote-tracking branch 'origin/topic/neverlord/gh-3247'
* origin/topic/neverlord/gh-3247:
  Forward OpenSSL include path to plugins
2023-08-29 12:07:56 -07:00
Tim Wojtulewicz
619113f674 Merge remote-tracking branch 'origin/topic/timw/remove-ubuntu-22-10'
* origin/topic/timw/remove-ubuntu-22-10:
  CI: Add ubuntu 23.04 build
  CI: Remove EOL ubuntu 22.10 build
2023-08-29 09:11:42 -07:00