Commit graph

2206 commits

Author SHA1 Message Date
Tim Wojtulewicz
1e41d7f583 Merge remote-tracking branch 'origin/topic/jsiwek/doctest-leakcheck'
* origin/topic/jsiwek/doctest-leakcheck:
  Enable LeakSanitizer for unit tests run via doctest
2020-01-09 11:38:28 -08:00
Tim Wojtulewicz
d845627daa Merge remote-tracking branch 'origin/topic/jazoff/ntlm-field-error'
* origin/topic/jazoff/ntlm-field-error:
  fix NTLM field value access
2020-01-09 10:26:00 -08:00
Jon Siwek
66ca20b737 Increase timeout for a few btests
Saw these start being sensitive running an "ASan -O0" build locally
2020-01-08 10:31:16 -08:00
Jon Siwek
3273169385 Preserve optimization setting for sanitizer build 2020-01-07 20:58:35 -08:00
Jon Siwek
0c55b01ec9 Merge remote-tracking branch 'origin/topic/timw/fix-x509-build-warning'
* origin/topic/timw/fix-x509-build-warning:
  Fix build warning in X509 plugin
2020-01-06 16:46:17 -08:00
Jon Siwek
d581aa76aa Merge remote-tracking branch 'origin/topic/dev/patterns-in-sets'
Fixes in merge:
- Memory leak in HashKey ctor
- Minor whitespace/style changes

* origin/topic/dev/patterns-in-sets:
  Enable Patterns as Table index in non singleton cases
  Added support to create a Hashkey for PatternVals using their Pattern Texts
2020-01-06 14:15:30 -08:00
Tim Wojtulewicz
71e6893441 Merge remote-tracking branch 'origin/topic/jsiwek/fix-hexdump-warning'
* origin/topic/jsiwek/fix-hexdump-warning:
  Fix snprintf compiler warning in hexdump BIF
2020-01-06 14:16:55 -07:00
Jon Siwek
149d3b4828 Increase a timeout for a btest 2020-01-06 11:20:30 -08:00
Jon Siwek
0cde6d2af5 Fix Cirrus CI FreeBSD python dependencies installation 2020-01-06 10:51:17 -08:00
Tim Wojtulewicz
65a4e36a92 Merge remote-tracking branch 'origin/topic/jsiwek/asan'
* origin/topic/jsiwek/asan: (28 commits)
  Increase timeout for a btest
  Switch CI scripts to use ASAN/LSAN instead of gperftools
  Remove redundant memory leak btests
  Fix reference counting issues related to lambdas/closures
  Disable LeakSanitizer for btests that have known leaks
  Rewrite the btest for when-statement timeouts
  Fix memory leak when a logging plugin hook prevents a write
  Fix memory leaks in various input framework error-handling cases
  Fix memory leak in Reporter::get_weird_sampling_whitelist() BIF
  Fix reference counting of Log::Filter "config" field
  Fix memory leak in system_env() BIF
  Clean up triggers awaiting global state modification at shutdown
  Fix memory leak in initializing log writers with no local backend
  Fix packet filter memory leaks
  Skip sending thread heartbeat if it alread asked to be finished
  Fix memory leak of sqlite input reader prepared statement
  Prevent duplicate "finish" threading messages
  Fix memory leak when table-based input stream overwrites old entries
  Fix scripting error in a DHCP btest
  Fix memory leaks in Kerberos ticket decryption
  ...
2020-01-06 11:20:47 -07:00
Jon Siwek
a4fab5327a Merge remote-tracking branch 'origin/topic/timw/util-unit-tests'
* origin/topic/timw/util-unit-tests:
  fixup! Add unit tests to util.cc and module_util.cc
  Mark safe_snprintf and safe_vsnprintf as deprecated, remove uses of them
  Add unit tests to util.cc and module_util.cc
2020-01-06 09:44:43 -08:00
Jon Siwek
84e3bc7aca Add GitHub Action for CI notification emails 2019-12-18 13:36:40 -08:00
Jon Siwek
52f97c7e45 Update encrypted key used for CI access 2019-12-18 13:24:47 -08:00
Jon Siwek
92c2074193 Merge remote-tracking branch 'origin/topic/timw/599-json-leak'
* origin/topic/timw/599-json-leak:
  GHI-599: avoid memory leak with default pattern matching and json formatting
2019-12-16 09:40:43 -08:00
Jon Siwek
5658a529f0 Update URL for Malware Hash Registry website 2019-12-16 08:22:46 -08:00
Tim Wojtulewicz
679da0b15b Merge remote-tracking branch 'origin/topic/jsiwek/gh-700-zeek-args-bif'
* origin/topic/jsiwek/gh-700-zeek-args-bif:
  GH-700: add zeek_args() BIF
