Commit graph

10798 commits

Author SHA1 Message Date
Noah Treuhaft
2e5f96f5a9 Replace bzero() with memset() 2020-05-14 16:57:27 -07:00
Johanna Amann
62206825e4 Update submodule
[nomail]
2020-05-13 23:04:50 +00:00
Johanna Amann
14671f822f Update submodule
[nomail]
2020-05-13 22:50:10 +00:00
Johanna Amann
2aeb3d8e39 Merge remote-tracking branch 'origin/topic/timw/906-find-all-urls-regex'
* origin/topic/timw/906-find-all-urls-regex:
  Restore previous url scheme capture group
  GH-906: Fix the regex in url.zeek to better match for find_all_urls
2020-05-13 15:05:54 -07:00
Tim Wojtulewicz
323dc29e81 Update submodules 2020-05-13 14:24:13 -07:00
Tim Wojtulewicz
2b668a6c1f Merge remote-tracking branch 'origin/topic/johanna/hash-unification'
* origin/topic/johanna/hash-unification:
  Hash unification: address PR feedback
  Update architecture checks for highwayhash
  Highwayhas: unbreak 32 bit compiles
  Update external test suites for hash changes.
  Hashing: Remove unnecessary include
  Add highwayhash in a more cmake-y way
  Remove highwayhash submodule.
  Switch file UID hashing from md5 to highwayhash.
  Switch most internal md5 calls to digest calls.
  Start refactoring hashing.
  Introduce calculate_digest convenience function
  Remove the siphash->hmac-md5 switch after 36 bytes.
  Fix plugin compile problems with highwayhash
  Replace siphash with Google implementation
2020-05-13 13:49:56 -07:00
Jon Siwek
c55bbcfcda Merge remote-tracking branch 'origin/topic/timw/disable-broker-tests'
* origin/topic/timw/disable-broker-tests:
  Disable broker tests from building on the CI
  Disable broker documentation examples if disabling broker tests
2020-05-13 11:16:30 -07:00
Johanna Amann
892023ed9a Merge remote-tracking branch 'origin/master' into topic/johanna/hash-unification
* origin/master:
  Use zeek::detail namespace for fuzzer utils
  Set terminating flag during fuzzer cleanup
  Add missing include to standalone fuzzer driver
  Improve standalone fuzzer driver error messages
  Test fuzzers against seed corpus under CI ASan build
  Update fuzzing README with OSS-Fuzz integration notes
  Link fuzzers against shared library to reduce executable sizes
  Improve FuzzBuffer chunking
  Fix compiler warning in standalone fuzzer driver
  Adjust minor fuzzing documentation
  Exit immediately after running unit tests
  Add OSS-Fuzz Zeek script search path to fuzzers
  Assume libFuzzer when LIB_FUZZING_ENGINE file doesn't exist
  Change handling of LIB_FUZZING_ENGINE
  Change --enable-fuzzing to --enable-fuzzers
  Add standalone driver for fuzz targets
  Add basic structure for fuzzing targets
2020-05-13 14:19:44 +00:00
Johanna Amann
ce8b121e12 Hash unification: address PR feedback 2020-05-13 14:07:59 +00:00
Tim Wojtulewicz
82978a8860 Merge remote-tracking branch 'origin/topic/jsiwek/fuzzing'
* origin/topic/jsiwek/fuzzing:
  Use zeek::detail namespace for fuzzer utils
  Set terminating flag during fuzzer cleanup
  Add missing include to standalone fuzzer driver
  Improve standalone fuzzer driver error messages
  Test fuzzers against seed corpus under CI ASan build
  Update fuzzing README with OSS-Fuzz integration notes
  Link fuzzers against shared library to reduce executable sizes
  Improve FuzzBuffer chunking
  Fix compiler warning in standalone fuzzer driver
  Adjust minor fuzzing documentation
  Exit immediately after running unit tests
  Add OSS-Fuzz Zeek script search path to fuzzers
  Assume libFuzzer when LIB_FUZZING_ENGINE file doesn't exist
  Change handling of LIB_FUZZING_ENGINE
  Change --enable-fuzzing to --enable-fuzzers
  Add standalone driver for fuzz targets
  Add basic structure for fuzzing targets
