Commit graph

15378 commits

Author SHA1 Message Date
Arne Welzel
cc6e012f36 ci/collect-repo-info: No hard dependency on git, take two
Collecting information about builtin external plugins also
tried to use `git` unconditionally.
2023-02-23 14:21:36 +01:00
Arne Welzel
6bf1091a03 Merge remote-tracking branch 'origin/topic/awelzel/extend-news-about-repo-info-json'
* origin/topic/awelzel/extend-news-about-repo-info-json:
  NEWS: Add paragraph about repo-info.json to Breaking Changes
2023-02-23 12:16:41 +01:00
Tim Wojtulewicz
1a1cf8576e Merge remote-tracking branch 'origin/topic/timw/btest-dash-a'
* origin/topic/timw/btest-dash-a:
  Use btest -A on CI to get more information about stuck tests
2023-02-22 17:06:02 -07:00
Tim Wojtulewicz
473e309dd6 Use btest -A on CI to get more information about stuck tests 2023-02-22 16:57:06 -07:00
Tim Wojtulewicz
d83af286bb Include stdint.h early in flex files to prevent redefinition of int type macros 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
b459b6212f Update bifcl submodule [nomail] 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
84db1f7973 Update binpac submodule [nomail] 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
f92ca9e537 SMB: clarify a confusing line in one of the pac files 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
7ca4d36942 module_util: Change streq helper method to just return bool 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
184baf118d NTLM analyzer: Don't bother checking boolean values for > 0 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
d239f355fd FTP analyzer: Remove unnecessary lines from constructor 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
7e66261fd9 IP_Hdr: take length value as uint64_t instead of int 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
8e078299eb EventTrace: take size_t as a constructor argument instead of int 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
718cced7cd Change argument to Tempvar constructor to size_t, avoids conversion warning in template construction 2023-02-22 16:39:54 -07:00
Tim Wojtulewicz
6398329cd5 Merge remote-tracking branch 'origin/topic/timw/freebsd-ci-pip'
* origin/topic/timw/freebsd-ci-pip:
  Use ensurepip to install pip on FreeBSD
2023-02-22 15:53:17 -07:00
Tim Wojtulewicz
d4867d8ac0 Merge remote-tracking branch 'origin/topic/timw/update-benchmarker-host-name'
* origin/topic/timw/update-benchmarker-host-name:
  Update benchmarker Cirrus secrets to use org-level values
2023-02-22 14:26:35 -07:00
Tim Wojtulewicz
08ea09d69d Update benchmarker Cirrus secrets to use org-level values 2023-02-22 14:11:39 -07:00
Tim Wojtulewicz
5db8acdf36 Use ensurepip to install pip on FreeBSD
The py39-pip package is sometimes not available on FreeBSD, and using
ensurepip is the recommended way to install pip according to the pip
documentation. ensurepip should be available in every python
installation.
2023-02-22 13:27:20 -07:00
Arne Welzel
6ee5c6e9cc Merge branch 'topic/awelzel/collect-repo-info-softer-git-dependency'
* topic/awelzel/collect-repo-info-softer-git-dependency:
  ci/collect-repo-info: No hard dependency on git
2023-02-22 19:30:07 +01:00
Arne Welzel
352da9adc4 NEWS: Add paragraph about repo-info.json to Breaking Changes
This came up for OBS and following discussions in Slack indicate that
custom source tarballs might not be too uncommon.
2023-02-22 19:20:18 +01:00
Arne Welzel
f3253554d1 ci/collect-repo-info: No hard dependency on git
The OBS builds run in an environment where no git is installed and
release tarballs assembled manually.

Drop the hard-requirement on git from ci/collect-repo-info.json.
2023-02-22 18:12:32 +01:00
Arne Welzel
dfdcfd9647 Merge remote-tracking branch 'origin/topic/awelzel/2776-zeek-config-version-cache-busting'
* origin/topic/awelzel/2776-zeek-config-version-cache-busting:
  Bump zeek-af_packet-plugin
  zeek-config: Move ZEEK_VERSION* out of zeek-config.h
2023-02-22 16:49:49 +01:00
Arne Welzel
4d540a11a9 Bump zeek-af_packet-plugin 2023-02-22 16:49:16 +01:00
Arne Welzel
d23b1331e5 zeek-config: Move ZEEK_VERSION* out of zeek-config.h
When bumping the VERSION file, everything that includes the auto-generated
zeek/zeek-config.h needs to rebuild and ccache usage is voided due the file
changing. Split the mutable version information into a new zeek-version.h
file to avoid this.

Further, do not include zeek-version.h within Plugin.h and avoid the reference
to ZEEK_VERSION_FUNCTION unless we're building an external plugin.

Closes #2776.
2023-02-22 16:48:39 +01:00
Robin Sommer
ebc9563243
Merge remote-tracking branch 'origin/topic/robin/gh-123-symlink'
* origin/topic/robin/gh-123-symlink:
  Bump spicy-plugin.
2023-02-22 15:52:23 +01:00
Robin Sommer
0f55521a9d
Bump spicy-plugin. 2023-02-22 15:51:07 +01:00
Arne Welzel
a693924099 Merge remote-tracking branch 'origin/topic/awelzel/2572-event-handler-stats'
* origin/topic/awelzel/2572-event-handler-stats:
  Bump external baselines
  external/testing-setup: Less telemetry.log volume
  EventHandler: Use telemetry framework for EventHandler.call_count