2019-12-05 12:36:35 -07:00
Tim Wojtulewicz
5c85b083b6 Merge remote-tracking branch 'origin/topic/jsiwek/gh-700-packet-sources-bif'
* origin/topic/jsiwek/gh-700-packet-sources-bif:
  GH-700: add packet_sources() BIF
2019-12-05 11:58:06 -07:00
Tim Wojtulewicz
33571e7d19 Merge remote-tracking branch 'origin/topic/devbali/use-new-zeek-logo'
* origin/topic/devbali/use-new-zeek-logo:
  Use new Zeek Logo instead of Bro Eyes on README.md
2019-12-04 14:44:00 -07:00
Jon Siwek
30d0b21ecc Merge remote-tracking branch 'origin/topic/dev/print-to-log'
Adjustments during merge:

- kept the UNKNOWN Log::ID as placeholder value
- changed the coverage.find-bro-logs test to check for arbitrary $path
  field values instead of just string literals
- don't force EnumVal to unsigned integer since the relevant union member
  is the signed integer and added the relevant enum values/types to
  .bif files for easier access
- compare FILE* versus file name to check for stdout equality (don't
  think it matters much, just a bit more efficient)
- minor whitespace/style tweaks

* origin/topic/dev/print-to-log:
  Added a non boolean configuration and other changes as suggested by Jon
  Allow Print Statements to be redirected to a Log# This is a combination of 3 commits.
2019-12-02 13:47:09 -08:00
Johanna Amann
e5db1f085c Merge remote-tracking branch 'origin/topic/jsiwek/gh-684-fix-rpc-parsing'
* origin/topic/jsiwek/gh-684-fix-rpc-parsing:
  GH-684: Fix parsing of RPC calls with non-AUTH_UNIX flavors

Addresses GH-684
2019-11-21 08:50:28 -08:00
Johanna Amann
5dafa7218d Merge remote-tracking branch 'origin/topic/jsiwek/fix-zeek-profiler-file'
* origin/topic/jsiwek/fix-zeek-profiler-file:
  Fix ZEEK_PROFILER_FILE file format/parsing
2019-11-21 08:37:04 -08:00
Robin Sommer
a00f139f1c Merge remote-tracking branch 'origin/topic/jsiwek/gh-646-conn-removal'
Clarified doc strings a bit.

* origin/topic/jsiwek/gh-646-conn-removal:
  GH-646: add new "successful_connection_remove" event
2019-11-18 12:08:12 +00:00
Jon Siwek
620b789126 Updating submodule(s).
[nomail]
2019-11-15 18:28:44 -08:00
Jon Siwek
17fd371eae Merge remote-tracking branch 'origin/topic/neverlord/doctest'
- Minor whitespace tweaks
- Add line to build summary output for whether unit tests are enabled

* origin/topic/neverlord/doctest:
  Add doctest license and copyright
  Integrate review feedback
  Fix submodule reference for doctest
  Add initial scaffold for unit testing via doctest
2019-11-14 19:17:37 -08:00
Jon Siwek
0e0063335a Merge branch 'topic/simon/configure-fail-hint' of https://github.com/simonhf/zeek
- Adjusted the hint text a bit during merge

* 'topic/simon/configure-fail-hint' of https://github.com/simonhf/zeek:
  Add hint to run make distclean if configure fails
2019-11-14 17:30:06 -08:00
Jon Siwek
2395a73f26 Install test-all-policy.zeek script
The zeekygen script, which is already installed, refers to it, and
could also generally be useful for "test everything" type scenarios.
2019-11-14 17:00:29 -08:00
Jon Siwek
ca48a1865d Merge branch 'improve-container-record-fields-bif' of https://github.com/henridf/zeek
- Minor whitespace adjustment in merge

* 'improve-container-record-fields-bif' of https://github.com/henridf/zeek:
  Recursively handle into container types in record_fields()
  tabify
  Apply suggestions from code review
  Print full container types in record_fields()
2019-11-13 13:46:27 -08:00
Jon Siwek
eaa1350656 Update embedded CAF to 0.17.3 2019-11-11 13:40:31 -08:00
Johanna Amann
b86a8acc2b Merge remote-tracking branch 'origin/topic/jsiwek/improve-record-fields-bif'
* origin/topic/jsiwek/improve-record-fields-bif:
  Allow record_fields() string arguments that name a record type
2019-11-07 13:49:14 -08:00
Jon Siwek
5cece12333 Merge remote-tracking branch 'origin/topic/neverlord/intrusive-ptr'
* origin/topic/neverlord/intrusive-ptr:
  Add API documentation to IntrusivePtr
  Rename make{ Counted => _intrusive }
  Remove braces around single return statements
  Integrate review feedback
  Add and use new IntrusivePt type in Zeek
