Commit graph

6849 commits

Author SHA1 Message Date
Johanna Amann
f2acaec9b7 XMPP: Add StartTLS event and update tests
Also tiny cleanyp to the code.
2016-04-29 13:51:35 -07:00
Johanna Amann
6905984ee7 Merge remote-tracking branch 'origin/master' into topic/johanna/xmpp-starttls 2016-04-29 12:56:12 -07:00
Daniel Thayer
373c872e93 Fix a few incorrect type tags in Bro broker source code
These are just used for error reporting.
2016-04-29 01:45:59 -05:00
Daniel Thayer
428be70190 Merge remote-tracking branch 'origin/master' into fastpath 2016-04-29 01:30:25 -05:00
Robin Sommer
cc54b3772a Updating submodule(s).
[nomail]
2016-04-28 20:13:44 -07:00
Robin Sommer
c454685b2d Merge branch 'master' of git.bro.org:bro 2016-04-28 11:37:35 -07:00
Robin Sommer
f98561b85c Updating NEWS and a test baseline after merges. 2016-04-28 11:33:01 -07:00
Robin Sommer
befad8f825 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1449'
BIT-1449 #merged

* origin/topic/dnthayer/ticket1449:
  Rename broker BIF wrapper functions in a few more places
  Sync the core/leaks/broker/data.bro test with broker/data.bro
  Add missing tests for broker data BIFs
  Code cleanup for some broker tests
  Add script wrapper functions for broker data BIFs
  Add script wrapper functions for broker BIFs
2016-04-28 10:24:39 -07:00
Robin Sommer
abb42a5bd9 Merge remote-tracking branch 'origin/topic/johanna/intel-uid-fuid'
BIT-1572 #merged

* origin/topic/johanna/intel-uid-fuid:
  Intel: Allow to provide uid/fuid instead of conn/f.
2016-04-28 10:20:50 -07:00
Robin Sommer
2eeddac401 Merge remote-tracking branch 'origin/topic/johanna/imap-starttls'
BIT-1574 #merged

* origin/topic/johanna/imap-starttls:
  IMAP: add c++11 header file that gcc complains about.
  IMAP: documentation and test updates
  also generate an event when starttls is encounterd for imap.
  Add support of getting server capabilities to IMAP parser.
  Basic IMAP StartTLS analyzer.
2016-04-28 10:11:43 -07:00
Robin Sommer
380963b506 Updating submodule(s).
[nomail]
2016-04-28 10:06:01 -07:00
Johanna Amann
33dd30d1f6 Merge branch 'master' of https://github.com/vitalyrepin/bro
* 'master' of https://github.com/vitalyrepin/bro:
  Unknown data link type error message printed out props.link_type instead of arg_props.link_type. It lead to the meaningless and misleading output (E.g.: 'unknown data link type 0xffffffff')
2016-04-28 09:58:57 -07:00
Johanna Amann
f9db0f2e84 Merge remote-tracking branch 'origin/topic/jdopheid/typos'
* origin/topic/jdopheid/typos:
  Correcting spelling errors found under bro 2.4.1+dfsg-2 here:
2016-04-28 09:55:26 -07:00
Vitaly Repin
cd2ec7c495 Unknown data link type error message printed out props.link_type instead of arg_props.link_type. It lead to the meaningless and misleading output (E.g.: 'unknown data link type 0xffffffff') 2016-04-28 11:10:52 +03:00
Daniel Thayer
362bf7aee1 Update docs and tests of the fmt() function
Removed tests and documentation of the "%A" format specifier, which
was removed in commit 7344052b.
2016-04-27 15:34:47 -05:00
Daniel Thayer
d5cf00242e Merge remote-tracking branch 'origin/master' into fastpath 2016-04-27 15:12:11 -05:00
Johanna Amann
3a70289e91 ARP: remove unnecessary variables and add testcase
BIT-1573 #close
2016-04-27 06:51:04 -07:00
Daniel Thayer
12eb7a380d Rename broker BIF wrapper functions in a few more places 2016-04-27 00:47:48 -05:00
Daniel Thayer
f5361fb27c Sync the core/leaks/broker/data.bro test with broker/data.bro 2016-04-26 23:34:39 -05:00
Daniel Thayer
fbab6490ec Add missing tests for broker data BIFs
Added tests for the table_clear and vector_clear BIFs, and added
more tests for container types (e.g. adding the same element twice
to a set or table, or overwriting a record field value, etc.).
Also reorganized several test cases.
2016-04-26 23:03:28 -05:00
Daniel Thayer
b1876bf744 Code cleanup for some broker tests
Simplified some function names, fixed some names of broker script wrappers,
reorder some broker function calls to avoid potential race conditions, and
don't have bro read a trace file when it will not be used.
2016-04-26 22:30:12 -05:00
Daniel Thayer
4df948f3c8 Add script wrapper functions for broker data BIFs 2016-04-26 22:01:09 -05:00
Daniel Thayer
f44bb4d9b8 Add script wrapper functions for broker BIFs
Also renamed the "print" function to "send_print" and the "event"
function to "send_event" because Bro shows a syntax error when a
Bro script function is named "event" or "print".
2016-04-26 18:10:30 -05:00
Johanna Amann
59573bad33 IMAP: add c++11 header file that gcc complains about. 2016-04-26 13:06:48 -07:00
Johanna Amann
124126cabc Merge remote-tracking branch 'origin/master' into topic/johanna/imap-starttls 2016-04-26 12:48:53 -07:00
Johanna Amann
e9a87566ef Fix parsing of x509 pre-y2k dates
There was a bug in the new parsing code, introduced in
708ede22c6 which parses validity times
incorrectly if they are before the year 2000. What happens in this case
is that the 2-digit year will be interpreted to be in the 21st century
(1999 will be parsed as 2099, e.g.).
2016-04-26 12:30:28 -07:00
Johanna Amann
25f8993b57 IMAP: documentation and test updates 2016-04-26 11:15:41 -07:00
Johanna Amann
3669b6aa9c Merge remote-tracking branch 'origin/master' into topic/johanna/imap-starttls 2016-04-26 10:52:16 -07:00
Johanna Amann
d93186881d Fix small error in bif documentation. 2016-04-26 08:32:55 -07:00
Johanna Amann
41606e18fb Intel: Allow to provide uid/fuid instead of conn/f.
This patch allows users to provide the fuid or the connection id
directly, in case they do not have access to either in the event that
they handle.

