Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
16289 commits 387 branches 195 tags 255 MiB
Commit graph

3129 commits

Author SHA1 Message Date
Arne Welzel
a45489de90 Merge remote-tracking branch 'origin/topic/awelzel/3442-evt-port-deprecation' 
* origin/topic/awelzel/3442-evt-port-deprecation:
  btest/spicy: Remove most port usages
  spicy: Deprecate port/ports in .evt files
 2024-03-18 10:07:54 +01:00
Robin Sommer
139562eb8d
Merge remote-tracking branch 'origin/topic/robin/binary-build-fix' 
* origin/topic/robin/binary-build-fix:
  Add a CI test with the same options as we used for binary builds.
  Fix binary build of `spicyz`.
 2024-03-16 11:15:33 +01:00
Christian Kreibich
c3caa4f6c3 Merge remote-tracking branch 'origin/topic/timw/ci-remove-centos7-debian10' 
* origin/topic/timw/ci-remove-centos7-debian10:
  CI: Remove CentOS 7 and Debian 10 builds
 2024-03-15 13:15:16 -07:00
Arne Welzel
d51613a7b2 Merge remote-tracking branch 'origin/topic/awelzel/fix-cluster-testing-docker-compose-v2' 
* origin/topic/awelzel/fix-cluster-testing-docker-compose-v2:
  testing/external/cluster: Switch to docker-compose v2
 2024-03-15 13:37:20 +01:00
Tim Wojtulewicz
6fa34c202f Merge remote-tracking branch 'origin/topic/christian/news-contributors' 
* origin/topic/christian/news-contributors:
  Add community contributions for the 6.2 timeframe to NEWS. [skip ci]
 2024-03-13 10:17:59 -07:00
Arne Welzel
2d1588277e Merge remote-tracking branch 'origin/topic/awelzel/3640-void-size-expr-assign-stmt' 
* origin/topic/awelzel/3640-void-size-expr-assign-stmt:
  Expr: Handle TYPE_VOID in SizeExpr and AssignExpr::Typecheck()
 2024-03-12 10:31:46 +01:00
Arne Welzel
bbc7272a42 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Mar24' 
* origin/topic/vern/script-opt-maint.Mar24:
  AST location fixes for -O gen-C++
  script optimization support for clearing tables/vectors using "delete"
  fix for ZAM printing of instructions that modify slots other than slot 1
  fixed bug where appending an empty vector to a vector-of-vector's had no effect
 2024-03-08 19:10:13 +01:00
Robin Sommer
8b214862c5
Merge remote-tracking branch 'origin/topic/robin/bump-spicy' 
* origin/topic/robin/bump-spicy:
  Bump Spicy.
 2024-03-07 09:56:03 +01:00
Arne Welzel
eeeaffb42c Merge remote-tracking branch 'origin/topic/jgras/fix-cluster-started-btesting' 
* origin/topic/jgras/fix-cluster-started-btesting:
  Make worker restart in cluster btest race-proof
 2024-03-06 10:39:05 +01:00
Arne Welzel
3734adef2d Merge remote-tracking branch 'origin/topic/awelzel/bump-highwayhash' 
* origin/topic/awelzel/bump-highwayhash:
  highwayhash: Point to github.com/google/highwayhash, bump to master
 2024-03-05 19:23:38 +01:00
Tim Wojtulewicz
ce8310ec89 Merge remote-tracking branch 'origin/topic/timw/ci-freebsd-13' 
* origin/topic/timw/ci-freebsd-13:
  CI: Bump FreeBSD 13 build to 13.3
 2024-03-04 12:33:11 -07:00
Arne Welzel
6867eda621 Merge remote-tracking branch 'origin/topic/awelzel/fix-assert-cond-twice' 
* origin/topic/awelzel/fix-assert-cond-twice:
  Stmt: Fix assert evaluating cond twice
 2024-03-04 18:22:43 +01:00