2023-02-22 12:59:41 +01:00
Arne Welzel
bf693aaaa5 Bump external baselines 2023-02-22 12:27:35 +01:00
Arne Welzel
d9e5cc3078 external/testing-setup: Less telemetry.log volume
For traces spanning a long time period, don't produce immense
amounts of logs. Also filter down the event handler invocation
entries to connection related events in telemetry.log.
2023-02-22 12:10:10 +01:00
Arne Welzel
56a8b99965 EventHandler: Use telemetry framework for EventHandler.call_count
Put the IntCounter into a std::optional rather than initializing
it at EventHandler construction time as that will currently expose
a time series per event handler through the Prometheus API.
2023-02-22 12:10:10 +01:00
zeek-bot
a40025b82d Update doc submodule [nomail] [skip ci] 2023-02-22 00:49:41 +00:00
Tim Wojtulewicz
18ee3a16ad Merge remote-tracking branch 'origin/topic/awelzel/2777-redef-error-messages'
* origin/topic/awelzel/2777-redef-error-messages:
  parse.y: Improve error reporting of type redef
2023-02-21 16:48:09 -07:00
Tim Wojtulewicz
233bd77009 Updating CHANGES and VERSION. 2023-02-21 12:28:23 -07:00
Arne Welzel
f56785740c ftp: Limit user, password, arg and reply_msg column sizes in log
The user and password fields are replicated to each of the ftp.log
entries. Using a very large username (100s of KBs) allows to bloat
the log without actually sending much traffic. Further, limit the
arg and reply_msg columns to large, but not unbounded values.
2023-02-21 12:28:07 -07:00
Tim Wojtulewicz
3c330122c6 Allow async DNS responses with zero TTLs to be considered valid after expriation
This fixes a potential memory leak when getting responses for asnyc DNS requests
where the TTL value on the response is zero. We were immediately considering the
request as expired and never removing it from the map of requests. This lead to
the DNS_Mgr eventually stopping processing of async requests.
2023-02-21 12:27:57 -07:00
Tim Wojtulewicz
8cf1e51623 Add max_size argument for find_all/find_all_ordered BIFs 2023-02-21 12:27:54 -07:00
Arne Welzel
2f4f01d3f5 parse.y: Improve error reporting of type redef
It's happening regularly to me that I forget the type specifier when redef'ing
records or enums and usually it takes me a while to figure out what's going
on as the errors are not descriptive. Improve the error reporting and just
bail as there's no sensible way to continue.

Closes #2777
2023-02-21 11:58:33 +01:00
zeek-bot
fc0bfd21d5 Update doc submodule [nomail] [skip ci] 2023-02-21 00:32:43 +00:00
Tim Wojtulewicz
c30b8f90ef Merge remote-tracking branch 'ekoyle/add-protocol-pbb'
* ekoyle/add-protocol-pbb:
  Update seemingly-unrelated btests
  Use a default analyzer
  Simplify PBB analyzer by using Ethernet analyzer
  Add btest for PBB and update baselines
  Use constexpr instead of #define
  Cleanup and add customer MAC addresses
  Add PBB (802.1ah) support
2023-02-19 19:24:15 -07:00
Benjamin Bannier
eb05122e74 Bump Spicy and spicy-plugin to latest releases.
(cherry picked from commit f27a9a6264)
2023-02-17 09:59:04 -07:00
Benjamin Bannier
328688cb18 Trim diffed output in test spicy.spicy-dump.
We previously would include any and all output from stderr during
compilation in the test baseline. Depending on the used compiler this
output may contain C++ compilation warnings which are uninteresting for
the behavior under test.

(cherry picked from commit 5221edf474)
2023-02-17 09:58:59 -07:00
Tim Wojtulewicz
c3aecb0c96 Update cmake and zeek-aux submodules [nomail] 2023-02-17 09:51:53 -07:00
Arne Welzel
0fd92555d9 Merge remote-tracking branch 'origin/topic/awelzel/propagate-on-change-through-copy'
* origin/topic/awelzel/propagate-on-change-through-copy:
  TableVal: Propagate &on_change attribute through copy()
  testing/btest: Add test showing &expire_func/&create_expire is copied
2023-02-17 17:38:37 +01:00
Arne Welzel
9f16520aa9 Merge remote-tracking branch 'origin/topic/awelzel/2793-propagate-order-through-copy'
* origin/topic/awelzel/2793-propagate-order-through-copy:
  TableVal: Propagate &ordered through copy()
2023-02-17 17:36:19 +01:00
Arne Welzel
e1d3e04239 Merge remote-tracking branch 'origin/topic/awelzel/2690-recursive-record-type-in-table'
* origin/topic/awelzel/2690-recursive-record-type-in-table:
  Type/is_supported_index_type: Deal with recursive record types
2023-02-17 17:35:52 +01:00
Arne Welzel
ec998dbfb6 Type/is_supported_index_type: Deal with recursive record types
This plugs the issue reported in #2690, there might be more though.

Closes #2690
2023-02-17 17:35:05 +01:00
Arne Welzel
754831d7b0 TableVal: Propagate &ordered through copy()
Copying an &ordered table or set would result in a copy that is not ordered.
This seems rather surprising behavior, so propagate the &ordered attribute.

Closes #2793
2023-02-17 16:28:50 +01:00
Arne Welzel
b2c4f8fd92 TableVal: Propagate &on_change attribute through copy()
Mostly for consistency with &default, &expire_func and other attributes
being propagated through a copy(). Seems this was just missed during
the implementation and/or was never tested for.
2023-02-17 16:21:32 +01:00
Arne Welzel
2b5db43270 testing/btest: Add test showing &expire_func/&create_expire is copied
Does not seem there is a test, but current implementation is that
&expire_func and &create_expire are propagated through copy().
2023-02-17 16:16:06 +01:00
Eldon Koyle
d17329c95b Update seemingly-unrelated btests
For some reason, the plugin order appears to have changed in the files btests.
2023-02-17 08:10:28 -07:00