Commit graph

3268 commits

Author SHA1 Message Date
Johanna Amann
a38327bd08 Extend NetControl logging and fix bugs.
Netcontrol log now includes more information; before that, it had not
quite caught up to the new capabilities (like flow modifying and
redirection, as well as mac addresses).

Furthermore, this fixes a number of bugs with cluster mode (like
duplicate events), test failures due to updates in Bro, etc.
2016-02-11 19:47:29 -08:00
Johanna Amann
9f3c0c9bb4 Update OpenFlow API and events.
Events now generally carry the unique ID of the backend that is given
during initialization; there are a few more functions and other
bugfixes.

A few netcontrol tests are still broken (mostly due to a pcap update in
msater).
2016-02-11 13:10:40 -08:00
Johanna Amann
9d1a764ef7 Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Allow IRC commands to not have parameters.

Also update test baseline.
2016-02-10 21:30:39 -08:00
Johanna Amann
107737c9a0 Fix memory leaks in stats.cc and smb.cc
No test for smb leak because I don't have anything that triggers this.
2016-02-08 15:38:09 -08:00
Johanna Amann
8913b60fd1 Add IRC leak test. 2016-02-08 14:27:58 -08:00
Johanna Amann
9cdf869456 Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Removed duplicate parameter for IRC "QUIT" event handler.

Also add a test-case that checks the output of the quit
event handler.
2016-02-08 13:02:09 -08:00
wglodek
78c0e2355c update of http btest 2016-02-07 11:26:06 -05:00
wglodek
93f52fcdd2 detect possible HTTP evasion attempts 2016-02-07 11:22:09 -05:00
Johanna Amann
eb0692106a Merge remote-tracking branch 'origin/topic/johanna/function-recursion' into topic/johanna/netcontrol 2016-02-03 14:33:02 -08:00
Johanna Amann
e74dc74550 Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol 2016-02-03 14:30:40 -08:00
Johanna Amann
c5a14d1bc1 Fix crash when printing type of recursive structures.
Also slightly fix indentation in Type.h
2016-02-03 13:22:05 -08:00
Robin Sommer
72f0c2bd65 Merge remote-tracking branch 'origin/topic/johanna/cve-2015-3194'
* origin/topic/johanna/cve-2015-3194:
  Add testcase for CVE-2015-3194

BIT-1527 #merged
2016-02-01 12:36:54 -08:00
Daniel Thayer
3ba671ab3a Fix portability issue with use of mktemp
Some platforms require six Xs in the mktemp template.
2016-01-28 14:32:22 -06:00
Johanna Amann
aff555c95e Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Correct irc_privmsg_message handling.
2016-01-27 13:55:28 -08:00
Johanna Amann
13c4489578 Testcase for crash when a record contains a function referencing a record.
Needs BRO_PROFILER_FILE set to crash
2016-01-21 13:56:21 -08:00
Seth Hall
2509f79a10 Merge branch 'topic/jgras/bit-1507' of https://github.com/J-Gras/bro into J-Gras-topic/jgras/bit-1507 2016-01-21 10:45:42 -05:00
Johanna Amann
f06e9e6aab Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol 2016-01-20 15:01:50 -08:00
Johanna Amann
a88b32ca03 Add testcase for CVE-2015-3194 2016-01-19 14:45:52 -08:00
Seth Hall
88f2a066ce Improved Radiotap support and a test.
Radiotap support should be fully functional now with Radiotap
packets that include IPv4 and IPv6.  Other radiotap packets are
silently ignored.  This includes a test which has 802.11 headers
both with and without QoS data.
2016-01-19 04:10:44 -05:00
Jan Grashoefer
d819692204 Fixed matching mail address intel
Addresses BIT-1507.
2016-01-19 00:09:03 +01:00
Robin Sommer
642ef5d3c1 Tweaking how HTTP requests without URIs are handled.
The change from #49 made it an error to not have a URI. That however
then led requests with an URI yet no version to abort as well.
Instead, we now check if the token following the method is an "HTTP/"
version identifier. If, so accept that the URI is empty (and trigger
a weird) but otherwise keep processing.

Adding test cases for both HTTP requests without URI and without
version.
2016-01-15 12:59:11 -08:00
Robin Sommer
adb3fab019 Updating test baselines for http.log now including version. 2016-01-15 12:18:16 -08:00
Johanna Amann
990726b514 Fix crash when deleting non existing record member.
Addresses BIT-1519
2016-01-12 15:02:20 -08:00
Robin Sommer
aee312b5d2 Adding usage guard to canonifier script. 2015-12-18 12:59:26 -08:00
Robin Sommer
eae21d4d33 Merge branch 'master' of git.bro.org:bro 2015-12-18 11:22:39 -08:00
Robin Sommer
0ba6bec710 Merge remote-tracking branch 'origin/topic/johanna/irc-starttls'
* origin/topic/johanna/irc-starttls:
  StartTLS support for IRC

BIT-1513 #merged
2015-12-18 11:20:59 -08:00
Jan Grashoefer
6f891ca2ff Added test-case for intel framework matching email
Addresses #1507
2015-12-16 14:51:02 +01:00
Johanna Amann
da9b5425e4 Merge remote-tracking branch 'origin/master' into topic/johanna/ocsp 2015-12-14 16:05:41 -08:00
Johanna Amann
25a8d87da9 Change one forgotten bro-ids.org to bro.org 2015-12-14 15:58:16 -08:00
Seth Hall
4e4dece70a SIP scripts code cleanup.
- Daniel Guerra pointed out a type issue for SIP
   request and response code length fields which is now
   corrected.
 - Some redundant code was removed.
 - if/else tree modified to use switch instead.
