Dominik Charousset
304b8f8f0b
Integrate new Broker auto-disconnecting feature
2024-10-10 16:47:57 +02:00
Tim Wojtulewicz
270429bfea
Update CHANGES, VERSION, and NEWS for 7.0.2 release
2024-09-23 12:15:32 -07:00
Tim Wojtulewicz
815001f2aa
Update docs submodule [nomail] [skip ci]
2024-09-23 11:58:24 -07:00
Tim Wojtulewicz
88c37d0be8
Merge remote-tracking branch 'origin/topic/awelzel/3936-pop3-and-redis'
...
* origin/topic/awelzel/3936-pop3-and-redis:
pop3: Remove unused headers
pop3: Prevent unbounded state growth
btest/pop3: Add somewhat more elaborate testing
(cherry picked from commit 702fb031a4
2024-09-23 11:12:54 -07:00
Johanna Amann
40db8463df
Merge remote-tracking branch 'origin/topic/timw/remove-negative-timestamp-test'
...
* origin/topic/timw/remove-negative-timestamp-test:
Remove core.negative-time btest
(cherry picked from commit 899f7297d7
2024-09-23 10:27:19 -07:00
Arne Welzel
fb51e3a88f
Merge remote-tracking branch 'origin/topic/awelzel/prom-callbacks-2'
...
* origin/topic/awelzel/prom-callbacks-2:
Update broker submodule
telemetry: Move callbacks to Zeek
auxil/prometheus-cpp: Pin to 1.2.4
(cherry picked from commit f24bc1ee88
2024-09-23 10:00:58 -07:00
Arne Welzel
5a0e2bf771
Merge remote-tracking branch 'origin/topic/awelzel/3919-ldap-logs-missing'
...
* origin/topic/awelzel/3919-ldap-logs-missing:
btest/ldap: Add regression test for #3919
(cherry picked from commit a339cfa4c0
2024-09-23 09:24:52 -07:00
Arne Welzel
95e7c5a63e
Merge remote-tracking branch 'origin/topic/awelzel/3853-ldap-spnego-ntlmssp'
...
* origin/topic/awelzel/3853-ldap-spnego-ntlmssp:
ldap: Recognize SASL+SPNEGO+NTLMSSP
(cherry picked from commit 152bbbd680
2024-09-23 09:23:19 -07:00
Tim Wojtulewicz
024304bddf
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-7.0' into release/7.0
...
* origin/topic/bbannier/bump-spicy-7.0:
Bump auxil/spicy to latest release
2024-09-23 09:07:50 -07:00
Benjamin Bannier
2cc6c735d3
Bump auxil/spicy to latest release
2024-09-19 13:40:34 +02:00
Tim Wojtulewicz
3bf8bfaac6
Update CHANGES, VERSION, and NEWS for 7.0.1 release
2024-09-03 13:04:36 -07:00
Tim Wojtulewicz
89b9f9a456
Update zeek-aux submodule to pick up zeek-archiver permissions fix
2024-09-03 13:03:51 -07:00
Tim Wojtulewicz
8de8fb8fae
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-7.0' into release/7.0
...
* origin/topic/bbannier/bump-spicy-7.0:
Bump auxil/spicy to latest release
Update docs submodule [nomail] [skip ci]
2024-09-03 09:02:37 -07:00
Benjamin Bannier
595cdf8b55
Bump auxil/spicy to latest release
2024-09-02 12:51:07 +02:00
Tim Wojtulewicz
74b832fa39
Update docs submodule [nomail] [skip ci]
2024-08-30 14:39:46 -07:00
Robin Sommer
15be682f63
Merge remote-tracking branch 'origin/topic/robin/gh-3881-spicy-ports'
...
* origin/topic/robin/gh-3881-spicy-ports:
Spicy: Register well-known ports through an event handler.
Revert "Remove deprecated port/ports fields for spicy analyzers"
(cherry picked from commit a2079bcda6
2024-08-30 13:26:16 -07:00
Tim Wojtulewicz
8f9c5f79c6
Updating CHANGES and VERSION.
2024-08-30 12:34:09 -07:00
Arne Welzel
382b4b5473
Merge remote-tracking branch 'origin/topic/awelzel/ldap-fix-uint8-shift'
...
* origin/topic/awelzel/ldap-fix-uint8-shift:
ldap: Promote uint8 to uint64 before shifting
(cherry picked from commit 97fa7cdc0a
2024-08-30 11:47:39 -07:00
Arne Welzel
6f65b88f1b
Merge remote-tracking branch 'origin/topic/awelzel/ldap-extended-request-response-starttls'
...
* origin/topic/awelzel/ldap-extended-request-response-starttls:
ldap: Add heuristic for wrap tokens
ldap: Ignore ec/rrc for sealed wrap tokens
ldap: Add LDAP sample with SASL-SRP mechanism
ldap: Reintroduce encryption after SASL heuristic
ldap: Fix assuming GSS-SPNEGO for all bindResponses
ldap: Implement extended request/response and StartTLS support
(cherry picked from commit 6a6a5c3d0d
2024-08-30 11:47:08 -07:00
Arne Welzel
cfe47f40a4
Merge remote-tracking branch 'origin/topic/awelzel/spicy-ldap-krb-wrap-tokens'
...
* origin/topic/awelzel/spicy-ldap-krb-wrap-tokens:
ldap: Remove MessageWrapper with magic 0x30 searching
ldap: Harden parsing a bit
ldap: Handle integrity-only KRB wrap tokens
(cherry picked from commit 2ea3a651bd
2024-08-30 11:46:47 -07:00
Arne Welzel
0fd6672dde
Merge branch 'fix-http-password-capture' of https://github.com/p-l-/zeek
...
* 'fix-http-password-capture' of https://github.com/p-l-/zeek :
http: fix password capture when enabled
(cherry picked from commit c27e18631c
2024-08-30 11:34:24 -07:00
Arne Welzel
e7ab18b343
Merge remote-tracking branch 'origin/topic/awelzel/no-child-analyzer-on-finished-connections'
...
* origin/topic/awelzel/no-child-analyzer-on-finished-connections:
Analyzer: Do not add child analyzers when finished
(cherry picked from commit 45b33bf5c1
2024-08-30 11:33:35 -07:00
Arne Welzel
8a92b150a5
Merge remote-tracking branch 'origin/topic/awelzel/tcp-reassembler-undelivered-data-match-bool-bool-bool-confusion'
...
* origin/topic/awelzel/tcp-reassembler-undelivered-data-match-bool-bool-bool-confusion:
TCP_Reassembler: Fix IsOrig() position in Match() call
(cherry picked from commit 4a4cbf2576
2024-08-30 11:32:34 -07:00
Tim Wojtulewicz
dd4597865a
Merge remote-tracking branch 'origin/topic/timw/telemetry-threading'
...
* origin/topic/timw/telemetry-threading:
Process metric callbacks from the main-loop thread
(cherry picked from commit 3c3853dc7d
2024-08-30 11:29:17 -07:00
Arne Welzel
056bbe04ea
Merge remote-tracking branch 'origin/topic/timw/use-more-memory-for-freebsd-builds'
...
* origin/topic/timw/use-more-memory-for-freebsd-builds:
CI: Use 16GB of memory for FreeBSD builds
(cherry picked from commit 9d9cc51e9d
2024-08-30 11:28:15 -07:00
Christian Kreibich
f6b8864584
Update docs submodule [nomail] [skip ci]
2024-08-12 17:54:52 -07:00
Tim Wojtulewicz
d1f6e91988
Updating CHANGES and VERSION.
2024-08-01 10:42:25 -07:00
Tim Wojtulewicz
6bbaef3e09
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' into release/7.0
...
* origin/topic/bbannier/bump-spicy:
Allowlist a name for typos check
Bump Spicy to latest release
2024-07-31 09:37:03 -07:00
Benjamin Bannier
55d36fc2cd
Allowlist a name for typos check
2024-07-31 15:06:47 +02:00
Benjamin Bannier
f8fbeca504
Bump Spicy to latest release
2024-07-31 14:57:53 +02:00
Tim Wojtulewicz
72ff343f17
Update docs submodule [nomail] [skip ci]
2024-07-29 11:40:28 -07:00
Tim Wojtulewicz
b76096a9ee
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
(cherry picked from commit 4c0c7581c8
2024-07-26 10:18:47 -07:00
Tim Wojtulewicz
b9e4669632
Updating CHANGES and VERSION.
2024-07-25 11:06:51 -07:00
Tim Wojtulewicz
5974613cae
Generate docs for 7.0.0-rc3
2024-07-25 10:52:29 -07:00
Christian Kreibich
3a44bda957
Bump zeek-testing-cluster to reflect deprecation of prometheus.zeek
...
(cherry picked from commit 146cf99ff6
2024-07-24 17:07:14 -07:00
Christian Kreibich
51262d02c7
Merge branch 'topic/christian/ack-contribs' into release/7.0
...
* topic/christian/ack-contribs:
Add contributors to 7.0.0 NEWS entry [skip ci]
2024-07-24 17:01:39 -07:00
Christian Kreibich
b46aeefbab
Add contributors to 7.0.0 NEWS entry [skip ci]
2024-07-24 16:48:17 -07:00
Tim Wojtulewicz
a4b746e5e8
Merge remote-tracking branch 'origin/topic/timw/smb2-ioctl-errors'
...
* origin/topic/timw/smb2-ioctl-errors:
Update 7.0 NEWS with blurb about multi-PDU parsing causing increased load [nomail] [skip ci]
Fix handling of zero-length SMB2 error responses
(cherry picked from commit bd208f4c54
2024-07-24 13:29:09 -07:00
Tim Wojtulewicz
746ae4d2cc
Merge remote-tracking branch 'origin/topic/johanna/update-the-ct-list-and-the-ca-list-again'
...
* origin/topic/johanna/update-the-ct-list-and-the-ca-list-again:
Update Mozilla CA list and CT list
(cherry picked from commit cb88f6316c
2024-07-23 08:55:11 -07:00
Tim Wojtulewicz
a65a339aa8
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
(cherry picked from commit da7c3d9138
2024-07-23 08:52:47 -07:00
Arne Welzel
8014c4b8c3
telemetry: Deprecate prometheus.zeek policy script
...
With Cluster::Node$metrics_port being optional, there's not really
a need for the extra script. New rule, if a metrics_port is set, the
node will attempt to listen on it.
Users can still redef Telemetry::metrics_port *after*
base/frameworks/telemetry was loaded to change the port defined
in cluster-layout.zeek.
(cherry picked from commit bf9704f339
2024-07-23 10:05:46 +02:00
Tim Wojtulewicz
d9dc121e9a
Update broker submodule [nomail]
2024-07-22 15:00:22 -07:00
Tim Wojtulewicz
5a56ff92d2
Updating CHANGES and VERSION.
2024-07-18 14:54:47 -07:00
Tim Wojtulewicz
b13dfa3b16
Update docs submodule [nomail]
2024-07-18 14:31:49 -07:00
Christian Kreibich
d17a1f9822
Bump zeek-testing-cluster to pull in tee SIGPIPE fix
...
(cherry picked from commit b51a46f94d
2024-07-17 15:39:45 -07:00
Tim Wojtulewicz
5cdddd92d5
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
(cherry picked from commit 9ba7c2ddaf
2024-07-16 10:16:57 -07:00
Tim Wojtulewicz
b8d11f4688
CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure
2024-07-12 16:13:11 -07:00
Tim Wojtulewicz
91b23a6e2e
Update broker and cmake submodules [nomail]
2024-07-12 16:13:04 -07:00
Tim Wojtulewicz
a8c56c1f25
Fix a broken merge
...
I merged an old version of the branch on accident and then merged the right
one over top of it, but git ended up including both versions. This fixes
that mistake.
(cherry picked from commit f3bcf1a55d
2024-07-12 10:04:16 -07:00
Tim Wojtulewicz
5f6df68463
Merge remote-tracking branch 'origin/topic/bbannier/lib-spicy-hooks'
...
* origin/topic/bbannier/lib-spicy-hooks:
Do not emit hook files for builtin modules
(cherry picked from commit b935d2f59a
2024-07-12 09:52:44 -07:00