Robin Sommer
ce344d3f84
Merge remote-tracking branch 'origin/topic/robin/node-rewrite' 
* origin/topic/robin/node-rewrite:
  Port Spicy integration to new AST API.
 2024-03-04 15:49:29 +01:00
Arne Welzel
724daa2792 Merge remote-tracking branch 'origin/topic/awelzel/zeekjs-0.12.0' 
* origin/topic/awelzel/zeekjs-0.12.0:
  Bump zeekjs to 0.12.0
 2024-02-28 17:10:44 +01:00
Arne Welzel
e33bf64dc9 Merge remote-tracking branch 'origin/topic/awelzel/3619-zeekygen-spicyc-mtime' 
* origin/topic/awelzel/3619-zeekygen-spicyc-mtime:
  spicy/zeekygen: Remove mtime from generated code
 2024-02-27 15:18:58 +01:00
Arne Welzel
d728981b77 Merge remote-tracking branch 'origin/topic/awelzel/move-iso-9660-sig-to-policy' 
* origin/topic/awelzel/move-iso-9660-sig-to-policy:
  signatures/iso-9660: Add \x01 suffix to CD001
  test-all-policy: Do not load iso-9660.zeek
  signatures: Move ISO 9660 signature to policy
 2024-02-26 21:16:48 +01:00
Tim Wojtulewicz
c315202ece Merge remote-tracking branch 'origin/topic/johanna/update-tls-ca-stuff' 
* origin/topic/johanna/update-tls-ca-stuff:
  Update Mozilla CA and Google CT list and related tests.
 2024-02-26 11:10:32 -07:00
Arne Welzel
0dfee33c83 Merge remote-tracking branch 'origin/topic/awelzel/3139-zeek-version-spicy-ccache-busting' 
* origin/topic/awelzel/3139-zeek-version-spicy-ccache-busting:
  spicy: Remove Zeek version from spicyz/config.h.in
 2024-02-22 17:00:46 +01:00
Arne Welzel
08bf8d47f4 Merge remote-tracking branch 'origin/topic/awelzel/iso-9660-image-signature' 
* origin/topic/awelzel/iso-9660-image-signature:
  signatures: Fix ISO 9960 signature
 2024-02-22 12:38:55 +01:00
Arne Welzel
036bcfe919 Merge remote-tracking branch 'origin/topic/awelzel/ftp-clear-fuid-after-logging' 
* origin/topic/awelzel/ftp-clear-fuid-after-logging:
  testing: Update zeek-testing-private commit hash
  ftp: Reset fuid after logging
 2024-02-22 12:23:21 +01:00
Arne Welzel
e9e930bdfa Merge remote-tracking branch 'origin/topic/awelzel/delete-stmt-table-set' 
* origin/topic/awelzel/delete-stmt-table-set:
  Allow delete statement for tables, sets and vectors
 2024-02-22 12:02:37 +01:00
Tim Wojtulewicz
04d965a13a Merge branch 'topic/neverlord/broker-variant' 
* topic/neverlord/broker-variant:
  Pull in variant-enabled Broker
 2024-02-20 10:57:42 -07:00
Tim Wojtulewicz
6de51f0d7a Merge remote-tracking branch 'origin/topic/timw/update-zkg' 
* origin/topic/timw/update-zkg:
  Bump zkg to v3.0.0
 2024-02-15 11:08:30 -05:00
Tim Wojtulewicz
8bef179ab1 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to latest dev snapshot.
 2024-02-15 11:07:25 -05:00
Arne Welzel
72eb565c5e Merge remote-tracking branch 'origin/topic/awelzel/cheaper-hex-printing' 
* origin/topic/awelzel/cheaper-hex-printing:
  zeek.bif: Booleanate String constructor calls
  Conn/net_utils/fmt_mac: Avoid snprintf(), memcpy() and allocation
  bytestring_to_hexstr: Use bytetohex() instead of snprintf()
  digest/digest_print: Use bytetohex() instead of snprintf()
 2024-02-13 20:10:15 +01:00
