Commit graph

16116 commits

Author SHA1 Message Date
Tim Wojtulewicz
de77b034c2 Merge remote-tracking branch 'origin/topic/timw/opensuse-ci-fixes'
* origin/topic/timw/opensuse-ci-fixes:
  CI: Install missing packages on opensuse
2023-11-17 09:24:44 -07:00
Tim Wojtulewicz
a3ad1a24f1 CI: Install missing packages on opensuse 2023-11-17 09:24:15 -07:00
Arne Welzel
37113b4de6 frameworks/software: Fix stale value used for stripping
There was some confusion around which value was used subsequent to a strip(),
but sub not respecting anchors make it appear to work. Also seems that the
`\(?` part seems redundant.
2023-11-17 14:37:28 +01:00
Arne Welzel
e339e93e69 strings.bif/sub,gsub: Respect anchors in pattern
Anchors within pattern passed to sub() or gsub() were previously ignored,
replacing any occurrence of '<text>' even when '^<text>' was used as a
pattern.

This is a pretty user-visible change (and we even have anchored patterns
within the base scripts), but seems "the right thing to do".

Relates to #3455
2023-11-17 14:37:25 +01:00
Arne Welzel
d9b8154c4e Merge remote-tracking branch 'origin/topic/awelzel/3455-do-split-string-2'
* origin/topic/awelzel/3455-do-split-string-2:
  strings.bif/do_split_string: Pass bol and eol to MatchPrefix()
  RE_Matcher: Add MatchPrefix with bol/eol control
2023-11-17 13:01:47 +01:00
Vern Paxson
fc2796a5a4 BTest updates to accommodate event handler coalescence differences 2023-11-16 13:04:35 -08:00
Vern Paxson
39e1f71ebf BTests for testing that event handler coalescence operates as expected 2023-11-16 13:03:40 -08:00
Vern Paxson
3d21d80dac coalescing of event handlers (ZAM optimization) 2023-11-16 12:58:28 -08:00
Arne Welzel
98d9089a8f strings.bif/do_split_string: Pass bol and eol to MatchPrefix()
This allows better control of BOL and EOL. MatchPrefix() / LongestMatch()
always start with BOL.

Closes #3455
2023-11-16 08:36:08 +01:00
Arne Welzel
a3bd3e4c50 RE_Matcher: Add MatchPrefix with bol/eol control 2023-11-16 08:25:57 +01:00
zeek-bot
4751f6f31e Update doc submodule [nomail] [skip ci] 2023-11-15 00:10:11 +00:00
Arne Welzel
abc32b3b46 Merge remote-tracking branch 'origin/topic/neverlord/coverity-1523915'
* origin/topic/neverlord/coverity-1523915:
  Bind scan_path to the scope; avoid heap allocation
2023-11-11 17:46:04 +01:00
Dominik Charousset
e7aa87f35c Bind scan_path to the scope; avoid heap allocation 2023-11-11 16:39:22 +01:00
zeek-bot
eac76c015e Update doc submodule [nomail] [skip ci] 2023-11-11 00:22:32 +00:00
Arne Welzel
a488dcffb6 Merge remote-tracking branch 'origin/topic/vern/script-opt.Nov23'
* origin/topic/vern/script-opt.Nov23:
  retention of superseded AST elements to prevent pointer mis-aliasing
  BTest updates for latest ZAM maintenance
  greater ZAM optimization of inlined function calls
  some minor ZAM optimization improvements
  added "-O noinline" option to turn off ZAM inlining, to help with diagnosing optimization problems
  fixes for a number of ZAM optimization bugs
  allow explicitly marking an identifier as equivalent to special '_' identifier
  fixed some warnings about mixing signed & unsigned integers
  descriptions of "for" statements now include their "value variable" if present
