Commit graph

1825 commits

Author SHA1 Message Date
Robin Sommer
04dc318806 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve DBG_LOG macro (perf. improvement for --enable-debug mode).
  Misc. documentation fixes.
2014-03-12 17:20:14 -07:00
Robin Sommer
18eb31a6df Merge remote-tracking branch 'origin/topic/jsiwek/bit-1153'
* origin/topic/jsiwek/bit-1153:
  Fix non-deterministic logging of unmatched DNS msgs, addresses BIT-1153

BIT-1153 #merged
2014-03-10 11:10:36 -07:00
Robin Sommer
69d52feb18 Merge remote-tracking branch 'origin/topic/seth/dns-srv-fix'
* origin/topic/seth/dns-srv-fix:
  No longer accidentally attempting to parse NBSTAT RRs as SRV RRs.
  Fix DNS SRV responses and a small issue with NBNS queries and label length.

BIT-1147 #merged
2014-03-09 08:59:48 -07:00
Seth Hall
83ec05bb4a Merge remote-tracking branch 'origin/topic/bernhard/ssl-failure'
* origin/topic/bernhard/ssl-failure:
  only call disable_analyzer if the connection is still open.
  update test baselines
  At the moment, SSL connections where the ssl_established event does not fire are not logged.
2014-03-06 22:56:15 -05:00
Robin Sommer
d6d26a3ea7 Merge branch 'topic/robin/http-connect'
* topic/robin/http-connect:
  HTTP fix for output handlers.
  Expanding the HTTP methods used in the signature to detect HTTP traffic.
  Updating submodule(s).
  Fixing removal of support analyzers, plus some tweaking and cleanup of CONNECT code.
  HTTP CONNECT proxy support.

BIT-1132 #merged
2014-03-03 16:53:46 -08:00
Robin Sommer
7774af7518 Merge remote-tracking branch 'origin/topic/bernhard/ticket-1144'
* origin/topic/bernhard/ticket-1144:
  Allow iterating over bif functions with result type vector of any.

BIT-1144 #merged
2014-03-03 16:35:00 -08:00
Robin Sommer
f2f817c8b1 Forgot to remove test code when merging. 2014-02-28 15:37:32 -08:00
Robin Sommer
2be0cb210a Updating CHANGES and VERSION. 2014-02-28 15:26:35 -08:00
Robin Sommer
7a3162f6a4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Update mozilla root bundle
2014-02-28 09:46:55 -08:00
Robin Sommer
ae318c9e27 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  adjust timings of a few leak tests.
2014-02-27 07:35:06 -08:00
Robin Sommer
91c10d4963 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  More google tls extensions that are being actively used.
  Remove unused and potentially unsafe function ListVal::IncludedInString
2014-02-25 07:25:05 -08:00
Robin Sommer
58eb9bbf28 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  new TLS constants from https://tools.ietf.org/html/draft-bmoeller-tls-downgrade-scsv-01
  Revert "Correct return type of topk_get_top, addresses BIT-1144"
  Correct return type of topk_get_top, addresses BIT-1144
2014-02-24 07:28:34 -08:00
Robin Sommer
48568c9e1f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  New alert from https://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg-04
  update 3rdparty submodule (new SQLite version)
2014-02-20 17:31:22 -08:00
Robin Sommer
10d89a4648 Updating submodule(s).
[nomail]
2014-02-20 17:28:01 -08:00
Robin Sommer
ba81aa4387 Support for MPLS over VLAN.
Patch by Chris Kanich.

BIT-1017 #merged
2014-02-14 12:07:24 -08:00
Robin Sommer
4524406899 Merge remote-tracking branch 'origin/topic/vladg/socks_fix'
* origin/topic/vladg/socks_fix:
  Fix misidentification of SOCKS traffic. Traffic that had a certain bytestring would get incorrectly identified as SOCKS. This seemed to happen a lot with DCE/RPC traffic.

Tweaked the error message and added SetSkip() to the "reserved" case
as well.

BIT-1130 #merged
2014-02-14 10:53:49 -08:00
Robin Sommer
7d0fbcd7b7 Merge remote-tracking branch 'origin/topic/jsiwek/dns-perf'
* origin/topic/jsiwek/dns-perf:
  Refactor DNS script's state management to improve performance.

