Commit graph

6618 commits

Author SHA1 Message Date
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
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
2fc8ef232a Updating CHANGES and VERSION. 2016-04-14 10:08:26 -04:00
Seth Hall
9aa9618473 Additional mime types for file identification and a few fixes.
Some of the existing mime types received extended matchers
to fix problems with UTF-16 BOMs.

New file mime types:
 - .ini files
 - MS Registry policy files
 - MS Registry files
 - MS Registry format files (e.g. DESKTOP.DAT)
 - MS Outlook PST files
 - Apple AFPInfo files

Mime type fixes:
 - MP3 files with ID3 tags.
 - JSON and XML matchers were extended
2016-04-14 10:06:58 -04:00
Seth Hall
23d25628ad Revert "Fix RFB analyzer to build on FreeBSD"
This reverts commit 16c0707b1d.
2016-04-13 16:55:28 -04:00
Seth Hall
61eea09395 Avoid a macro name conflict on FreeBSD. 2016-04-13 16:33:15 -04:00
Daniel Thayer
16c0707b1d Fix RFB analyzer to build on FreeBSD
The auto-generated header rfb_pac.h had class member functions "major"
and "minor" which were clashing with macros of the same name defined
in /usr/include/sys/types.h on FreeBSD.  Fixed by renaming the fields.
2016-04-13 14:16:31 -05:00
Seth Hall
b722fe4540 Merge branch 'topic/seth/file-entropy'
* topic/seth/file-entropy:
  Add a file entropy test.
  Fixing a test.
  Updated tests for file entropy analyzer.
  Update and clean up to file entropy measurement.
  First commit of file entropy analyzer.
2016-04-13 01:43:27 -04:00
Seth Hall
adcc978f14 Add a file entropy test. 2016-04-13 00:44:02 -04:00
Seth Hall
2bde8ac052 Merge remote-tracking branch 'origin/topic/seth/file-entropy' into topic/seth/file-entropy
# Conflicts:
#	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
2016-04-12 23:40:07 -04:00
Seth Hall
9d0899325a Merge remote-tracking branch 'martin/topic/fox/rfb'
* martin/topic/fox/rfb:
  Fixed issue in state machine
  Some styling tweaks
  Implement protocol confirmation
  Analyzer and bro script for RFB protocol (VNC)

* <seth> I also applied a bit of clean up to the base
  script to make it match other scripts better and
  updated tests.
2016-04-12 17:00:06 -04:00
Daniel Thayer
f54a5b52e5 Improve documentation of the "for" statement 2016-04-12 15:40:18 -05:00
Johanna Amann
00e759b44c Intel: CERT_HASH indicator type was never checked
Hence, when people specify data of type CERT_HASH in their intel source
files, it will never trigger an alert.
2016-04-11 15:50:55 +02:00
Martin van Hensbergen
000540645d Fixed issue in state machine
There is a slight difference in the message sequence
between version 3.7 and 3.8.

Version 3.8 will always send a Authentication Result
message when authentication type 'None' is selected
while 3.7 does not.
2016-04-11 11:37:50 +02:00
Martin van Hensbergen
034f725f3f Some styling tweaks
- used transient declarations where appropriate
- fixed brackets
- cleaned up some comments
2016-04-11 11:35:36 +02:00
Martin van Hensbergen
04dd65cbaf Implement protocol confirmation
Do not set the service field in the bro script but
use the protocol confirmation paradigm.

Protocol is considered confirmed if both a
succesful client and server banner have been
parsed.
2016-04-11 11:28:22 +02:00
Martin van Hensbergen
849875e8be Analyzer and bro script for RFB protocol (VNC)
This analyzer parses the Remote Frame Buffer
protocol, usually referred to as the 'VNC protocol'.

It supports several dialects (3.3, 3.7, 3.8) and
also handles the Apple Remote Desktop variant.

It will log such facts as client/server versions,
authentication method used, authentication result,
height, width and name of the shared screen.

It also includes two testcases.

Todo: Apple Remote Desktop seems to have some
bytes prepended to the screen name. This is
not interepreted correctly.
2016-04-11 10:35:00 +02:00
Robin Sommer
b5f1fb33fa Updating submodule(s).
[nomail]
2016-04-07 13:40:31 -07:00
Robin Sommer
57579c0b7c Merge branch 'master' of https://github.com/WilliamTom/bro
* 'master' of https://github.com/WilliamTom/bro:
  Wrong regex literal in scripting doc
2016-04-07 13:40:18 -07:00
Robin Sommer
ced3789619 Merge remote-tracking branch 'origin/topic/vladg/bit-1528'
BIT-1528 #merged

* origin/topic/vladg/bit-1528:
  Call ProtocolConfirmation in SNMP only if we saw a response SNMP packet
  Call ProtocolConfirmation in SIP only if we saw a response SIP packet