2023-11-10 12:43:08 +01:00
Vern Paxson
4ec9a23ce6 retention of superseded AST elements to prevent pointer mis-aliasing 2023-11-10 11:06:16 +01:00
Vern Paxson
280acc51bf BTest updates for latest ZAM maintenance 2023-11-10 09:57:35 +01:00
Vern Paxson
b489cfc508 greater ZAM optimization of inlined function calls 2023-11-10 09:57:35 +01:00
Vern Paxson
e3b75ac391 some minor ZAM optimization improvements 2023-11-10 09:57:35 +01:00
Vern Paxson
fadda05782 added "-O noinline" option to turn off ZAM inlining, to help with diagnosing optimization problems 2023-11-10 09:57:35 +01:00
Vern Paxson
1dc74eaa9c fixes for a number of ZAM optimization bugs 2023-11-10 09:56:59 +01:00
Vern Paxson
9bfe18473d allow explicitly marking an identifier as equivalent to special '_' identifier 2023-11-10 09:56:59 +01:00
Vern Paxson
c49918ba8b fixed some warnings about mixing signed & unsigned integers 2023-11-10 09:56:59 +01:00
Vern Paxson
23c08a05de descriptions of "for" statements now include their "value variable" if present 2023-11-10 09:56:51 +01:00
zeek-bot
9356330bce Update doc submodule [nomail] [skip ci] 2023-11-10 00:26:02 +00:00
Robin Sommer
2498f7dbe9
Merge remote-tracking branch 'origin/topic/robin/gh-3443-skip'
* origin/topic/robin/gh-3443-skip:
  Spicy: Provide `zeek::skip_input()` to disable deliver to current analyzer.
2023-11-09 17:22:48 +01:00
Robin Sommer
f5aa5c3466
Spicy: Provide zeek::skip_input() to disable deliver to current analyzer.
```
## Tells Zeek to skip sending any further input data to the current analyzer.
## This is supported for protocol and file analyzers.
public function skip_input() : void;
```

Closes #3443.
2023-11-09 10:43:49 +01:00
Arne Welzel
a7e1841be1 Merge remote-tracking branch 'origin/topic/awelzel/btest-test-dirs-add-opt-and-misc'
* origin/topic/awelzel/btest-test-dirs-add-opt-and-misc:
  btest/opt: Update pure-inlining baseline
  btest/opt: Update basic baseline
  Expr: Fix alloc-dealloc-mismatch
  btest: Move zam/basic.test into opt/basic.test, update TestDirs
2023-11-09 10:42:49 +01:00
Arne Welzel
3174999445 btest/opt: Update pure-inlining baseline
I suspect this as just stale due to not being executed regularly.
2023-11-08 16:23:22 +01:00
Arne Welzel
e7f010d14e btest/opt: Update basic baseline 2023-11-08 15:54:55 +01:00
Arne Welzel
273fb9b79e Expr: Fix alloc-dealloc-mismatch
I *thought* Vern had fixed this up, but maybe that was another
occurrence.
2023-11-08 15:52:58 +01:00
Arne Welzel
60e997a3fd btest: Move zam/basic.test into opt/basic.test, update TestDirs
It seems "opt" can and should run unconditionally. The "misc" dir was
definitely an oversight.
2023-11-08 15:46:54 +01:00
Arne Welzel
de5fa1087a Add deprecations to NEWS [nomail] [skipci] 2023-11-08 11:27:53 +01:00
zeek-bot
9b1f3b5838 Update doc submodule [nomail] [skip ci] 2023-11-08 00:36:48 +00:00
Arne Welzel
cef0210799 Merge remote-tracking branch 'origin/topic/awelzel/deprecate-things-for-7.1'
* origin/topic/awelzel/deprecate-things-for-7.1:
  Bump zeekctl
  EventHandler: Deprecate SetUsed() and Used() as well.
  EventRegistry: Deprecate UsedHandlers() and UnusedHandlers()
  time machine: Mark leftovers for removal in v7.1
  policy/misc/load-balancing: Deprecate script
  cluster: Deprecate the Cluster::Node$interface field
