Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 23:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10798 commits 384 branches 195 tags 258 MiB
Commit graph

1825 commits

Author SHA1 Message Date
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
Jon Siwek
6184a495f0 Update embedded CAF in Broker to 0.17.2 2019-10-21 09:35:25 -07:00
Johanna Amann
50f7969e15 Merge remote-tracking branch 'origin/topic/neverlord/select-cmake' 
* origin/topic/neverlord/select-cmake:
  Fix check for cmake commands on POSIX shells
  Prefer cmake3 command, add --cmake=PATH option
 2019-10-21 11:43:10 +02:00
Johanna Amann
af76637c96 Update zeekctl submodule pointer. 
This changes the gzip compression level to the default from 9.

Fixes GH-614

 [nomail]
 2019-10-17 16:33:37 -07:00
Jon Siwek
1a4aeb91e2 Merge remote-tracking branch 'origin/topic/jsiwek/update-pybind11' 
* origin/topic/jsiwek/update-pybind11:
  Update broker submodule to use pybind11 v2.4.3
 2019-10-16 10:03:35 -07:00
Johanna Amann
5265613a9e Merge remote-tracking branch 'origin/topic/jsiwek/gh-618-tcp-option-values' 
* origin/topic/jsiwek/gh-618-tcp-option-values:
  Add weirds for invalid TCP option lengths
  GH-618: add "tcp_options" event containing TCP option values
  Fix tcp_option event
 2019-10-15 16:50:43 -07:00
Johanna Amann
f62a51b41b Merge remote-tracking branch 'origin/topic/jsiwek/fix-table-default-redef' 
* origin/topic/jsiwek/fix-table-default-redef:
  Fix redef'ing a table with a new &default attribute
 2019-10-14 22:06:35 -07:00
Johanna Amann
66effde97d Merge remote-tracking branch 'origin/topic/seth/624' 
* origin/topic/seth/624:
  Support whitespace at end of line for config reader.

This merge fixes a failing test; it also sprinkles a few more spaces
into another test file.

The main change is that this now also works with configuration lines
that don't have a value.
 2019-10-14 21:47:59 -07:00
Johanna Amann
705210a035 Merge remote-tracking branch 'origin/topic/dev/bugrpone-narrowing-conversions-base64' 
* origin/topic/dev/bugrpone-narrowing-conversions-base64:
  Proof of Concept on Bugprone Narrowing Conversions: Base64

I fixed a few bugs in this while merging; Decode now signals success or
error (which did not work before). I removed the new variables in
mime.cc and just switched more to size_t - the new variables introduced
a bug because they shadowed the changes of the Decode call.

GH-616
 2019-10-14 20:19:02 -07:00
Jon Siwek
6a99567a79 Merge remote-tracking branch 'origin/topic/jsiwek/travis-dist-trusty' 
* origin/topic/jsiwek/travis-dist-trusty:
  Use Ubuntu 14.04 for Travis CI environment
 2019-10-12 10:40:55 -07:00
Johanna Amann
916205e254 Merge remote-tracking branch 'origin/topic/jsiwek/print-raw-bif' 
* origin/topic/jsiwek/print-raw-bif:
  Add new BIF: print_raw()
 2019-10-08 15:15:55 -07:00
Johanna Amann
e615d1f4a8 Merge remote-tracking branch 'origin/topic/jsiwek/gh-589-sub-microsecond-printing' 
* origin/topic/jsiwek/gh-589-sub-microsecond-printing:
  GH-589: improve printing of sub-microsecond intervals
 2019-10-07 10:51:40 -07:00
Johanna Amann
09f4053dbc Merge remote-tracking branch 'origin/topic/jsiwek/gh-591-set-enum-config' 
* origin/topic/jsiwek/gh-591-set-enum-config:
  GH-591: allow Config::set_value() to use empty/unspecified table/sets
  GH-591: fix reading set[enum] values from input files
 2019-10-07 10:46:45 -07:00
Jon Siwek
8ba19cd7d1 Merge remote-tracking branch 'origin/topic/neverlord/issue/612' 
* origin/topic/neverlord/issue/612:
  Fix build with external CAF but bundled Broker
 2019-10-02 11:04:47 -07:00
Jon Siwek
a5d71ed2d2 Merge remote-tracking branch 'origin/topic/timw/595-json-perf' 
* origin/topic/timw/595-json-perf:
  Update COPYING.3rdparty
  Use json::emplace to avoid some extra calls to operator[]
  Use tessil/unordered-map instead of nlohmann/fifo-map to mitigate performance issues when logging JSON
 2019-10-01 16:42:59 -07:00
Robin Sommer
e263589140 Merge remote-tracking branch 'origin/topic/jsiwek/fix-to-json-record-leak' 
* origin/topic/jsiwek/fix-to-json-record-leak:
  Improve RecordVal JSON formatting
  Fix memory leak in RecordVal JSON formatting
 2019-10-01 09:06:30 +00:00