2016-04-07 13:33:41 -07:00
Daniel Thayer
cca9a6616e Split the broker main.bro into two scripts
Separate the former BrokerComm and BrokerStore portions of the script
because these files will be much larger when script wrappers for BIFs are
written.
2016-03-30 20:32:36 -05:00
Daniel Thayer
f46dfac63a Rename the BrokerStore namespace to Broker 2016-03-30 16:39:19 -05:00
Daniel Thayer
9f5c820c7b Rename the BrokerComm namespace to Broker 2016-03-30 14:31:25 -05:00
william
35a4e428cf Wrong regex literal in scripting doc 2016-03-26 01:54:51 -07:00
Johanna Amann
8650841bf5 Only load openflow/netcontrol if compiled with broker. 2016-03-24 13:39:34 -07:00
Vlad Grigorescu
75de5481eb Merge remote-tracking branch 'origin/master' into topic/vladg/bit-1528 2016-03-24 11:27:31 -05:00
Robin Sommer
a9cb90b6f5 Adding canonifier to test. 2016-03-21 21:08:42 -07:00
Robin Sommer
eae85afd60 Merge remote-tracking branch 'origin/topic/matthias/configure-fix'
* origin/topic/matthias/configure-fix:
  Adapt to recent change in CAF CMake script
2016-03-21 19:49:10 -07:00
Matthias Vallentin
357d52fd7d Adapt to recent change in CAF CMake script
Also deprecate --with-libcaf in favor of --with-caf, as already done in
Broker.
2016-03-21 19:02:25 -07:00
Robin Sommer
e27eef351e Merge remote-tracking branch 'origin/topic/matthias/configure-fix'
* origin/topic/matthias/configure-fix:
  Adapt to recent change in CAF CMake script
2016-03-21 18:10:07 -07:00
Matthias Vallentin
4e7e211ed0 Adapt to recent change in CAF CMake script
Also deprecate --with-libcaf in favor of --with-caf, as already done in
Broker.
2016-03-21 17:12:23 -07:00
Robin Sommer
c194919b57 Merge remote-tracking branch 'origin/topic/vladg/bit-1533'
BIT-1533 #merged

* origin/topic/vladg/bit-1533:
  Call ProtocolConfirmation in MySQL analyzer.
2016-03-21 12:46:45 -07:00
Robin Sommer
7388168a68 Merge remote-tracking branch 'origin/topic/johanna/filter_subnet_table'
BIT-1553 #merged

* origin/topic/johanna/filter_subnet_table:
  Check that there is only one of read, write, create_expire
  Update NEWS
  Fixed &read_expire for subnet-indexed tables
  Added &read_expire testcase for subnet tables
  Add filter_subnet_table bif
2016-03-21 12:20:24 -07:00
Robin Sommer
0588f3510b Updating submodule(s).
[nomail]
2016-03-21 11:59:41 -07:00
Seth Hall
095e6c2787 Fixing a test. 2016-03-21 12:08:02 -04:00
Seth Hall
89b4d79f93 Merge remote-tracking branch 'origin/master' into topic/seth/file-entropy
# Conflicts:
#	scripts/test-all-policy.bro
#	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
2016-03-21 11:39:15 -04:00
Johanna Amann
cfffb6e634 Check that there is only one of read, write, create_expire 2016-03-18 12:34:26 -07:00
Johanna Amann
8de0804712 Update NEWS 2016-03-18 12:33:59 -07:00
Johanna Amann
33f9eca0c8 Update TLS constants and extensions from IANA. 2016-03-18 11:23:44 -07:00
Johanna Amann
0ac1a81388 Merge branch 'topic/johanna/filter_subnet_table' of https://github.com/J-Gras/bro into topic/johanna/filter_subnet_table
* 'topic/johanna/filter_subnet_table' of https://github.com/J-Gras/bro:
  Fixed &read_expire for subnet-indexed tables
  Added &read_expire testcase for subnet tables

Includes a bit of refactoring of commit code & code related to the
feature.
2016-03-17 21:26:57 -07:00
Vlad Grigorescu
d731cb9a18 Call ProtocolConfirmation in SNMP only if we saw a response SNMP packet 2016-03-17 14:25:15 -05:00
Vlad Grigorescu
f4141bde6d Call ProtocolConfirmation in SIP only if we saw a response SIP packet 2016-03-17 14:23:18 -05:00
Jan Grashoefer
d5034ccc19 Fixed &read_expire for subnet-indexed tables 2016-03-17 19:56:25 +01:00
Jan Grashoefer
a5f4e8aafe Added &read_expire testcase for subnet tables 2016-03-17 19:53:22 +01:00
Vlad Grigorescu
e8bdf14bfd Call ProtocolConfirmation in MySQL analyzer. 2016-03-17 13:49:06 -05:00
Johanna Amann
a6cb85d86a Add filter_subnet_table bif
This bif works similar to the matching_subnet bif. The difference is
that, instead of returning a vector of the subnets that match, we return
a filtered view of the original set/table only containing the changed
subnets.

This commit also fixes a small bug in TableVal::UpdateTimestamp
(ReadOperation only has to be called when LoggingAccess() is true).
2016-03-16 15:50:13 -07:00