Commit graph

10120 commits

Author SHA1 Message Date
Johanna Amann
031f0cac05 Merge remote-tracking branch 'origin/master' into topic/johanna/table-changes 2020-05-21 12:16:41 -07:00
Jon Siwek
05f829c727 Merge remote-tracking branch 'origin/topic/jazoff/fuzz-size-limit-speedup'
- Factored check into more descriptive function: ExceedsChunkLimit()

* origin/topic/jazoff/fuzz-size-limit-speedup:
  Speed up ChunkCount validity check
2020-05-21 11:43:34 -07:00
Justin Azoff
6aa6eea7bc Speed up ChunkCount validity check
When counting chunks for the purpose of a Valid check, only count up to
chunk_count_limit + 1 chunks.  This speeds up the skipping of the 70,000
chunk test file considerably.

Before:
    Processed 1 inputs in 0.025517s

After:
    Processed 1 inputs in 0.000620s
2020-05-21 12:55:00 -04:00
Jon Siwek
7d98d816d8 Disable output of Reporter messages to stderr in fuzz targets 2020-05-20 11:20:59 -07:00
Jon Siwek
6d0599c537 Improve standalone fuzz driver timing output 2020-05-20 10:57:18 -07:00
Jon Siwek
ce6459ed6f Merge remote-tracking branch 'origin/topic/jazoff/fuzz-size-limits'
- I rolled the fuzz chunk limit check into FuzzBuffer::Valid()

* origin/topic/jazoff/fuzz-size-limits:
  Skip fuzz inputs that have more than 64 chunks
2020-05-20 10:56:17 -07:00
Justin Azoff
1e4374bd27 Skip fuzz inputs that have more than 64 chunks 2020-05-20 10:02:40 -04:00
Jon Siwek
fda8b98ac7 Update submodule(s)
[nomail]
2020-05-19 11:36:03 -07:00
Jon Siwek
c372d53d77 Merge remote-tracking branch 'origin/topic/neverlord/caf-0.18'
* origin/topic/neverlord/caf-0.18:
  Upgrade to latest Broker changes for CAF 0.18
2020-05-19 10:50:58 -07:00
Dominik Charousset
d7927622e9 Upgrade to latest Broker changes for CAF 0.18 2020-05-19 10:24:13 +02:00
Johanna Amann
e7f25aa2ff Merge remote-tracking branch 'origin/master' into topic/johanna/table-changes
Includes code-changes needed to make this compile again.
2020-05-18 16:12:21 -07:00
Tim Wojtulewicz
aafced6b19 Include pcap.h instead of pcap/dlt.h in packet-fuzzer 2020-05-18 14:58:52 -07:00
Jon Siwek
2bac702a72 Merge remote-tracking branch 'origin/topic/jazoff/packet-fuzzer'
* origin/topic/jazoff/packet-fuzzer:
  Update src/fuzzers/packet-fuzzer.cc
  Update src/fuzzers/packet-fuzzer.cc
  add initial packet corpus
  add packet fuzzer
2020-05-18 10:48:22 -07:00
Jon Siwek
c325757c32 Merge remote-tracking branch 'origin/topic/jsiwek/fix-macos-fuzz-target-build'
* origin/topic/jsiwek/fix-macos-fuzz-target-build:
  Fix building fuzz targets on macOS
2020-05-18 10:47:09 -07:00
Justin
afde8a9596
Update src/fuzzers/packet-fuzzer.cc
Use a constant timestamp for packets

Co-authored-by: Jon Siwek <jsiwek@corelight.com>
2020-05-15 16:05:21 -04:00
Justin
e78a5be17d
Update src/fuzzers/packet-fuzzer.cc
Remove unused #includes

Co-authored-by: Tim Wojtulewicz <tim@corelight.com>
2020-05-15 15:59:46 -04:00
Johanna Amann
9dec370048 Highwayhash: small build fix
Turns out that hh_neon should not be compiled on generic arm CPUs.
That one is only for aarch64.
2020-05-15 19:57:32 +00:00
Johanna Amann
781c3e5914 Merge branch 'replace-bzero' of https://github.com/brimsec/zeek
* 'replace-bzero' of https://github.com/brimsec/zeek:
  Replace bzero() with memset()
2020-05-15 19:48:47 +00:00
Jon Siwek
23a543f509 Update submodule(s)
[nomail]
2020-05-15 12:39:03 -07:00
Jon Siwek
c4d41dcfbb Fix building fuzz targets on macOS 2020-05-15 11:25:14 -07:00
Jon Siwek
48153ba12f Update submodule(s)
[nomail]
2020-05-15 10:38:17 -07:00
Justin Azoff
dd458a810e add initial packet corpus
This contains converted files from the test suite:
    dns53.cap
    ipv6-fragmented-dns.trace.cap
    ipv6-hbh-routing0.trace.cap
    ipv6-http-atomic-frag.trace.cap
    ipv6_zero_len_ah.trace.cap

and a new one I made:
    syn_packet.cap
2020-05-15 11:56:07 -04:00
Justin Azoff
48ee85df0b add packet fuzzer 2020-05-15 11:56:07 -04:00
Jon Siwek
5272079e79 Change Coverity action to output build log 2020-05-14 22:51:37 -07:00
Jon Siwek
457454bb80 Update submodule(s)
[nomail]
2020-05-14 17:10:57 -07:00
Jon Siwek
6c19229eef Update external testing repo commit files 2020-05-14 17:02:12 -07:00
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
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