2020-05-12 18:53:06 -07:00
Tim Wojtulewicz
6e8053b7d1 Disable broker tests from building on the CI
This results in a ~10% reduction in build time.
2020-05-12 12:21:39 -07:00
Tim Wojtulewicz
63f8897e10 Disable broker documentation examples if disabling broker tests 2020-05-12 12:21:39 -07:00
Johanna Amann
7f137b7d50 Update architecture checks for highwayhash
Now we use cmake to determine which compiler flags are set to
determine which implementation of highwayhash to compile. This should
be much more robust.

Also - fix missing include on old ubuntus.
2020-05-12 12:03:10 -07:00
Johanna Amann
fd5e1ae42a Highwayhas: unbreak 32 bit compiles 2020-05-11 22:12:55 -07:00
Johanna Amann
65434dd518 Update external test suites for hash changes. 2020-05-12 03:44:06 +00:00
Johanna Amann
27d87919a1 Hashing: Remove unnecessary include 2020-05-12 00:30:33 +00:00
Johanna Amann
a259e8bbda Merge remote-tracking branch 'origin/master' into topic/johanna/hash-unification 2020-05-12 00:29:02 +00:00
Johanna Amann
330b997e3a Add highwayhash in a more cmake-y way 2020-05-11 17:19:31 -07:00
Johanna Amann
536fda2e22 Remove highwayhash submodule.
It is moving to 3rdparty...
2020-05-11 16:01:38 -07:00
Michael Dopheide
32653230b7 Log services with unknown protocols 2020-05-11 17:58:45 -05:00
Tim Wojtulewicz
f539723e8e Merge remote-tracking branch 'origin/topic/jsiwek/mmdb-msg-limit'
* origin/topic/jsiwek/mmdb-msg-limit:
  Limit rate at which MMDB error/status messages are emitted
2020-05-11 11:12:12 -07:00
Jon Siwek
61ce1b18fb Limit rate at which MMDB error/status messages are emitted
If there's some bad state we can be in where MMDB lookup/open operations
consistently fail, then the volume of associated reporter messages can
get overwhelmingly large especially if a lookup operation is being done
for each network connection.

This adds a limit of an arbitrary 20 messages every 5 minutes, which
should be enough information to understand the overall
open/close/lookup-failure pattern.
2020-05-08 13:05:24 -07:00
Jon Siwek
73a57335db Merge remote-tracking branch 'origin/topic/timw/unordered-lists'
* origin/topic/timw/unordered-lists:
  Review fixups
  Change timer_list in BroList to be an unordered list.
  Add ability for List to be ordered/unordered
  Add unit testing for List
  Fix bug with List where replace() doesn't work with non-pointer types
2020-05-08 11:52:03 -07:00
Jon Siwek
b5531ecbd3 Merge branch 'set_to_regex-docs' of https://github.com/jlagermann/zeek
- Adjusted the formatting during merge

* 'set_to_regex-docs' of https://github.com/jlagermann/zeek:
  added examples to set_to_regex comments Signed-ff-by: James Lagermann <james.lagermann@corelight.com>
2020-05-08 11:48:44 -07:00
Tim Wojtulewicz
690061b01c Review fixups 2020-05-08 10:46:03 -07:00
James Lagermann
2c04a56236
added examples to set_to_regex comments
Signed-ff-by: James Lagermann <james.lagermann@corelight.com>
2020-05-08 12:31:56 -05:00
Johanna Amann
695457fe44 Unbreak build on Fedora 32 (gcc 10.0.1)
It requires cstdint in a few more headers.
2020-05-07 22:18:04 -07:00
Jon Siwek
9babb7d39f Merge remote-tracking branch 'origin/topic/johanna/958'
- Extended the improved error to cover miss-typed identifiers, too

* origin/topic/johanna/958:
  Fix crash when trying to redef non-existing enum