An example for this is the handling of certificates in SSL, where the
fa_file record cannot be retained because this would create a cyclic
data structure.

This patch also provides file IDs for hostname matches in certificates,
which was not possible with the previous API.
2016-04-25 16:54:47 -07:00
Johanna Amann
a705b2c08d Add DNS tests for huge TLL and CAA 2016-04-25 15:43:20 -07:00
Johanna Amann
cfa4fb4946 Merge branch 'dns-caa-decode' of https://github.com/marktayl/bro into merge
* 'dns-caa-decode' of https://github.com/marktayl/bro:
  Add DNS "CAA" RR type and event.
2016-04-25 15:36:18 -07:00
Johanna Amann
e14dd28a6d Merge branch 'dns-negative-ttl' of https://github.com/marktayl/bro into merge
* 'dns-negative-ttl' of https://github.com/marktayl/bro:
  DNS TTL responses are to be unsigned.
2016-04-25 14:48:04 -07:00
Jeannette Dopheide
6dddd35d21 Correcting spelling errors found under bro 2.4.1+dfsg-2 here:
https://lintian.debian.org/full/bengen@debian.org.html#bro_2.4.1_x2bdfsg-2
2016-04-25 11:49:04 -05:00
Johanna Amann
e7ec537ed5 Merge remote-tracking branch 'origin/topic/dnthayer/broker-namespace'
* origin/topic/dnthayer/broker-namespace:
  Split the broker main.bro into two scripts
  Rename the BrokerStore namespace to Broker
  Rename the BrokerComm namespace to Broker

BIT-1563 #merged
2016-04-22 16:45:09 -07:00
Johanna Amann
176bb6ef34 Merge branch 'topic/jgras/packet-header' of https://github.com/J-Gras/bro
In the merge, I changed IP.cc to use icmp6_hdr for icmpv6 instead of the
icmp* that was used in the patch. While it does not make a difference
for this case, it seems cleaner.

BIT-1570 #merged
2016-04-22 16:07:01 -07:00
Mark Taylor
a14de582a2 Add DNS "CAA" RR type and event. 2016-04-22 15:26:34 -04:00
Mark Taylor
59bf2f8a1e DNS TTL responses are to be unsigned. 2016-04-22 15:03:29 -04:00
Johanna Amann
cdd687979e Update submodule
[nomail]
2016-04-22 10:36:02 -07:00
Robin Sommer
efde4a74b0 Merge remote-tracking branch 'origin/topic/johanna/intel-cert-hash'
BIT-1567 #merged

* origin/topic/johanna/intel-cert-hash:
  Intel: CERT_HASH indicator type was never checked
2016-04-22 08:37:14 -07:00
Seth Hall
eed26c3f5f Tiny whitespace changes. 2016-04-21 11:53:47 -04:00
Seth Hall
d35adca9c5 Filter out another very common DCE/RPC operation. 2016-04-21 11:40:26 -04:00
Seth Hall
bcdba4cc5d In SMB, don't attach the gssapi analyzer until a message is seen. 2016-04-21 11:37:16 -04:00
Jan Grashoefer
3665f745ad Updated affected test case.
Fixing IP_Hdr::BuildPktHdrVal to generate an icmp_hdr record for ICMPv6
packets slightly changed the output of core/ipv6_zero_len_ah.test.
2016-04-20 00:23:11 +02:00
Jan Grashoefer
8ac92cf7ff Added test case for get_current_packet_header bif. 2016-04-20 00:05:33 +02:00
Jan Grashoefer
c0bf1b3c67 Added get_current_packet_header bif. 2016-04-20 00:00:47 +02:00
Seth Hall
b96fe860ea Fix a bug in the DCE/RPC log ignoring mechanism. 2016-04-18 10:50:11 -04:00
Seth Hall
72f2c2ded2 More SMB/DCERPC/NTLM cleanup.
- NTLM Authentication failures over SMB2 are now marked as such in
   the ntlm.log.
 - Slightly updated filtering mechanism for DCE/RPC operations.
 - Uncommented the atsvc file so it compiles now.
2016-04-15 10:39:08 -04:00
Seth Hall
1fe9e522fb Merge remote-tracking branch 'origin/master' into topic/seth/smb 2016-04-14 21:39:48 -04:00
Seth Hall
a58500fde0 Add DCE/RPC authentication forwarding. 2016-04-14 10:55:47 -04:00