Arne Welzel
382121fd8c Merge remote-tracking branch 'origin/topic/awelzel/stmt-extern' 
* origin/topic/awelzel/stmt-extern:
  Bump zeekjs for STMT_ANY deprecation
  Stmt: Deprecate STMT_ANY
  Stmt: Introduce STMT_EXTERN
 2024-02-08 15:12:33 +01:00
Tim Wojtulewicz
5db7b3d567 Merge remote-tracking branch 'origin/topic/timw/update-vcpkg' 
* origin/topic/timw/update-vcpkg:
  Update .gitignore to add Emacs and Vim temp files
  Update vcpkg submodule to pull in c-ares 1.26.0 to match other platforms
 2024-02-07 12:50:07 -07:00
Christian Kreibich
1f2821dfe3 Merge branch 'topic/christian/news-additions' 
* topic/christian/news-additions:
  Some NEWS updates for 6.2 [skip ci]
 2024-02-07 09:36:36 -08:00
Arne Welzel
fa97e08f60 Merge remote-tracking branch 'origin/topic/awelzel/websocket-spicy-analyzer' 
* origin/topic/awelzel/websocket-spicy-analyzer:
  websocket: Implement Spicy's unmask in C++
  websocket: Add Spicy parser version, too.
 2024-02-07 13:15:59 +01:00
Johanna Amann
160ccda45f Merge remote-tracking branch 'origin/topic/johanna/netcontrol-updates' 
* origin/topic/johanna/netcontrol-updates:
  Netcontrol: add rule_added_policy
  Netcontrol: more logging in catch-and-release
  Netcontrol: allow supplying explicit name to Debug plugin
 2024-02-06 11:54:26 +00:00
Arne Welzel
f8a7f3699c Merge remote-tracking branch 'origin/topic/vern/complete-ast-locs' 
* origin/topic/vern/complete-ast-locs:
  Obj: Implement with_location_of() as template
  fixes & enhancements to location information associated w/ AST nodes & ZAM optimization
 2024-02-06 11:22:58 +01:00
Arne Welzel
7a283afe00 Merge remote-tracking branch 'origin/topic/christian/cluster-pool-nodetype-default' 
* origin/topic/christian/cluster-pool-nodetype-default:
  Do not default PoolSpec topics to the empty string.
  Do not default to proxy nodes in Broker::PoolSpec
 2024-02-06 10:11:45 +01:00
Christian Kreibich
42f0a10cb0 Bump cluster testsuite to latest main [skip ci] 2024-02-05 17:19:38 -08:00
Tim Wojtulewicz
4e589121c8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Feb24' 
* origin/topic/vern/script-opt-maint.Feb24:
  minor updates and fixes for script optimization maintenance
 2024-02-05 12:51:01 -07:00
Tim Wojtulewicz
9609f1fe1a Merge branch 'topic/timw/vcpkg' 
* topic/timw/vcpkg:
  Fix searching for libpcap installed by vcpkg
  Switch all of the conan configuration to vcpkg
 2024-02-02 15:27:40 -07:00
Christian Kreibich
9da9d0d7a8 Merge branch 'topic/christian/docs-fix' 
* topic/christian/docs-fix:
  Fix markup typo in the Intel::seen_policy hook docstring [skip ci]
 2024-02-02 13:50:20 -08:00
Tim Wojtulewicz
104116e782 Merge remote-tracking branch 'origin/topic/timw/update-c-ares' 
* origin/topic/timw/update-c-ares:
  Configure c-ares before libkqueue
  Update 3rdparty submodule to update sqlite to 3.45.0
  Upgrade rapidjson to current upstream master
  Upgrade c-ares to 1.26.0
 2024-02-01 11:22:18 -07:00
Arne Welzel
072fe660bc Merge remote-tracking branch 'origin/topic/awelzel/spicy-diff-remove-timestamps-fix' 
* origin/topic/awelzel/spicy-diff-remove-timestamps-fix:
  spicy/diff-remove-timestamp: Fix missing -e
 2024-01-31 14:27:59 +01:00
