Commit graph

2653 commits

Author SHA1 Message Date
Tim Wojtulewicz
903fbbc5d6 Merge remote-tracking branch 'origin/topic/timw/remove-osx-sysroot'
* origin/topic/timw/remove-osx-sysroot:
  Remove setting osx-sysroot on macOS CI builds
2023-01-30 13:39:09 -07:00
Tim Wojtulewicz
9f50a72213 Merge remote-tracking branch 'origin/topic/timw/5.2-NEWS-updates'
* origin/topic/timw/5.2-NEWS-updates:
  Whitespace cleanup in 5.2 NEWS block
  Updates to the NEWS for upcoming release/5.2 branching
2023-01-30 09:19:33 -07:00
Arne Welzel
03e5ac3078 Merge branch 'topic/awelzel/topic/awelzel/2698-sqlite-backend-options'
* topic/awelzel/topic/awelzel/2698-sqlite-backend-options:
  broker/store: Extend SQLiteOptions around data safety and performance
  auxil/broker: Bump submodule
2023-01-30 11:06:27 +01:00
Tim Wojtulewicz
a1b003a9e2 Merge remote-tracking branch 'origin/topic/timw/enable-debian10-prs'
* origin/topic/timw/enable-debian10-prs:
  Enable Debian 10 builds for PRs
2023-01-28 09:47:05 -07:00
Tim Wojtulewicz
c6af2b2a8b Merge remote-tracking branch 'origin/topic/timw/update-smb1-test-pcap'
* origin/topic/timw/update-smb1-test-pcap:
  Update smb1-OSS-fuzz-54883.pcap to have correct snaplen
2023-01-28 08:52:44 -07:00
Tim Wojtulewicz
bb094e30bf Merge remote-tracking branch 'origin/topic/awelzel/2726-smb1-expr-error-with-tree-connect-response'
* origin/topic/awelzel/2726-smb1-expr-error-with-tree-connect-response:
  smb1: Prevent accessing uninitialized referenced_tree
2023-01-27 13:25:08 -07:00
Tim Wojtulewicz
3216817d89 Merge remote-tracking branch 'origin/topic/timw/pvs-studio-findings'
* origin/topic/timw/pvs-studio-findings:
  Add tooling section to README
  A bunch of other minor issues reported by PVS-Studio
  Simplify setup of IPv6 DNS resolvers
  Add missing assignment operators to RobustDictIterator
  Fix some member-variable shadowing issues
  Fix/simplify some if statement comparisons
  Fix a few minor int pointer value initializations
  Fix a bunch of missing class member initializations
  Remove unnecessary virtual specifiers from final classes
2023-01-27 13:23:23 -07:00
Tim Wojtulewicz
6876462f48 Merge remote-tracking branch 'origin/topic/timw/teredo-detect-length-check'
* origin/topic/timw/teredo-detect-length-check:
  Add a few extra length checks to Teredo::DetectProtocol
2023-01-27 12:08:34 -07:00
Arne Welzel
589e042e26 Merge branch 'topic/awelzel/ci-notification-adaption'
* topic/awelzel/ci-notification-adaption:
  github: cat the check_suite payload
  github: Send emails for success conclusion, too
2023-01-27 18:45:32 +01:00
Arne Welzel
e9caea9694 Merge branch 'topic/awelzel/2696-mysql-analyzer-issues'
* topic/awelzel/2696-mysql-analyzer-issues:
  testing/mysql: Add traces recorded with a free-tier MySQL instance
  MySQL: Fix endianness, introduce mysql_eof() event
2023-01-27 11:25:23 +01:00
Arne Welzel
1772a1bd6d Merge branch 'topic/awelzel/no-abort-identified-not-defined'
* topic/awelzel/no-abort-identified-not-defined:
  Tame error reporting and abort() for undefined types
2023-01-26 20:07:14 +01:00
Tim Wojtulewicz
9a96e3b52a Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump spicy to v1.6.1.
2023-01-26 10:55:08 -07:00
Tim Wojtulewicz
a27a3532d8 Merge remote-tracking branch 'origin/topic/timw/2658-avoid-teredo-violations'
* origin/topic/timw/2658-avoid-teredo-violations:
  Update external testing repo commit hashes for Teredo changes
  Update scripts.base.frameworks.analyzer.logging btest to use a different trace file
  Update btest baselines due to reduced calls to UID::Set
  Rework TeredoAnalzyer::DetectProtocol to not catch as many packets