2015-11-29 00:24:53 -05:00
Robin Sommer
9d7ec6b6d2 Merge branch 'master' of https://github.com/aeppert/bro
Cleaned up the surrounding code a bit and also added '[' as another
case (not sure that can happen, but doesn't hurt eihter).

* 'master' of https://github.com/aeppert/bro:
  Whitespace
  Remove
  Remove.
  Fix for JSON formatter
  A fatal error, especially in DEBUG, should result in a core.
  Seems to fix a case where an entry in the table may be null on insert.
2015-10-26 16:52:47 -07:00
Robin Sommer
a83d97937e Extending rexmit_inconsistency() event to receive an additional
parameter with the packet's TCP flags, if available.
2015-10-26 14:16:08 -07:00
Robin Sommer
41ebce097d Merge remote-tracking branch 'origin/topic/johanna/tls_early_alert'
* origin/topic/johanna/tls_early_alert:
  Add missing pcap file for tls dpd test.
2015-10-23 15:23:19 -07:00
Johanna Amann
c7f0945f54 Add missing pcap file for tls dpd test. 2015-10-23 15:04:26 -07:00
Robin Sommer
a1c0d9d91c Merge remote-tracking branch 'origin/topic/johanna/tls_early_alert'
* origin/topic/johanna/tls_early_alert:
  Extend ssl dpd signature to allow alert before server_hello.

BIT-1496 #merged
2015-10-23 14:04:43 -07:00
Robin Sommer
ecc09c11ca Merge remote-tracking branch 'origin/topic/johanna/string_vec_null'
* origin/topic/johanna/string_vec_null:
  Make join_string_vec work with vectors containing empty elements.

BIT-1495 #merged
2015-10-23 13:12:42 -07:00
Robin Sommer
c151a25843 Fix support for HTTP connect when server adds headers to response.
Patch by Eric Karasuda.

I slightly tweaked the patch to not need a new member variable. Also
turned the provided trace into a test case.
2015-10-23 13:10:33 -07:00
Johanna Amann
401e6c9102 Extend ssl dpd signature to allow alert before server_hello.
The alert in this case is caused by the server name in the SNI not being
recognized by the server, which triggers an alert. Since the server is
an apache, and this might happen reasonably often, the new signature
allows one TLS alert before the server hello is expected.
2015-10-22 13:36:21 -07:00
Johanna Amann
551a7d7394 Make join_string_vec work with vectors containing empty elements.
Without this patch, this scenario results in a segmentation fault.

I opted to keep the separator present for non-existing elements. Hence,
a vector a, [empty], b with separator "|" will result in
a||b
2015-10-22 13:08:47 -07:00
Johanna Amann
77c79bd010 Load static CA list for validation tests too.
This fixes test failures in some cases (and should protect against future test failures).
2015-10-02 15:12:32 -04:00
Johanna Amann
0e0dd9a5f7 Remove cluster certificate validation script for the moment.
Since we always have wallclock time in --pseudo-realtime, there
currently is no way to make this test reliable.
2015-10-02 11:32:15 -07:00
Johanna Amann
630e9f22d2 Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1467 2015-10-02 11:31:00 -07:00
Robin Sommer
45078e1d8c Merge remote-tracking branch 'origin/topic/yunzheng/x509-generalizedtime'
* origin/topic/yunzheng/x509-generalizedtime:
  Make x509 end-of-string-check nicer.
  Refactor X509 generalizedtime support and test.
  Fixed parsing of V_ASN1_GENERALIZEDTIME timestamps in x509 certificates
2015-10-01 16:48:16 -07:00
Robin Sommer
f3bf7b6c7b Merge remote-tracking branch 'origin/topic/johanna/bit-1479'
BIT-1479 #merged

* origin/topic/johanna/bit-1479:
  Fix offset=-1 (eof) for raw reader
2015-10-01 16:13:16 -07:00
Robin Sommer
10bc4ad353 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1481'
BIT-1481 #merged

* origin/topic/dnthayer/ticket1481:
  Improve a few test canonifiers
  Remove unnecessary use of TEST_DIFF_CANONIFIER
  Fixed some test canonifiers to read only from stdin
2015-09-29 09:56:42 -07:00
Daniel Thayer
6519103890 Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-fixes
Conflicts:
	scripts/base/protocols/conn/main.bro
2015-09-23 11:45:10 -05:00
Daniel Thayer
34adce126b Update some doc tests and baselines 2015-09-23 11:39:36 -05:00
Daniel Thayer
b1d1d90de4 Fix a bug in diff-remove-x509-names canonifier
The last field in a log was being ignored, due to an off-by-one
error in a "for" loop.  Also simplified the script by combining
two patterns into one.
2015-09-20 00:21:04 -05:00
Daniel Thayer
a7aa393aef Improve a few test canonifiers 2015-09-19 18:08:31 -05:00
Daniel Thayer
8a16145e31 Remove unnecessary use of TEST_DIFF_CANONIFIER
Removed a TEST_DIFF_CANONIFIER from a test, because it is already
set in btest.cfg, and this one also doesn't actually specify the
path to the script.
2015-09-18 17:32:30 -05:00