Commit graph

2933 commits

Author SHA1 Message Date
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
Arne Welzel
c1edf2e276 Merge remote-tracking branch 'origin/topic/awelzel/pre-commit-autoupdate'
* origin/topic/awelzel/pre-commit-autoupdate:
  pre-commit: autoupdate
2023-08-29 09:39:20 +02:00
Arne Welzel
d81cb9d10e Merge remote-tracking branch 'origin/topic/awelzel/ditch-file-krb-include'
* origin/topic/awelzel/ditch-file-krb-include:
  cmake: Bump submodule for removal of NEED_KRB5_H
  zeek-config.h: Drop NEED_KRB5_H
  File: Drop krb5.h include
2023-08-28 20:08:01 +02:00
Tim Wojtulewicz
9c15a2f6a6 Merge remote-tracking branch 'origin/topic/vern/trigger-constructor'
* origin/topic/vern/trigger-constructor:
  change Trigger constructor to not potentially auto-delete itself
2023-08-28 10:54:06 -07:00
Arne Welzel
8c2a9ec5f5 Update doc, cmake submodules for installing .spicy files 2023-08-28 12:57:21 +02:00
Arne Welzel
a84d6cd66c Merge branch 'topic/awelzel/3235-dont-flip-broadcasts'
* topic/awelzel/3235-dont-flip-broadcasts:
  testing: Bump external test suite
  dhcp: Handle is_orig=T for connections from server to 255.255.255.255
  IPBasedAnalyzer: Don't flip connections when destination is broadcast
2023-08-28 12:20:18 +02:00
Arne Welzel
de65671a0a Merge remote-tracking branch 'origin/topic/vern/GH-3191'
* origin/topic/vern/GH-3191:
  BTests for any/vector-of-any fixes
  fixes for vector assignments involving "any"/"vector of any" types
2023-08-25 21:43:03 +02:00
Tim Wojtulewicz
ae03d591b8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Aug23'
* origin/topic/vern/script-opt-maint.Aug23:
  updated notes regarding "-O gen-C++" maintenance
  "-O gen-C++" support for "assert" statements
  addressed some nits re "-O gen-C++" script optimization
  fixes for compiling lambdas to C++
  fixes to avoid ambiguities in analyzing captures for script optimization
  disambiguate lambdas by adding scoping and consideration of captures
  addressed performance and correctness issues flagged by Coverity
2023-08-24 12:17:55 -07:00
Arne Welzel
9bbc3a55d4 Merge remote-tracking branch 'origin/topic/awelzel/serial-ppp-0x9'
* origin/topic/awelzel/serial-ppp-0x9:
  PPP: Add PPP analyzer to handle LINKTYPE_PPP (0x9)
2023-08-24 13:49:33 +02:00
Tim Wojtulewicz
39478ebc78 Merge remote-tracking branch 'origin/topic/timw/python37-builds'
* origin/topic/timw/python37-builds:
  CI: Force alpine image to rebuild
  CI: Install python3.8 on older distros
  CI: Remove Ubuntu 18 build (EOL)
2023-08-23 13:05:14 -07:00
Johanna Amann
70c76977cf Merge remote-tracking branch 'origin/topic/johanna/gh-3242'
* origin/topic/johanna/gh-3242:
  Community-id: load main script in notice script, fix notice script
2023-08-23 12:46:21 +01:00
Robin Sommer
e8292be0ce
Merge remote-tracking branch 'origin/topic/robin/spicy-export-extensions'
* origin/topic/robin/spicy-export-extensions:
  [Spicy] Clean up representation of EVT record fields.
  [Spicy] Extend functionality of `export` in EVT files.
  [Spicy] Refactor parsing of `export` in EVT files.
2023-08-22 15:04:05 +02:00
Johanna Amann
0b8b81f426 Merge remote-tracking branch 'origin/topic/johanna/posix_spawn'
* origin/topic/johanna/posix_spawn:
  Raw reader: better error handling for posix_spawn
  Raw reader: use posix_spawn instead of fork + exec
2023-08-15 17:34:25 +01:00
Tim Wojtulewicz
5637643798 Merge remote-tracking branch 'origin/topic/timw/pre-commit-python-version'
* origin/topic/timw/pre-commit-python-version:
  Force pre-commit to use python 3.9
2023-08-15 09:20:09 -07:00
Tim Wojtulewicz
9357a5879b Merge remote-tracking branch 'origin/topic/timw/update-zeek-aux'
* origin/topic/timw/update-zeek-aux:
  CI: update freebsd to 13.2 and 12.4
  Update zeek-aux submodule [nomail]
2023-08-14 11:18:28 -07:00
Tim Wojtulewicz
e8ef169b27 Merge remote-tracking branch 'origin/topic/timw/3059-set-vector-conversion'
* origin/topic/timw/3059-set-vector-conversion:
  Fix conversion with record types
  Add conversion between set and vector using 'as' keyword
  Add std::move for a couple of variables passed by value
2023-08-11 10:35:06 -07:00
Tim Wojtulewicz
7137a267ad Merge remote-tracking branch 'origin/topic/timw/modbus-overflow'
* origin/topic/timw/modbus-overflow:
  Modbus: Add early return in case of data being too short to parse
2023-08-11 09:52:38 -07:00
Tim Wojtulewicz
4022573d48 Merge remote-tracking branch 'origin/topic/bbannier/issue-3177'
* origin/topic/bbannier/issue-3177:
  Explicitly link Zeek executable against Spicy libraries in binary packaging mode.
2023-08-09 09:08:47 -07:00
Tim Wojtulewicz
16a69864b4 Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'
* origin/topic/timw/3184-modbus-extensions:
  Pass parsed file record information with ReadFile/WriteFile events
  Add length field from header to ModbusHeaders record type
  Modbus: Add support for Encapsulation Interface Transport (FC=2B) requests and responses
  Modbus: Add support for Diagnostics (FC=8) requests and responses
2023-08-08 10:55:25 -07:00
Tim Wojtulewicz
e3a34e44b5 Revert "Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'"
This reverts commit 30b2afe2ad, reversing
changes made to bacc0dcae3.
2023-08-08 10:54:33 -07:00
Tim Wojtulewicz
30b2afe2ad Merge remote-tracking branch 'origin/topic/timw/3184-modbus-extensions'
* origin/topic/timw/3184-modbus-extensions:
  Pass parsed file record information with ReadFile/WriteFile events
  Add length field from header to ModbusHeaders record type
  Modbus: Add support for Encapsulation Interface Transport (FC=2B) requests and responses
  Modbus: Add support for Diagnostics (FC=8) requests and responses
2023-08-07 14:34:43 -07:00