Johanna Amann
1b02aebe4e Merge remote-tracking branch 'origin/topic/jsiwek/paraglob-headers' 
* origin/topic/jsiwek/paraglob-headers:
  GH-602: fix paraglob header inclusion, installation, and search paths
 2019-09-30 21:10:12 -07:00
Jon Siwek
97519e4350 Merge remote-tracking branch 'origin/topic/timw/606-json-nulls' 
* origin/topic/timw/606-json-nulls:
  GH-606: Output nulls into json data if a field isn't set
 2019-09-30 17:40:27 -07:00
Jon Siwek
1253a61340 Simplify reassembly code using DataBlockList::LastBlock() 2019-09-24 10:26:09 -07:00
Robin Sommer
e30035910e Add missing commit to previous merge. 
(This was a leftover from a merge conflict.)
 2019-09-24 10:32:40 +00:00
Robin Sommer
c23764483d Merge remote-tracking branch 'origin/topic/jsiwek/reassembly-improvements-map' 
* origin/topic/jsiwek/reassembly-improvements-map:
  Rename a reassembly DataBlockList function
  Add comments to reassembly classes
  Use DataBlock value instead of pointer in reassembly map
  Remove linked list from reassembly data structures
  Use an std::map for reassembly DataBlock searches
  Refactor Reassembler/DataBlock bookkeeping
  Reorganize reassembly data structures
  Remove a superfluous reassembler DataBlock member
 2019-09-24 09:16:51 +00:00
Jon Siwek
916491e2b4 Merge remote-tracking branch 'origin/topic/neverlord/scaffolding' 
* origin/topic/neverlord/scaffolding:
  Fix second overly specific include_directories
  Add --build-dir as alias for --builddir
  Fix overly specific include_directories usage
 2019-09-23 13:09:04 -07:00
Jon Siwek
bd6f89da05 Merge remote-tracking branch 'origin/topic/robin/cid-1402823' 
- Fixed a reference counting issue

* origin/topic/robin/cid-1402823:
  Fix for CIDs 1402823 and 1394050.
 2019-09-20 10:42:58 -07:00
Jon Siwek
0a2d84284c Update header include guard in zeek-config.h/bro-config.h 2019-09-19 16:41:04 -07:00
Jon Siwek
aeef4bf030 Merge branch 'topic/jgras/dpd-late-match' of https://github.com/J-Gras/zeek 
* 'topic/jgras/dpd-late-match' of https://github.com/J-Gras/zeek:
  Improve dpd_late_match event generation.
  Improve logging of speculative service.
  Update test-all-policy script.
  Add speculative service script.
  Allow to handle late DPD matches.
 2019-09-17 11:17:41 -07:00
Robin Sommer
6f9d1ec72d Merge remote-tracking branch 'origin/topic/jsiwek/gh-566-fix-ssh-encrypted-packet' 
* origin/topic/jsiwek/gh-566-fix-ssh-encrypted-packet:
  GH-566: fix cases where ssh_encrypted_packet event wasn't raised
 2019-09-17 17:22:27 +00:00
Jon Siwek
1affbad4b7 Merge remote-tracking branch 'origin/topic/neverlord/header-guards' 
* origin/topic/neverlord/header-guards:
  Switch from header guards to pragma once
 2019-09-17 10:09:04 -07:00
Jon Siwek
b19ffba25f Merge branch 'patch-1' of https://github.com/dcode/zeek 
* 'patch-1' of https://github.com/dcode/zeek:
  Add additional 3rd party headers to includes
 2019-09-17 09:33:46 -07:00
Jon Siwek
83180a2553 Merge remote-tracking branch 'origin/topic/timw/coverity-fixes' 
* origin/topic/timw/coverity-fixes:
  Add move assignment operator to logging::Tag (Coverity 1357732)
  Throw an error during input::Manager::CreateTableStream if val is null (Coverity 1402730)
  Use ntohl instead of manually swapping bytes in extract_XDR_uint32 (Coverity 1375796 and others)
  Add check for null init variable during make_var. (Coverity 1403419)
  Remove dead check in Val::check_and_promote. (Coverity 1401810)
  Handle failure of fcntl in Pipe. (Coverity 1241934, 1241935)
  Initialize missing field in File. (Coverity 1057851, 1057852, 1057853)
  Add null check for results of dynamic_cast in AssignExpr::TypeCheck. Fixes coverity findings 1403416 and 1403417
  Add null check when getting key size for List types. Fixes coverity finding 1058242
 2019-09-16 17:15:32 -07:00
Jon Siwek
9c8db5f6ca Stop loading scan detection in local.zeek by default 2019-09-16 10:51:50 -07:00
Jon Siwek
f6f471f4b7 Update Broker include dir search path 
Related to https://github.com/zeek/broker/issues/51
 2019-09-04 16:29:04 -07:00
Jon Siwek
c88568db4d Update embedded CAF to 0.17.1 (plus cherry-picked memory leak fix) 2019-09-04 13:42:55 -07:00