Commit graph

12374 commits

Author SHA1 Message Date
zeek-bot
790656f351 Update doc submodule [nomail] [skip ci] 2021-06-22 00:31:06 +00:00
Tim Wojtulewicz
30973af94a Merge remote-tracking branch 'origin/topic/johanna/remove-stepping-stone'
* origin/topic/johanna/remove-stepping-stone:
  Remove the Stepping Stone analyzer
2021-06-21 16:14:25 -07:00
Christian Kreibich
84c3cee7ef Merge branch 'topic/christian/ci-drop-fedora-32'
* topic/christian/ci-drop-fedora-32:
  Drop Fedora 32 from CI, now past EOL
2021-06-21 15:44:50 -07:00
Christian Kreibich
4fa1709505 Merge branch 'topic/christan/fix-redundant-test-certs'
* topic/christan/fix-redundant-test-certs:
  Remove a double-defined TLS cert from a Broker btest
2021-06-21 15:41:16 -07:00
Christian Kreibich
0f0104293c Remove a double-defined TLS cert from a Broker btest 2021-06-21 13:16:06 -07:00
Robin Sommer
6559d56dbf Merge remote-tracking branch 'origin/topic/vlad/page_hostnames'
* origin/topic/vlad/page_hostnames:
  Expand the tests, and have email_admin email src contacts in one e-mail, and dst contacts in another.
  Simplify the logic a big by making Notice$email_dest have a default rather than be optional
  Missed some baselines
  Update hashes in external testing repos
  Update notice.log baselines
  Remove unneccessary @load
  Add tests for e-mail actions, and cleanup the new logic a bit.
  Fixup priorities
  Add a new field to the notice, which defines where to send the e-mail
  Add page and email_admin to hostnames extension
2021-06-21 11:21:17 +02:00
Luke Cesarz
35334a7681 Fix typo 2021-06-20 08:14:10 -07:00
Luke Cesarz
d29a43fb79 Fix segfault with incomplete connection
Add required HasField check before GetFieldAs call
2021-06-20 07:51:46 -07:00
Christian Kreibich
0b510c9679 Drop Fedora 32 from CI, now past EOL 2021-06-17 18:32:02 -07:00
zeek-bot
2de38750fd Update doc submodule [nomail] [skip ci] 2021-06-18 00:30:05 +00:00
Vlad Grigorescu
9d1e9a20e4 Expand the tests, and have email_admin email src contacts in one e-mail, and dst contacts in another. 2021-06-17 14:49:24 -05:00
Vlad Grigorescu
9d0bd96e1f Simplify the logic a big by making Notice$email_dest have a default rather than be optional 2021-06-17 10:31:04 -05:00
Johanna Amann
a995d73fdf Merge remote-tracking branch 'origin/topic/bbannier/issue-1590'
* origin/topic/bbannier/issue-1590:
  Change SSH version field to be `&optional`.
  Reformat function in SSH base script.

Changes during merge:
  * rename weirds to fit into our naming scheme
  * add NEWS entry

Closes GH-1590
2021-06-17 10:52:49 +01:00
Benjamin Bannier
daa9537f92 Change SSH version field to be &optional.
In 3769ed6c66 we added handling for SSH version 1.99 which unsed a SSH
version of 0 to indicate weird cases where no version could be
determined.

This patch is a fixup for that patch. Instead of using a magic version
of 0 we now use an `&optional` version value. If no SSH version can be
extracted the version will be unset; additionally a `conn_weird` event
will be raised.

Closes #1590.
2021-06-17 09:24:46 +02:00
Benjamin Bannier
e6e30240ec Reformat function in SSH base script. 2021-06-16 15:03:43 +02:00
Tim Wojtulewicz
0bf475f055 Update submodule(s) [nomail] 2021-06-15 11:35:48 -07:00
Christian Kreibich
a82fe94bcc Merge branch 'topic/christian/gh-1591'
* topic/christian/gh-1591:
  Bump Highwayhash submodule to pull in fix for FreeBSD
2021-06-14 16:21:15 -07:00
Vlad Grigorescu
bfb26b9227 Missed some baselines 2021-06-12 12:56:15 -05:00
Vlad Grigorescu
fc7dfe7340 Update hashes in external testing repos 2021-06-12 10:54:00 -05:00
Tim Wojtulewicz
6c747a0fca Merge remote-tracking branch 'origin/topic/seth/plugin-dir-fixes'
* origin/topic/seth/plugin-dir-fixes:
  Fixes for the builtin plugin functionality
2021-06-11 11:54:46 -07:00
Seth Hall
8222193525 Fixes for the builtin plugin functionality 2021-06-11 18:52:03 +00:00
Vern Paxson
b4f025dda9 support for standalone compiled scripts to export globals with module qualifiers 2021-06-11 08:49:52 -07:00
Vlad Grigorescu
e579497247 Merge branch 'master' into topic/vlad/page_hostnames 2021-06-11 10:18:15 -05:00
zeek-bot
623f2b4e71 Update doc submodule [nomail] [skip ci] 2021-06-11 00:35:44 +00:00
Tim Wojtulewicz
8b92ba180d Merge remote-tracking branch 'origin/topic/seth/plugin-dir2'
* origin/topic/seth/plugin-dir2:
  Added --include-plugins configure argument