2023-01-26 09:44:48 -07:00
Tim Wojtulewicz
8a9dd7b0ae Merge remote-tracking branch 'origin/topic/timw/2669-for-loop-error'
* origin/topic/timw/2669-for-loop-error:
  GH-2669: Give script location for type clash in for-loop construction
2023-01-26 09:11:51 -07:00
Arne Welzel
c414136288 Merge branch 'topic/awelzel/ci-skip-some-tasks'
* topic/awelzel/ci-skip-some-tasks:
  cirrus: Introduce SKIP_TASK_ON_PR
2023-01-26 14:38:08 +01:00
Tim Wojtulewicz
252fb581e7 Merge remote-tracking branch 'origin/topic/vern/add-C++-removal'
* origin/topic/vern/add-C++-removal:
  removed -O add-C++ option and updated documentation
2023-01-25 14:11:10 -07:00
Tim Wojtulewicz
8d815feb34 Merge remote-tracking branch 'origin/topic/timw/2684-remove-vxlan-violations'
* origin/topic/timw/2684-remove-vxlan-violations:
  GH-2684: Stop violating VXLAN for forwarding failures
2023-01-25 11:12:25 -07:00
Tim Wojtulewicz
31ff9a45de Merge remote-tracking branch 'origin/topic/timw/testing-c++-branch-benchmarks'
* origin/topic/timw/testing-c++-branch-benchmarks:
  Fix CI benchmark script to properly urlencode arguments
2023-01-25 08:19:08 -07:00
Tim Wojtulewicz
a82f743bcc Merge remote-tracking branch 'origin/topic/timw/test-bad-rdp-keyboard'
* origin/topic/timw/test-bad-rdp-keyboard:
  Add test for new handling of unknown RDP keyboards
2023-01-24 09:01:51 -07:00
Tim Wojtulewicz
ac7e7f9ed9 Merge remote-tracking branch 'origin/topic/vern/Jan23-C++-maint'
* origin/topic/vern/Jan23-C++-maint:
  Maintenance updates for -O gen-C++ / -O gen-standalone-C++   fixes for using BiFs in standalone global initializations   avoiding redundant global initializations   updates to maintenance scripts and notes   removal of an unused member variable
2023-01-23 14:35:24 -07:00
Tim Wojtulewicz
6cfb45d24f Merge remote-tracking branch 'jeff-bb/patch-2'
* jeff-bb/patch-2:
  Log raw keyboard value on best guess
  Avoid excessive fmt calls, return default behavior on unknown
  "Best Guess" unknown keyboard / language variants
2023-01-23 12:50:23 -07:00
Tim Wojtulewicz
6e59793da6 Merge remote-tracking branch 'jeff-bb/patch-1'
* jeff-bb/patch-1:
  Remove Duplicate 4122 Croatian
  Revert Sort
  Update RDP Keyboard Languages
2023-01-23 09:37:59 -07:00
Tim Wojtulewicz
80a3f5814b Merge remote-tracking branch 'origin/topic/timw/zeek-path-dev'
* origin/topic/timw/zeek-path-dev:
  Reduce startup time on Windows by using std::filesystem::canonical
  Fix diff-remove-abspath to ignore Windows drive letters
  Re-enable the float/double versions of hton{d,f} on Windows
  Make sure the DEBUG flag is defined when building in debug mode
  Don't close the kqueue manually on shutdown on Windows
  Fix MSVC compiler warning due to a type mismatch
  GH-2565: Update libunistd submodule to fix builds on VS2022
  GH-2641: Lazy-load syslog to avoid creating bro.log on Windows
  Use newer diff on Alpine for --strip-trailing-ci
  Update btest submodule to version that supports Windows
  Use pathsep btest value in btest.cfg
  Use build_dir btest value in btest.cfg
  Fix zeek-path-dev.sh creation to better support Windows