2020-05-07 17:15:53 -07:00
Johanna Amann
9c44403c62 Fix crash when trying to redef non-existing enum
Fixes GH-958
2020-05-07 14:57:03 -07:00
Johanna Amann
04ed125941 Merge remote-tracking branch 'origin/master' into topic/johanna/hash-unification 2020-05-06 23:18:33 +00:00
Tim Wojtulewicz
8ac591c9f5 Revert addition of final modifier to JSON formatter 2020-05-06 10:40:48 -07:00
Jon Siwek
39c00c9966 Updating CHANGES and VERSION. 2020-05-06 10:04:47 -07:00
Jon Siwek
280bf56786 Fix global buffer over-read in POP3 analyzer
Report and patch by Justin Azoff
2020-05-06 10:00:58 -07:00
Jon Siwek
b749dda520 Fix SSL scripting error leading to access of unitialized field
Reported by Justin Azoff
2020-05-06 09:52:31 -07:00
Johanna Amann
43c0cf1e3d Update submodule
[nomail]
2020-05-05 21:59:21 +00:00
Johanna Amann
7d28a6ee9a Remove outdated comment on set_to_regex.
We can add patterns at runtime since 2.6.
2020-05-05 14:23:33 -07:00
Jon Siwek
156686b237 Correct spelling of DCE/RPC operation string NetrLogonSameLogonWithFlags
Fixes GH-952
2020-05-04 18:03:14 -07:00
Jon Siwek
eff11c5ef4 Merge branch 'network-time-init' of https://github.com/J-Gras/zeek
- Minor whitespace/format adjustments

* 'network-time-init' of https://github.com/J-Gras/zeek:
  Fix documentation for network_time_init.
  Improve network_time_init() test and add baseline.
  Add network_time_init() event.
  Add test for network_time behavior.
2020-05-04 17:51:39 -07:00
Jon Siwek
2d0b8c0b8e Use zeek::detail namespace for fuzzer utils 2020-05-04 17:37:11 -07:00
Jon Siwek
5a2d25c954 Set terminating flag during fuzzer cleanup 2020-05-04 17:29:21 -07:00
Jon Siwek
62ec60b96f Merge remote-tracking branch 'origin/topic/jazoff/avoid-redundant-inactivity-timers'
- Changed the logic significantly to just guarantee there's only ever a
  single inactivity timer per connection

- Updated language.expire_subnet btest which is unduly sensitive to
  timer-related changes

* origin/topic/jazoff/avoid-redundant-inactivity-timers:
  avoid scheduling redundant inactivity timers
2020-05-04 17:12:36 -07:00
Jon Siwek
a2f2f7a0dd Prevent IP fragment reassembly on packets without minimal IP header
The IP fragment reassembly process assumes a packet contains at least
the minimum IP header, but such a check did not previously occur,
resulting in a heap buffer over-read.  For example, a self-reported
IPv4 IHL field with a value less than minimum IPv4 header length of
20 bytes.  Such packets likely aren't routable on their own, but one
can create an artifical pcap like that or possibly encapsulate it
within another protocol to trigger this bug.
2020-05-04 12:41:53 -07:00
V
45a5b1b0cf Remove dupplicate DCE-RPC endpoint 2020-05-04 18:02:04 +02:00
V
7cf8c7a6d2 Add DCE-RPC constants from BZAR project 2020-05-04 17:15:27 +02:00
Jan Grashoefer
0c47b6098b Fix documentation for network_time_init. 2020-05-02 18:29:19 +02:00
Jon Siwek
1fe5454603 Merge remote-tracking branch 'origin/topic/jsiwek/ci-libmaxminddb'
* origin/topic/jsiwek/ci-libmaxminddb:
  Extend CI config to cover building with libmaxminddb support
2020-05-01 17:46:43 -07:00
Jon Siwek
8c4e9d05bd Merge remote-tracking branch 'origin/topic/timw/packet-source-suspension'
* origin/topic/timw/packet-source-suspension:
  Ensure time continues moving forward if a pcap source is suspended
2020-05-01 17:44:58 -07:00
Jon Siwek
d449682ff0 Add missing include to standalone fuzzer driver 2020-05-01 13:47:36 -07:00
Tim Wojtulewicz
2c8d0f60da Ensure time continues moving forward if a pcap source is suspended 2020-05-01 12:36:57 -07:00
Tim Wojtulewicz
5377dd446d Merge remote-tracking branch 'origin/topic/jsiwek/gh-938-pcap-source-always-ready'
* origin/topic/jsiwek/gh-938-pcap-source-always-ready:
  GH-938: fix IO loop iterations sometimes skipping offline pcap sources
2020-05-01 09:45:00 -07:00