BIT-1133
2014-02-13 16:42:41 -08:00
Robin Sommer
a57f0ef9a0 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Increase timeouts of some unit tests.
  Fix memory leak in modbus analyzer.
  add channel_id tls extension number.
2014-02-13 12:45:02 -08:00
Seth Hall
70316a3f14 Merge remote-tracking branch 'origin/topic/jsiwek/dns-improvements'
* origin/topic/jsiwek/dns-improvements:
  Rewrite DNS state tracking which matches queries and replies.
  Change dns.log to include only standard DNS queries.
  Improve DNS analysis.
2014-02-09 23:50:43 -05:00
Robin Sommer
2fb9efa294 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix x509-extension test sometimes failing.
2014-02-07 08:07:08 -08:00
Robin Sommer
71df27f9d5 Updating submodule(s).
[nomail]
2014-02-06 20:31:25 -08:00
Robin Sommer
a048082e68 Fixing bug in POP3 analyzer.
With certain input the analyzer could end up trying to write to
non-writable memory.
2014-02-06 20:26:40 -08:00
Robin Sommer
d81bfed45d Fixing memory leaks in input framework. 2014-02-06 17:58:56 -08:00
Robin Sommer
aa90eb0786 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Minor unified2 script documentation fix.
2014-02-04 09:10:05 -08:00
Robin Sommer
c671491149 Merge remote-tracking branch 'origin/topic/jdopheid/bro/edits_to_installation_and_getting_started'
* origin/topic/jdopheid/bro/edits_to_installation_and_getting_started:
  Added some grammar and spelling corrections to Installation and Quick Start Guide.
  Minor grammar edits to Installation and Quick Start pages

BIT-1123 #merged
2014-01-31 11:43:25 -08:00
Robin Sommer
d4b5da1597 Merge remote-tracking branch 'origin/topic/jsiwek/http-file-id-caching'
* origin/topic/jsiwek/http-file-id-caching:
  Revert use of HTTP file ID caching for gaps range request content.
  Extend file analysis API to allow file ID caching, adapt HTTP to use it.

BIT-1125 #merged
2014-01-31 08:41:31 -08:00
Robin Sommer
4621745906 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Also use exec-module test to check for leaks.
2014-01-30 16:02:22 -08:00
Robin Sommer
9d3d31dbac Merge remote-tracking branch 'origin/topic/bernhard/fix-x509-extensions'
* origin/topic/bernhard/fix-x509-extensions:
  Fix x509_extension event.

BIT-1120 #merged
2014-01-28 10:27:39 -08:00
Robin Sommer
18bd20fe29 Fixing initialization context in anonymous functions.
When an anonymoys function was defined inside an initialization
context, that context transfered over to the function body and could
lead to spurious error messages.
2014-01-23 14:18:30 -08:00
Robin Sommer
d35bee4285 Merge remote-tracking branch 'origin/topic/jsiwek/review-rafael-bro-manual-changes'
* origin/topic/jsiwek/review-rafael-bro-manual-changes:
  Add unit tests for new Bro Manual docs.
  Reformat line width of some docs (i.e. `fmt -72`).
  Pass over doc xref links and linking style.
  New Bro Manual Development Edition and basic.css to fix btest output overflow problem (Update 1).

BIT-1118 #merged
2014-01-22 12:13:53 -08:00
Robin Sommer
ba9571f9ff Merge remote-tracking branch 'origin/topic/jsiwek/gre'
* origin/topic/jsiwek/gre:
  Simplify FragReassembler memory management.
  BIT-867 - Support GRE tunnel decapsulation.

BIT-867 #merged
2014-01-20 12:27:13 -08:00
Robin Sommer
bd63cf2e36 Merge remote-tracking branch 'origin/topic/jazoff/notice_file_info'
* origin/topic/jazoff/notice_file_info:
  Include file information in notices

BIT-1113 #merged

I'm wondering if there's a way to test creating these emails ... ?
2014-01-20 12:01:44 -08:00
Robin Sommer
04a974f208 Merge remote-tracking branch 'origin/topic/jazoff/ssl-validation-fix'
* origin/topic/jazoff/ssl-validation-fix:
  fix the caching of recently validated certs