2023-01-19 09:14:27 -07:00
Arne Welzel
b4cb5e753a Merge branch 'topic/awelzel/fix-zam-memory-leak'
* topic/awelzel/fix-zam-memory-leak:
  testing/btest: Add ZAM basic test
  Fix ZAM memory leak as reported in #2634
2023-01-18 17:14:56 +01:00
Arne Welzel
d4a84e7442 Merge remote-tracking branch 'origin/topic/vern/dup-rec-fields2'
* origin/topic/vern/dup-rec-fields2:
  fix for crashes when record definitions repeat a field name

Removed dead if !init code during merge.
2023-01-12 09:42:50 +01:00
Christian Kreibich
144cadf6cd Merge branch 'topic/christian/ci-updates'
* topic/christian/ci-updates:
  CI: remove Fedora 35, now EOL
  CI: avoid deprecated ::set-output use
  CI: move action/checkout use to v3
2023-01-11 17:02:55 -08:00
Arne Welzel
4396124d89 Merge remote-tracking branch 'origin/topic/christian/file-event-docstrings'
* origin/topic/christian/file-event-docstrings:
  Expand docstrings of file_new and file_over_new_connection events
2023-01-10 10:31:17 +01:00
Tim Wojtulewicz
873134f70e Merge remote-tracking branch 'origin/topic/timw/all-the-fuzzing'
* origin/topic/timw/all-the-fuzzing:
  Add error and abort if fuzzer requested is not found
  Add a bunch of new fuzzers and corpus data
2023-01-05 09:53:58 -07:00
Arne Welzel
3b10d0f6de Merge remote-tracking branch 'origin/topic/awelzel/topic/awelzel/improved-event-disabling'
* origin/topic/awelzel/topic/awelzel/improved-event-disabling:
  EventRegistry/Func: Disable events when all bodies are disabled
2023-01-05 12:13:36 +01:00
Tim Wojtulewicz
a778e3158a Merge remote-tracking branch 'origin/topic/timw/sprintf-warnings'
* origin/topic/timw/sprintf-warnings:
  Fix sprintf warnings on macOS
2023-01-03 15:44:54 -07:00
Tim Wojtulewicz
35f5646489 Merge remote-tracking branch 'origin/topic/timw/2521-rename-copying-3rdparty'
* origin/topic/timw/2521-rename-copying-3rdparty:
  Update COPYING to 2023
  Rename COPYING.3rdparty to COPYING-3rdparty
2023-01-03 12:10:29 -07:00
Tim Wojtulewicz
9abe00019d Merge remote-tracking branch 'origin/topic/timw/2578-cirrus-ventura'
* origin/topic/timw/2578-cirrus-ventura:
  CI: avoid doing Windows builds with every push
  CI: drop macOS Big Sur, add macOS Ventura
2023-01-03 12:09:31 -07:00
Tim Wojtulewicz
3573fbb291 Merge remote-tracking branch 'origin/topic/timw/2637-bro-symlink'
* origin/topic/timw/2637-bro-symlink:
  GH-2637: Re-remove the bro symlink wrapper
2022-12-16 08:16:39 -07:00
Christian Kreibich
92e4c11914 Merge remote-tracking branch 'origin/topic/awelzel/push-to-docker-hub-zeek'
* origin/topic/awelzel/push-to-docker-hub-zeek:
  Docker Hub: Push images to zeek/zeek and zeek/zeek-dev
2022-12-13 21:51:57 -08:00
Tim Wojtulewicz
91e14a43fd Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump Spicy and spicy-plugin to latest releases.
2022-12-13 10:25:43 -07:00
Arne Welzel
061c066a51 Merge remote-tracking branch 'origin/topic/awelzel/fix-dump-events-test'
* origin/topic/awelzel/fix-dump-events-test:
  Func: Use std::stable_sort() for sorting bodies by priority
  btest/dump-events: Do not skip everywhere and update baselines
2022-12-13 11:51:12 +01:00
Arne Welzel
f1bcb5dad9 Merge remote-tracking branch 'origin/topic/awelzel/topic/awelzel/disable-stream-event-groups-take-two'
* origin/topic/awelzel/topic/awelzel/disable-stream-event-groups-take-two:
  testing/external: Bump cluster testing commit
  logging: Add event_groups to Stream
  zeek.bif: Add has_event_group() / has_module_events()
