Commit graph

5342 commits

Author SHA1 Message Date
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
dd0856a57f HTTP CONNECT proxy support.
- The HTTP analyzer now supports handling HTTP CONNECT proxies
   same as the SOCKS analyzer handles proxying.
2014-02-12 22:38:59 -05:00
Jon Siwek
e844727e73 Increase timeouts of some unit tests. 2014-02-12 17:03:51 -06:00
Jon Siwek
6563b544d8 Fix memory leak in modbus analyzer.
Would happen if there's a 'modbus_read_fifo_queue_response'
event handler.
2014-02-12 17:00:12 -06:00
Robin Sommer
f45bd84f4c Updating submodule(s).
[nomail]
2014-02-11 16:16:49 -08:00
Robin Sommer
39be3828fd Baseline updates for DNS change.
I assume these are expected, and in any case it's DS that's being
tested not DNS. :)
2014-02-11 16:16:09 -08:00
Robin Sommer
857da46344 Merge branch 'master' of git.bro.org:bro 2014-02-11 15:50:51 -08:00
Robin Sommer
64d73d5a2b Updating submodule(s).
[nomail]
2014-02-11 15:41:16 -08:00
Vlad Grigorescu
3cd91f85d7 Merge remote-tracking branch 'origin/master' into topic/vladg/socks_fix 2014-02-11 16:28:48 -05:00
Vlad Grigorescu
80ec40bc93 Merge remote-tracking branch 'origin/master' into topic/vladg/radius 2014-02-11 16:17:40 -05:00
Seth Hall
506b26e5ff Expanding the HTTP methods used in the signature to detect HTTP traffic. 2014-02-11 15:30:22 -05:00
Bernhard Amann
adfe3a0754 add channel_id tls extension number.
This number is not IANA defined, but we see it being
actively used.
2014-02-10 23:56:23 -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
741ae7a368 Updating submodule(s).
[nomail]
2014-02-07 12:51:48 -08:00
Robin Sommer
f11373505d Updating submodule(s).
[nomail]
2014-02-07 10:44:31 -08:00
Robin Sommer
54ba3198f6 Merge remote-tracking branch 'origin/topic/jdopheid/bro_documentation'
* origin/topic/jdopheid/bro_documentation:
  Updates to httpmonitor and mimestats documentation.
  Updates to Logs and Cluster documentation
  Updates to Bro IDS documentation

BIT-1127 #merged
2014-02-07 09:12:44 -08: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
2bbf29681e Updating submodule(s).
[nomail]
2014-02-06 21:07:46 -08:00
Robin Sommer
71df27f9d5 Updating submodule(s).
[nomail]
2014-02-06 20:31:25 -08:00
Robin Sommer
c1f626d4ce Updating submodule(s).
[nomail]
2014-02-06 20:31:02 -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
b64137761e Updating submodule(s).
[nomail]
2014-02-06 18:20:46 -08:00
Robin Sommer
d81bfed45d Fixing memory leaks in input framework. 2014-02-06 17:58:56 -08:00
Bernhard Amann
4b63b30901 Fix x509-extension test sometimes failing.
For some fields, the format apparently is not consistens over
OpenSSL versions. For the test, we simply skip those.
2014-02-05 10:01:51 -08:00
Robin Sommer
126fbb6ba9 Merge remote-tracking branch 'origin/topic/jsiwek/tcp-improvements'
* origin/topic/jsiwek/tcp-improvements:
  Add script to detect filtered TCP traces, addresses BIT-1119.

BIT-1119 #merged