BIT-1114 #merged
2014-01-20 11:55:32 -08:00
Robin Sommer
1c9c1147a0 Merge remote-tracking branch 'origin/topic/jazoff/suppression'
* origin/topic/jazoff/suppression:
  change Notice::suppressing to be a table of times

BIT-1115 #merged
2014-01-20 11:53:29 -08:00
Robin Sommer
32707c6c62 Merge remote-tracking branch 'origin/topic/jsiwek/libmagic-integration'
* origin/topic/jsiwek/libmagic-integration:
  Don't use LOG_* options to ExternalProject_Add if not supported.
  Integrate libmagic 5.16 via CMake ExternalProject.

BIT-1116 #merged
2014-01-20 11:42:58 -08:00
Robin Sommer
69ef268a44 Fixing compile problems with some versions of libc++.
Reported by Craig Leres.
2014-01-13 09:31:23 -08:00
Robin Sommer
ca55d14f67 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve GeoIP City database support.
  Broxygen init fixes, addresses BIT-1110.
  Fix for packet writing to make it use the global snaplength.
  Fix for traffic with TCP segmentation offloading with IP header len field being set to zero.
2014-01-13 01:38:56 -08:00
Robin Sommer
ae9e0d4cb6 Fixing segfault with mismatching set &default in record field. 2013-12-18 09:17:05 -08:00
Robin Sommer
207b7e7102 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve warnings emitted from raw/execute input reader.
2013-12-16 08:50:54 -08:00
Robin Sommer
928a5881b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Another attempt to improve core.when-interpreter-exceptions unit test.
2013-12-12 07:13:33 -08:00
Robin Sommer
6c20df11cc Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix uninitialized field in basename/dirname util wrapper.
2013-12-10 15:03:22 -08:00
Robin Sommer
e8739f785b Merge remote-tracking branch 'origin/topic/bernhard/input-error-fixes'
* origin/topic/bernhard/input-error-fixes:
  Several fixes for input manager error handling.

BIT-1106 #merged
2013-12-09 15:21:18 -08:00
Robin Sommer
49a3d53970 Updating submodule(s).
[nomail]
2013-12-09 13:54:23 -08:00
Robin Sommer
ca37f3d2dd Merge remote-tracking branch 'origin/topic/jsiwek/misc-fixes'
BIT-1105 #merged

* origin/topic/jsiwek/misc-fixes:
  Fix table &default reference counting for record ctor expressions.
  Close signature files after done parsing.
  Fix unlikely null ptr deref in broxygen::Manager.
  FreeBSD build fix addendum: unintended variable shadowing.
  Fix build on FreeBSD.
2013-12-09 13:26:47 -08:00
Robin Sommer
574018f478 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve a unit test involving 'when' conditionals.
2013-12-05 07:54:18 -08:00
Robin Sommer
1732fd77a4 Updating CHANGES and VERSION. 2013-12-05 07:53:26 -08:00
Robin Sommer
dda5e43aa9 Merge branch 'topic/robin/string-slicing-fix' 2013-12-04 12:42:22 -08:00
Robin Sommer
320f2d5ab6 Merge remote-tracking branch 'origin/topic/bernhard/ssl_ciphers_vector'
BIT-1011 #merged

* origin/topic/bernhard/ssl_ciphers_vector:
  Change ciphers in changes ciphers from a set to a vector.
2013-12-04 12:17:22 -08:00
Robin Sommer
dadfcde70e Merge branch 'topic/robin/event-dumper'
Changes:

   - Changing semantics of the new_event() meta event: it's raised
     only for events that have a handler defined. There are too many
     checks in Bro that prevent events wo/ handler from being even
     prepared to raise to do that differently.

   - Adding test case.

* topic/robin/event-dumper:
  New script misc/dump-events.bro, along with core support, that dumps events Bro is raising in an easily readable form.
  Prettyfing Describe() for record types.
2013-12-04 12:13:07 -08:00
Robin Sommer
18a23fbdb8 Merge remote-tracking branch 'origin/topic/jsiwek/string-slicing-fix'
* origin/topic/jsiwek/string-slicing-fix:
  Fix string slice notation, addresses BIT-1097.
2013-12-04 11:23:26 -08:00