2022-12-13 11:38:25 +01:00
Arne Welzel
33244ae75f Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Dec22'
* origin/topic/vern/script-opt-maint.Dec22:
  maintenance updates for -O C++
  maintenance updates for -O ZAM
  update test suite to avoid GH-2385 problems, including incorrect typing
2022-12-09 16:08:26 +01:00
Arne Welzel
ded011ef02 Merge remote-tracking branch 'origin/topic/awelzel/dfa-transition-counter'
* origin/topic/awelzel/dfa-transition-counter:
  dfa: Remove transition_counter
2022-12-08 10:28:34 +01:00
Arne Welzel
a349679a4c Merge remote-tracking branch 'origin/topic/awelzel/2629-notice-file-info'
* origin/topic/awelzel/2629-notice-file-info:
  analyzer/files: handle non-analyzer names in describe_file()
  frameworks/notice: Handle fa_file with no or more than a single connection better
2022-12-06 12:23:47 +01:00
Arne Welzel
7bbdce61e8 Merge remote-tracking branch 'origin/topic/awelzel/2547-fix-supress-weird-spelling'
* origin/topic/awelzel/2547-fix-supress-weird-spelling:
  ContentLine: Fix spelling of "suppress", deprecate SupressWeirds()
2022-12-06 12:18:36 +01:00
Arne Welzel
d9b7da334d Merge branch 'topic/fox-ds/ssh-key-init-events' of github.com:fox-ds/zeek
* 'topic/fox-ds/ssh-key-init-events' of github.com:fox-ds/zeek:
  Added several events for detailed info on the SSH2 key init directions

* Straightened out the zeek:see lines in events.bif to be the same across all events.
2022-12-06 10:04:53 +01:00
Arne Welzel
cd20766ed0 Updating CHANGES and VERSION. 2022-12-05 11:32:53 +01:00
Christian Kreibich
dbd5f4e1b7 Merge remote-tracking branch 'origin/topic/awelzel/2628-is-used-multiple'
* origin/topic/awelzel/2628-is-used-multiple:
  ID: Add AddAttr() helper
  Attr: Duplicated &is_used is allowed
2022-12-04 18:37:11 -08:00
Christian Kreibich
3c33728a2a Merge branch 'topic/awelzel/trailing-commas'
* topic/awelzel/trailing-commas:
  parse.y: Allow trailing commas for table, set, vector and record construction
2022-12-02 18:39:22 -08:00
Christian Kreibich
1c381b5531 Merge branch 'topic/christian/gh-846-tcp-duration-docs'
* topic/christian/gh-846-tcp-duration-docs:
  Expand Conn::Info$duration comment to clarify TCP end-of-connection handling
2022-11-30 09:42:18 -08:00
Johanna Amann
d38e227a04 Merge remote-tracking branch 'origin/topic/awelzel/2583-mqtt-cluster-testing-follow-up'
* origin/topic/awelzel/2583-mqtt-cluster-testing-follow-up:
  testing/external: Bump cluster testsuite
2022-11-30 15:41:50 +00:00
Johanna Amann
12774ae757 Merge remote-tracking branch 'origin/topic/vern/script-opt-Nov22-maint2'
* origin/topic/vern/script-opt-Nov22-maint2:
  script optimization fixes:  new initialization model for standalone C++ scripts  type coercion fix  ZAM fix for compiling using C++ optimizer  disambiguate empty constructors
2022-11-30 13:51:56 +00:00
Christian Kreibich
f5ce597125 Merge remote-tracking branch 'origin/topic/awelzel/smb-follow-up-cleanup-six-years-later'
* origin/topic/awelzel/smb-follow-up-cleanup-six-years-later:
  smb: Drop references to uid_map in state.
  smb: Drop AUTH_LOG
2022-11-29 14:59:59 -08:00
Christian Kreibich
b4aaf2c1ef Merge branch 'topic/christian/ci-add-fedora-37'
* topic/christian/ci-add-fedora-37:
  CI: add Fedora 37
2022-11-29 12:12:47 -08:00