If we could only disable an event handler dynamically ...
2014-02-04 22:34:35 -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
Jon Siwek
ab4508486e Minor unified2 script documentation fix. 2014-02-03 16:55:23 -06:00
Jon Siwek
0cb2a90da4 Add script to detect filtered TCP traces, addresses BIT-1119.
If reading a trace file w/ only TCP control packets, a warning is
emitted to suggest the 'detect_filtered_traces' option if the user
doesn't desire Bro to report missing TCP segments for such a trace file.
2014-01-31 17:04:58 -06: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
cdf09b4ace Updating submodule(s).
[nomail]
2014-01-31 09:56:20 -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
Jon Siwek
c61dfb1963 Rewrite DNS state tracking which matches queries and replies.
The previous method of matching queries with replies was still
unreliable in cases where the reply contains no answers.  The new code
also takes extra measures to avoid pending state growing too large in
cases where the condition to match a query with a corresponding reply is
never met, but yet DNS messages continue to be exchanged over the same
connection 5-tuple (preventing cleanup of the pending state).
2014-01-30 17:21:01 -06:00
Jeannette Dopheide
121db68c30 Updates to httpmonitor and mimestats documentation. 2014-01-30 13:23:58 -06:00
Jeannette Dopheide
2e2cb0ffc9 Updates to Logs and Cluster documentation 2014-01-30 13:22:25 -06:00
Jeannette Dopheide
c7cacb56b8 Updates to Bro IDS documentation 2014-01-30 13:13:26 -06:00
Jeannette Dopheide
1ee4734f5d Merge branch 'master' of ssh://git.bro.org/bro 2014-01-30 09:06:41 -06:00
Jon Siwek
2b84af5b80 Revert use of HTTP file ID caching for gaps range request content.
Just an oversight on my part, this makes the use of file ID caching
consistent between the uses of the DataIn and Gap interfaces.
2014-01-29 17:11:20 -06:00
Jon Siwek
1842d324cb Extend file analysis API to allow file ID caching, adapt HTTP to use it.
This allows an analyzer to either provide file IDs associated with some
file content or to cache a file ID that was already determined by
script-layer logic so that subsequent calls to the file analysis
interface can bypass costly detours through script-layer.  This can
yield a decent performance improvement for analyzers that are able to
take advantage of it and deal with streaming content (like HTTP).
2014-01-29 15:34:24 -06:00
Jeannette Dopheide
4c52c378d5 Added some grammar and spelling corrections to Installation and Quick Start Guide. 2014-01-29 11:23:31 -06:00
Robin Sommer
55a8725ce2 Updating submodule(s).
[nomail]
2014-01-29 08:42:48 -08:00
Robin Sommer
dfcb4938d0 Merge remote-tracking branch 'origin/topic/jsiwek/tcp-improvements'
* origin/topic/jsiwek/tcp-improvements:
  Fix file_over_new_connection event to trigger when entire file is missed.
  Improve TCP connection size reporting for half-open connections.
  Improve gap reporting in TCP connections that never see data.
  Improve TCP FIN retransmission handling.

BIT-1119
2014-01-28 15:24:20 -08:00
Bernhard Amann
62b3cb0a5b Also use exec-module test to check for leaks. 2014-01-28 12:28:12 -08:00
Jon Siwek
31866f8f59 Change dns.log to include only standard DNS queries.
The scope of dns.log is now only standard queries (OPCODE == 0).  Other
kinds of queries (e.g. inverse query) were not handled correctly and
could interfere with the state tracking of the default DNS scripts.
2014-01-28 13:56:22 -06: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
Jon Siwek
0e0e74e49c Improve DNS analysis.
- Fix parsing of empty question sections (when QDCOUNT == 0).  In this
  case, the DNS parser would extract two 2-byte fields for use in either
  "dns_query_reply" or "dns_rejected" events (dependent on value of
  RCODE) as qclass and qtype parameters.  This is not correct, because
  such fields don't actually exist in the DNS message format when
  QDCOUNT is 0.  As a result, these events are no longer raised when
  there's an empty question section.  Scripts that depends on checking
  for an empty question section can do that in the "dns_message" event.

- Add a new "dns_unknown_reply" event, for when Bro does not know how
  to fully parse a particular resource record type.  This helps fix a
  problem in the default DNS scripts where the logic to complete
  request-reply pair matching doesn't work because it's waiting on more
  RR events to complete the reply.  i.e. it expects ANCOUNT number of
  dns_*_reply events and will wait until it gets that many before
  completing a request-reply pair and logging it to dns.log.  This could
  cause bogus replies to match a previous request if they happen to
  share a DNS transaction ID.
2014-01-28 11:04:01 -06:00
Bernhard Amann
f821a13cce Merge remote-tracking branch 'origin/master' into topic/bernhard/file-analysis-x509
Conflicts:
	src/analyzer/protocol/ssl/events.bif

Still broken.
2014-01-28 06:43:08 -08:00
Bernhard Amann
2c7e7f962e Make x509 certificates an opaque type 2014-01-28 06:39:50 -08:00
Robin Sommer
462fd68931 Prototype of a netmap packet source.
TODO: Add userland BPF filtering so that our filters work.
2014-01-27 16:44:21 -08:00
Robin Sommer
9a9451af00 A series of updates and tweaks to the new PktSrc interface. 2014-01-27 15:20:02 -08:00