2019-11-05 09:56:07 -08:00
Jon Siwek
872adda5b1 Merge branch 'topic/jsbarber/ftp-cluster-fix-patch' of https://github.com/jsbarber/zeek
Minor cleanup in merge: remove print statements and unnecessary @if
directive.

* 'topic/jsbarber/ftp-cluster-fix-patch' of https://github.com/jsbarber/zeek:
  Publish ftp_data_expected updates to other workers for synchronization
2019-11-04 17:31:59 -08:00
Jon Siwek
1afcb5c993 Merge remote-tracking branch 'origin/topic/neverlord/object-libraries'
* origin/topic/neverlord/object-libraries:
  Update CMake submodule
  Use object libraries for subdir libs and plugins
2019-11-04 16:57:37 -08:00
Jon Siwek
e34562df48 Fix error handling in decode_base64() 2019-11-04 10:00:17 -08:00
Jon Siwek
b6def63167 Revert "Merge remote-tracking branch 'origin/topic/dev/bugrpone-narrowing-conversions-base64'"
This reverts commit 705210a035.
The original changes broke the Base64.h API which may be used by
external plugins.

Fixes GH-676
2019-11-04 09:47:56 -08:00
Jon Siwek
33c26e9ea3 Use #pragma once in Base64.h 2019-11-01 15:59:15 -07:00
Jon Siwek
295c28b48e Merge remote-tracking branch 'origin/topic/jsiwek/fix-coverity-ci'
* origin/topic/jsiwek/fix-coverity-ci:
  Fix Travis CI script to run Coverity build in container
2019-10-31 12:18:49 -07:00
Johanna Amann
6775463f13 Merge remote-tracking branch 'origin/topic/jsiwek/remove-header-usings'
* origin/topic/jsiwek/remove-header-usings:
  Remove "using namespace std" from header files
2019-10-31 06:37:52 +01:00
Jon Siwek
49c59ceb99 GH-649: define missing DLT_NFLOG to support OpenBSD 2019-10-30 15:05:53 -07:00
Jon Siwek
90771d4aba Merge remote-tracking branch 'origin/topic/johanna/configure-libdir'
* origin/topic/johanna/configure-libdir:
  Add --libdir convenience flag to configure.
2019-10-30 13:33:36 -07:00
Jon Siwek
13a431f9fb Merge branch 'master' of https://github.com/redsand/zeek
- Simplified this to just return result of inet_pton

* 'master' of https://github.com/redsand/zeek:
  adds missing ipv6 support for patricia trie index (white/blacklist) under *nix. only worked for nt before..
2019-10-30 11:03:59 -07:00
Robin Sommer
82f656ec9c Merge remote-tracking branch 'origin/topic/jsiwek/gh-664-tcp-syn-data-signatures'
* origin/topic/jsiwek/gh-664-tcp-syn-data-signatures:
  GH-664: fix signature matching for payload-carrying SYN packets
2019-10-30 08:07:47 +00:00
Jon Siwek
7b9a27c96a Merge remote-tracking branch 'origin/topic/johanna/remove-build-unique'
* origin/topic/johanna/remove-build-unique:
  Replace build_unique with make_unique
2019-10-29 09:42:55 -07:00
Jon Siwek
36d7628bcb Install cmake3 from EPEL on CentOS CI system 2019-10-28 20:18:45 -07:00
Jon Siwek
2613640abe Merge remote-tracking branch 'origin/topic/neverlord/cmake3'
* origin/topic/neverlord/cmake3:
  Fix position of project(), require CMake 3
2019-10-28 18:31:51 -07:00
Johanna Amann
44086c1f03 Merge remote-tracking branch 'origin/topic/jsiwek/gh-654-coerce-unspecified-table-defaults'
* origin/topic/jsiwek/gh-654-coerce-unspecified-table-defaults:
  GH-654: allow table() in function &default expressions
  GH-654: allow table() in record &default expressions

Fixes GH-654
2019-10-28 20:59:39 +01:00
Robin Sommer
505ed8f32f Updating submodule(s).
[nomail]
2019-10-28 10:59:29 +00:00
Robin Sommer
d0060df0fe Updating submodules. 2019-10-28 10:09:42 +00:00
Robin Sommer
9d7c9f37d4 Merge branch 'Fix_http_build_url' of ssh://github.com/Olerdrive/zeek
I changed the format string of the port to %d and added a test.
2019-10-28 09:32:32 +00:00
Jon Siwek
691fd5c9a4 Change usage of old bro:see directive to zeek:see 2019-10-25 10:42:05 -07:00
Jon Siwek
cf05b1d7dc Merge branch 'fix-typo' of https://github.com/keithjjones/zeek
* 'fix-typo' of https://github.com/keithjjones/zeek:
  Fixed typo.
2019-10-25 10:13:14 -07:00