Arne Welzel
42d05d2e09 Merge remote-tracking branch 'origin/topic/awelzel/fix-server-initial-with-ack' 
* origin/topic/awelzel/fix-server-initial-with-ack:
  quic: Log client's source connection id, too.
  quic: Continue decryption attempts for later INITIAL packets
  quic: Rename set_conn() to set_session()
 2024-01-30 21:47:16 +01:00
Robin Sommer
5c3bb6cd97
Merge remote-tracking branch 'origin/topic/robin/bump-spicy' 
* origin/topic/robin/bump-spicy:
  Bump Spicy to current `main`.
 2024-01-29 10:30:43 +01:00
Christian Kreibich
318f8295ea Merge branch 'topic/christian/mmdb-fix' 
* topic/christian/mmdb-fix:
  Move GeoIP availability test in btests to `zeek-config --have-geoip`
  Fix MMDB::Lookup() to check result status correctly
  Add btest for succeeding/failing IPv4/IPv6 lookups
  Add an IPv6 range to the test MMDB DBs
 2024-01-26 17:14:18 -08:00
Tim Wojtulewicz
5efaae0a7e Merge remote-tracking branch 'origin/topic/timw/windows-openssl-version' 
* origin/topic/timw/windows-openssl-version:
  Force Windows CI to use OpenSSL 3.1.1
 2024-01-26 15:08:47 -07:00
Arne Welzel
b586b59b69 Merge remote-tracking branch 'origin/topic/vern/zam-rec-constr-opt2' 
* origin/topic/vern/zam-rec-constr-opt2:
  ZAM optimizations for record creation
 2024-01-25 20:55:16 +01:00
Arne Welzel
e318b82032 Merge remote-tracking branch 'origin/topic/awelzel/intel-seen-hook' 
* origin/topic/awelzel/intel-seen-hook:
  Intel: Introduce Intel::seen_policy() hook
 2024-01-25 12:27:34 +01:00
Arne Welzel
ba510f018c Merge remote-tracking branch 'origin/topic/awelzel/websocket-continuation-opcode-fix' 
* origin/topic/awelzel/websocket-continuation-opcode-fix:
  websocket: Fix opcode for continuation frames
 2024-01-25 12:21:37 +01:00
Christian Kreibich
46eba4811e Merge branch 'topic/neverlord/broker-variant-prep' 
* topic/neverlord/broker-variant-prep:
  Prepare Broker manager for broker::variant
 2024-01-24 15:25:27 -08:00
Arne Welzel
a16179eae7 Merge remote-tracking branch 'origin/topic/awelzel/sed-E-everywhere' 
* origin/topic/awelzel/sed-E-everywhere:
  testing/scripts: Use sed -E everywhere
 2024-01-24 23:05:01 +01:00
Arne Welzel
77ef7f4ad9 Merge remote-tracking branch 'origin/topic/awelzel/bdat-websocket-fixlets' 
* origin/topic/awelzel/bdat-websocket-fixlets:
  HTTP: Coverity std::move suggestion
  WebSocket: Coverity std::move suggestion
  SMTP/BDAT: Fix SonarQube reported issues
 2024-01-24 23:04:27 +01:00
Arne Welzel
cbaf838f4d Merge remote-tracking branch 'origin/topic/awelzel/smtp-bdat-follow-up-3' 
* origin/topic/awelzel/smtp-bdat-follow-up-3:
  btest/smtp/bdat: Move tests into proper directory
  BDAT: Harden parse_bdat_arg()
  SMTP: Reset ContentLineAnalyzer plain delivery on EndData()
  SMTP: Add SMTP_IN_BDAT state
 2024-01-23 21:53:37 +01:00
Tim Wojtulewicz
fbb1a57945 Merge remote-tracking branch 'origin/topic/timw/iptunnel-check-null-session' 
* origin/topic/timw/iptunnel-check-null-session:
  Remove setting non-existent session history for IPTunnel
 2024-01-23 12:41:01 -07:00