Commit graph

7390 commits

Author SHA1 Message Date
Robin Sommer
9a7a024f6e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add missing break; in StartTLS case of IRC analyzer.
2016-02-13 10:48:45 -08:00
Robin Sommer
124531d4ae Merge remote-tracking branch 'origin/topic/johanna/stats_smb_leak'
BIT-1534 #merged

* origin/topic/johanna/stats_smb_leak:
  Fix memory leaks in stats.cc and smb.cc
2016-02-13 10:41:05 -08:00
Johanna Amann
baa3cd986c Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Better multi-space separator handling.

Also tweak multi-space separator handline some more and add test-case
triggering the new behavior.
2016-02-12 18:55:25 -08:00
Mark Taylor
886ba6e823 Better multi-space separator handling.
1) IRC spec indicates "one or more spaces" separating parameters, so be better at handling multiple space separators.
2) Have "length" track against "myline", since it continues to be used against it.
3) "WHO" command's parameters are optional.
2016-02-12 15:14:19 -05:00
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
5e2ec25a38 small acld plugin fix 2016-02-11 11:31:44 -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
Mark Taylor
2ae80640cb Allow IRC commands to not have parameters.
When testing against irc-dcc-send.trace, I didn't see an irc_quit_message event generated for the QUIT command at the end of the trace, but rather a weird.log "irc_invalid_line" for the packet: the IRC packet parser wasn't allowing commands without parameters.
2016-02-10 12:50:30 -05:00
Johanna Amann
ba8742ebb4 Update submodule
[nomail]
2016-02-08 17:54:33 -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
8f33d7fa4d Updating CHANGES and VERSION. 2016-02-08 14:30:56 -08:00
Johanna Amann
8913b60fd1 Add IRC leak test. 2016-02-08 14:27:58 -08:00
Dirk Leinenbach
6b5fd442f0 fix memory leaks in find_all() and IRC analyzer 2016-02-08 14:20:47 -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
Johanna Amann
043ebba937 Update submodule
[nomail]
2016-02-08 12:36:22 -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
Mark Taylor
e0e7a14031 Removed duplicate parameter for IRC "QUIT" event handler. 2016-02-05 19:26:04 -05:00
Johanna Amann
2e0c2035c9 Add missing break; in StartTLS case of IRC analyzer.
The missing break did not cause any issues besides one extra
(unspecialized) event being fired in addition to the actual
starttls event.

Found by Aaron Eppert
2016-02-04 12:35:54 -08: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
bebe2e85cb Revert "introduce &weaken attribute"
This reverts commit 00204ab8a6.

We decided to implement this using an alternative method that does not
need a new language attribute.
2016-02-03 14:32:40 -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
9ec6927cc1 Updating submodule(s).
[nomail]
2016-02-01 12:38:39 -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
Robin Sommer
46931aa316 Merge remote-tracking branch 'origin/topic/dnthayer/mktemp'
* origin/topic/dnthayer/mktemp:
  Fix portability issue with use of mktemp
2016-02-01 12:34:24 -08:00
Robin Sommer
e63990398d Updating submodule(s).
[nomail]
2016-01-29 10:49:08 -08:00
Robin Sommer
67324a6a64 Updating submodule(s).
[nomail]
2016-01-29 10:48:45 -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
Robin Sommer
cb41161d9f Merge branch 'master' of git.bro.org:bro
(Fixing a merge conflict in CHANGES).
2016-01-28 08:07:38 -08: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
Daniel Thayer
6ef8a93dca Update traffic per core estimate in the cluster doc 2016-01-27 14:56:42 -06:00
Mark Taylor
e3d196ed7d Correct irc_privmsg_message handling.
Due to a logic bug, once an "irc_privmsg_message" event handler is created, *all* IRC events were routed down the code path, generally creating a Weird("irc_invalid_privmsg_message_format") event and terminating the inspection.
2016-01-27 14:54:48 -05:00
Robin Sommer
43ffc95b0d Updating submodule(s).
[nomail]
2016-01-25 15:59:46 -08:00
Robin Sommer
f78bbc8e6f Updating submodule(s).
[nomail]
2016-01-25 14:23:53 -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
Johanna Amann
bf52f986c2 Update copyright year for sphinx.
That way, not all of our pages say '2013' anymore.
2016-01-21 13:47:33 -08:00
Johanna Amann
600d6480b4 Update submodule
[nomail]
2016-01-21 10:25:03 -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
072a3fa28d Merge remote-tracking branch 'origin/topic/seth/radiotap'
BIT-1526 #merged

* origin/topic/seth/radiotap:
  Improved Radiotap support and a test.
  Fixed RadioTap support (still "Works for Me")
  Initial commit of RadioTap encapsulation support)
2016-01-20 17:45:25 -08: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
Robin Sommer
176b0e7b44 Merge remote-tracking branch 'origin/topic/seth/compiler-cleanup'
BIT-1524 #merged

* origin/topic/seth/compiler-cleanup:
  Updating binpac submodule.
  Fixed a format specifier.
  Adding override/final to overridden virtual methods.
2016-01-19 10:22:31 -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
Seth Hall
7d5acfd8c8 Merge remote-tracking branch 'origin/master' into topic/seth/radiotap 2016-01-18 12:17:07 -05:00
Seth Hall
154bc47e2e Updating binpac submodule. 2016-01-17 00:42:16 -05:00
Seth Hall
f88f3b56f5 Fixed a format specifier. 2016-01-16 23:44:05 -05:00
Seth Hall
a58c308427 Adding override/final to overridden virtual methods.
C++11 compilers complain about overridden virtual methods
not being specified as either final or overridden.
2016-01-16 23:35:31 -05:00