2021-06-10 10:43:20 -07:00
Seth Hall
e399b537ca Added --include-plugins configure argument 2021-06-10 10:39:13 -07:00
Vlad Grigorescu
1f223c98e9 Update notice.log baselines 2021-06-10 09:04:00 -05:00
Johanna Amann
e0d284ec9f Merge branch 'logging/script-logdir' of https://github.com/kramse/zeek
* 'logging/script-logdir' of https://github.com/kramse/zeek:
  Copy of ascii-empty test, just changed path in the beginning
  Logdir: Change requested by 0xxon, no problem
  Introduce script-land variable that can be used to set logdir.

Closes GH-772
2021-06-10 12:19:15 +01:00
Henrik Kramselund Jereminsen
cd5d80c13d Copy of ascii-empty test, just changed path in the beginning 2021-06-10 10:33:35 +01:00
Henrik Kramselund Jereminsen
74561e922f Logdir: Change requested by 0xxon, no problem
Suggestion from 0xxon to look at Input Framework inspired this change
2021-06-10 10:33:26 +01:00
Henrik Kramselund Jereminsen
6bde33aca7 Introduce script-land variable that can be used to set logdir.
Addresses GH-772
2021-06-10 10:32:11 +01:00
Christian Kreibich
c01de193b5 Bump Highwayhash submodule to pull in fix for FreeBSD 2021-06-09 16:25:56 -07:00
Vern Paxson
2acaacee2d whoops overlooked the need to canonicalize filenames 2021-06-09 15:29:39 -07:00
Tim Wojtulewicz
d234b56ea3 Change the port used on the benchmark host, per request by Cirrus 2021-06-09 12:19:49 -07:00
Vern Paxson
7904701ffb another set of tweaks per review comments 2021-06-09 09:41:41 -07:00
Tim Wojtulewicz
c621af1e2b Merge remote-tracking branch 'origin/topic/timw/fix-big-sur-build'
* origin/topic/timw/fix-big-sur-build:
  Fix macOS Big Sur builds on Cirrus
2021-06-09 09:12:41 -07:00
Tim Wojtulewicz
d62e966234 Fix macOS Big Sur builds on Cirrus
- Upgrade the Big Sur VM to use the Xcode 12.5 version. This has a newer
  version of brew installed on it that fixes an issue with an EOL package host
  that finally shut down for good recently.
- Use 'brew upgrade' for openssl and cmake, since those are both present on the
  base VM. This prevents 'brew install' from printing an error if the package
  exists but is out of date.
2021-06-09 09:11:37 -07:00
Christian Kreibich
289db80270 Merge branch 'topic/johanna/opensuseleap15.3'
* topic/johanna/opensuseleap15.3:
  Add OpenSUSE Leap 15.3 to testing
2021-06-08 13:55:50 -07:00
Johanna Amannn
aed17a1aaf Add OpenSUSE Leap 15.3 to testing
It was released a few days ago.
2021-06-08 10:47:11 +01:00
zeek-bot
b32a75aa17 Update doc submodule [nomail] [skip ci] 2021-06-08 00:45:28 +00:00
Vern Paxson
d4eb0224a1 addressed a number of code review comments 2021-06-07 10:52:19 -07:00
Tim Wojtulewicz
c3dc672657 Update submodule(s) [nomail] 2021-06-07 09:24:47 -07:00
Robin Sommer
ca106457c2 Update btest submodule and add .cache to .gitignore.
[nomail]
2021-06-07 09:42:59 +02:00
Robin Sommer
ba0a4fe9cf Merge remote-tracking branch 'origin/topic/neverlord/coverity'
* origin/topic/neverlord/coverity:
  Improve assignment operators for IntrusivePtr
2021-06-07 09:39:06 +02:00
Robin Sommer
494421b302 Merge branch 'proc-stats-mem-is-bytes' of ssh://github.com/awelzel/zeek
* 'proc-stats-mem-is-bytes' of ssh://github.com/awelzel/zeek:
  init-bare/ProcStats: mem is in bytes, not KB.
2021-06-07 09:13:13 +02:00
Dominik Charousset
2f19c89189 Improve assignment operators for IntrusivePtr
Fixes Coverity finding 1367523 (Missing move assignment operator).
2021-06-06 15:34:24 +02:00
Arne Welzel
4327c5a022 init-bare/ProcStats: mem is in bytes, not KB.
zeek::util::get_memory_usage() does `r.ru_maxrss * 1024` and the
task_info() seems to return bytes in `resident_size`.
2021-06-05 21:25:27 +02:00
Vern Paxson
4ecf70f515 updates for documentation of functionality for compiling scripts to C++ 2021-06-04 17:15:15 -07:00
Vern Paxson
725aa558a7 fixes for standalone C++ scripts making types & variables/functions available 2021-06-04 17:14:46 -07:00
Vern Paxson
fb9c73fa86 fixed bug limiting availability of load_CPP() BiF 2021-06-04 17:03:50 -07:00