2023-11-07 19:42:56 +01:00
Arne Welzel
1fd5814c7f Bump zeekctl 2023-11-07 16:06:35 +01:00
Arne Welzel
ff34a4aa7f EventHandler: Deprecate SetUsed() and Used() as well.
Seems the latter isn't used outside of the functions that were deprecated
in the previous commit and with UsageAnalyzer not making use of this
information unclear why we should keep it around.

Relates to #3187.
2023-11-07 16:06:35 +01:00
Arne Welzel
398122206e EventRegistry: Deprecate UsedHandlers() and UnusedHandlers()
and check_for_unused_event_handlers: UsageAnalyzer is more thorough
and the previous ones weren't extended to work with &is_used and
should probably be considered superseded by the UsageAnalyzer even
if that currently does not provide a public API and just prints
out deprecation warnings.

I'm also tempted to deprecate SetUsed() and Used() of EventHandler
for the same reason.

Closes #3187.
2023-11-07 16:06:17 +01:00
Arne Welzel
cd24acdfc8 time machine: Mark leftovers for removal in v7.1
I suspect we could just drop these directly, but lets follow the
deprecation cycle.
2023-11-07 16:06:16 +01:00
Arne Welzel
384453346d policy/misc/load-balancing: Deprecate script 2023-11-07 16:06:16 +01:00
Arne Welzel
d88b147ac9 cluster: Deprecate the Cluster::Node$interface field
This field isn't required by a worker and it's certainly not used by a
worker to listen on that specific interface. It also isn't required to
be set consistently and its use in-tree limited to the old load-balancing
script.

There's a bif called packet_source() which on a worker will provide
information about the actually used packet source.

Relates to zeek/zeek#2877.
2023-11-07 16:06:16 +01:00
Arne Welzel
46b7e9d7be Merge remote-tracking branch 'origin/topic/timw/update-bifcl-binpac'
* origin/topic/timw/update-bifcl-binpac:
  Update binpac and bifcl submodules [nomail]
2023-11-07 10:03:43 +01:00
Arne Welzel
7dca9d6836 Merge remote-tracking branch 'origin/topic/timw/macos-sonoma-build'
* origin/topic/timw/macos-sonoma-build:
  CI: Use other base64 options on macOS Sonoma too
  CI: Add macOS Sonoma build, remove macOS Monterey build
2023-11-07 10:01:50 +01:00
Arne Welzel
8a13155a41 Merge branch 'topic/xb-anssi/http_signature_body_end_match' of https://github.com/xb-anssi/zeek
* 'topic/xb-anssi/http_signature_body_end_match' of https://github.com/xb-anssi/zeek:
  Let signature framework match HTTP body end
  Test how the signature framework matches HTTP body
2023-11-07 09:58:59 +01:00
Arne Welzel
768153452a Merge remote-tracking branch 'origin/topic/neverlord/copy-string'
* origin/topic/neverlord/copy-string:
  Fix unsafe and inefficient uses of copy_string
2023-11-07 09:57:12 +01:00
Tim Wojtulewicz
90d188b63f Update binpac and bifcl submodules [nomail] 2023-11-06 13:42:22 -07:00
Tim Wojtulewicz
b1e63ffd26 CI: Use other base64 options on macOS Sonoma too 2023-11-06 11:29:44 -07:00
Tim Wojtulewicz
35ca1e88c7 CI: Add macOS Sonoma build, remove macOS Monterey build 2023-11-06 11:09:44 -07:00
Tim Wojtulewicz
f2608680ce Merge remote-tracking branch 'origin/topic/timw/update-c-ares'
* origin/topic/timw/update-c-ares:
  Update c-ares in Windows conanfile
  Upgrade c-ares submodule to 1.21.0
2023-11-06 09:30:01 -07:00
zeek-bot
9f7a390adc Update doc submodule [nomail] [skip ci] 2023-11-04 00:19:31 +00:00