Commit graph

3375 commits

Author SHA1 Message Date
Jon Siwek
06d6277f0a Redo the "how to upgrade" FAQ. 2012-10-03 16:14:52 -05:00
Seth Hall
73f2fd8e3a Updating some intel framework test baselines. 2012-10-03 16:25:18 -04:00
Seth Hall
bf9651b323 Reworked cluster intelligence data distribution mechanism and fixed tests.
- Intel data distribution on clusters is now pushed in whole
  by the manager when a worker connects.  Additions after that point
  are managed by the normal single-item distribution mechanism already
  built into the intelligence framework.

- The manager maintains the complete "minimal" data store that the
  workers use to do their matching so that full "minimal" data
  distribution is very easy.

- Tests are cleaned up and work.
2012-10-03 16:25:02 -04:00
Jon Siwek
2ac6fab5fc Merge branch 'master' into topic/jsiwek/gridftp 2012-10-02 16:39:34 -05:00
Jon Siwek
e93748d28b Add general FAQ entry about upgrading Bro. 2012-10-02 15:36:12 -05:00
Jon Siwek
5f3af9e9eb Add new Tunnel::delay_teredo_confirmation option, default to true.
This option indicates that the Teredo analyzer should wait until
it sees both sides of a connection using a valid Teredo encapsulation
before issuing a protocol_confirmation.  Previous behavior confirmed
on the first instance of a valid encapsulation, which could result
in more false positives (and e.g. bogus entries in known-services.log).

Addresses #890.
2012-10-02 15:13:38 -05:00
Robin Sommer
b4b7a384dc Updating submodule(s).
[nomail]

Closes #889
2012-10-02 12:10:49 -07:00
Robin Sommer
6ae8ac310a Merge remote-tracking branch 'origin/topic/matthias/libcurl-fix'
* origin/topic/matthias/libcurl-fix:
  Use second granularity for ElasticSearch timeouts.
  Fix compile issues with older versions of libcurl.
2012-10-02 12:07:26 -07:00
Robin Sommer
4d7eabc2a9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Small but important fix for the input framework. BroStrings were constructed without a final \0 - which means that strings read by the input framework are unusable by basically all internal functions (like to_count).
2012-10-02 12:02:59 -07:00
Seth Hall
6750b0f7b9 Merge remote-tracking branch 'origin/master' into topic/seth/metrics-updates
Conflicts:
	testing/btest/Baseline/scripts.base.frameworks.metrics.basic-cluster/manager-1.metrics.log
	testing/btest/Baseline/scripts.base.frameworks.metrics.basic/metrics.log
	testing/btest/Baseline/scripts.base.frameworks.metrics.cluster-intermediate-update/manager-1.notice.log
	testing/btest/Baseline/scripts.base.frameworks.metrics.notice/notice.log
	testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
2012-10-01 16:23:06 -04:00
Bernhard Amann
4cbf4e3caf Small but important fix for the input framework. BroStrings were constructed
without a final \0 - which means that strings read by the input framework are
unusable by basically all internal functions (like to_count).

the basic test now also checks this.

Thanks at Sheharbano for noticing this.
2012-10-01 13:04:40 -07:00
Jon Siwek
68aead024a Add an example of a GridFTP data channel detection script.
It relies on the heuristics of GridFTP data channels commonly default to
SSL mutual authentication with a NULL bulk cipher and that they usually
transfer large datasets (default threshold of script is 1 GB).  The
script also defaults to skip_further_processing() after detection to try
to save cycles analyzing the large, benign connection.

Also added a script in base/protocols/conn/polling that generalizes the
process of polling a connection for interesting features.  The GridFTP
data channel detection script depends on it to monitor bytes
transferred.
2012-10-01 12:32:24 -05:00
Robin Sommer
474ab86b9c Updating submodule(s).
[nomail]
2012-09-29 14:44:58 -07:00
Robin Sommer
c412678e13 Merge remote-tracking branch 'origin/topic/dnthayer/remove-unused-code'
* origin/topic/dnthayer/remove-unused-code:
  Remove deprecated attribute &disable_print_hook
  Remove unused argument of helper function
  Remove deprecated built-in functions
  Remove unused reserved keyword "this"

Closes #885.
2012-09-29 14:18:59 -07:00
Robin Sommer
906a34e3b3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Reliability adjustments to istate tests with network communication.
2012-09-29 14:09:27 -07:00
Seth Hall
38468f9daa Lots more intelligence checking in SMTP traffic. 2012-09-28 22:43:36 -04:00
Seth Hall
375769f42c Added intelligence check for "Received" path checking and a bit of reshuffling. 2012-09-28 22:07:40 -04:00
Seth Hall
bacc99f645 Added sources to the intel log. 2012-09-28 21:17:14 -04:00
Seth Hall
03532ff051 Fixing a problem with intel distribution on clusters. 2012-09-28 16:38:34 -04:00
Seth Hall
38f0b7927c Updated intel framework test to include matching. 2012-09-28 14:52:05 -04:00
Seth Hall
0bcedcd204 Restructuring the scripts that feed data into the intel framework slightly. 2012-09-28 13:25:37 -04:00
Seth Hall
2366b21787 One test for cluster transparency of the intel framework. 2012-09-28 13:25:06 -04:00
Seth Hall
bd6779b83c Fixed a cluster support bug. 2012-09-28 09:49:00 -04:00
Seth Hall
51249d0984 Merge remote-tracking branch 'origin/master' into topic/seth/intel-framework 2012-09-28 09:27:52 -04:00
Seth Hall
a803cae92e Intelligence framework checkpoint
- Basic API seems to works, but tests aren't updated yet.

 - Several scripts are available in policy/frameworks/intel that
   call the "seen" function to provide data into the intel
   framework to be tested.

 - Intel::policy is not done yet and needs to be discussed to
   figure out what it needs to have.

 - Running the intel framework and having it do something finally
   is really cool!
2012-09-28 07:07:02 -04:00
Matthias Vallentin
1ce76da90f Use second granularity for ElasticSearch timeouts.
Since the millisecond resolution cannot be harnessed universally and is not
supported by older version of libcurl, we will allow only specifications at the
granularity of seconds.

This commit also fixes a typing issue that causes that prevented the
ElasticSearch timeout to work in the first place: curl_easy_setopt requires a
long but was given a uint64_t.
2012-09-27 16:34:16 -07:00
Matthias Vallentin
b73809d54f Fix compile issues with older versions of libcurl.
Older versions of libcurl do not offer *_MS timeout constants, which causes the
build to fail. For sub-second timeout specification, we now fall back to
hard-coded timeouts in older libcurl version.
2012-09-27 12:18:25 -07:00
Seth Hall
71c5b49bdc Major updates to fix the Intel framework API. 2012-09-27 13:39:48 -04:00
Daniel Thayer
254715eaaa Remove deprecated attribute &disable_print_hook 2012-09-26 16:47:51 -05:00
Daniel Thayer
72f16f2642 Remove unused argument of helper function
Removed an unused argument of the "do_split" helper function.  The unused
argument was previously used by a now-removed BIF.
2012-09-26 15:20:54 -05:00
Daniel Thayer
f00a7c3ee4 Remove deprecated built-in functions 2012-09-26 14:20:30 -05:00
Daniel Thayer
5593f339bd Remove unused reserved keyword "this"
Removed unused reserved keyword "this" (a script using it would cause Bro to
segfault).
2012-09-26 13:09:54 -05:00
Jon Siwek
d6f671494e Reliability adjustments to istate tests with network communication. 2012-09-26 12:14:11 -05:00
Seth Hall
50e319a417 Checkpoint commit. This is all a huge mess right now. :) 2012-09-26 10:08:48 -04:00
Robin Sommer
bf62a6e673 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Uncomment some previously-broken tests
  Fix parsing of integers
  Serialize language.when unit test with the "comm" group.
2012-09-25 14:22:23 -07:00
Daniel Thayer
f7e55509a4 Uncomment some previously-broken tests
Uncommented some tests that previously would cause Bro to exit
with an error.
2012-09-25 16:05:23 -05:00
Daniel Thayer
6f45a8f4ef Fix parsing of integers
This bug was seen on 32-bit systems, where the range of recognized values
was less than the range of hexadecimal values.
2012-09-25 15:26:44 -05:00
Jon Siwek
1044762dfa Serialize language.when unit test with the "comm" group.
Since it now loads the listen script.
2012-09-25 14:53:51 -05:00
Robin Sommer
d4b95e2bbf Updating submodule(s).
[nomail]
2012-09-25 06:25:15 -07:00
Robin Sommer
958c3d74d6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix race condition in language/when.bro test
2012-09-24 16:24:49 -07:00
Daniel Thayer
101ba67203 Fix race condition in language/when.bro test 2012-09-24 18:20:42 -05:00
Robin Sommer
45926e6932 Updating submodule(s).
[nomail]
2012-09-24 16:13:24 -07:00
Robin Sommer
8cd85a9013 Updating submodule(s).
[nomail]
2012-09-24 11:45:18 -07:00
Robin Sommer
801f8d3de6 Updating submodule(s).
[nomail]
2012-09-24 11:44:23 -07:00
Robin Sommer
73115dd334 Updating CHANGES and VERSION. 2012-09-24 11:15:43 -07:00
Robin Sommer
d89fda319e Merge remote-tracking branch 'origin/topic/dnthayer/faq-update'
* origin/topic/dnthayer/faq-update:
  Add an item to FAQ page about broctl options
2012-09-23 08:46:03 -07:00
Robin Sommer
832539f548 Merge remote-tracking branch 'origin/topic/dnthayer/language-tests'
* origin/topic/dnthayer/language-tests:
  Update language tests for recent bug fixes
  Add more language tests
  Add more language tests
  Add more language tests
  Update language tests
  Add more language tests
  Add tests of the Bro scripting language
2012-09-23 08:44:34 -07:00
Robin Sommer
17df13e7e1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix construction of ip6_ah (Authentication Header) record values.
  Update compile/dependency docs for OS X.
  Adjusting Mac binary packaging script.
  Unit test reliability adjustment.
  Adjusting some unit tests that do cluster communication.
  Small change to non-blocking DNS initialization.
  reorder a few statements in scan.l to make 1.5msecs etc work.
2012-09-23 08:43:10 -07:00
Jon Siwek
392b99b2fa Fix construction of ip6_ah (Authentication Header) record values.
Authentication Headers with a Payload Len field set to zero would cause
a crash due to invalid memory allocation because the previous code
assumed Payload Len would always be great enough to contain all
mandatory fields of the header.  This changes it so the length of
the header is explicitly checked before attempting to extract fields
located past the minimum length (8 bytes) of an Authentication Header.

Crashes due to this are only possible when handling script-layer events
ipv6_ext_headers, new_packet, esp_packet, or teredo_*.  Or also when
implementing one of the discarder_check_* family of functions.
Otherwise, Bro correctly parses past such a header.
2012-09-18 16:52:12 -05:00
Seth Hall
009efbcb27 Major revisions to Modbus analyzer support (not quite done yet).
- Renamed many data structures to align with most recent standard.

- Reworked modbus events to make them more canonically "Bro".

- Converted the Modbus analyzer to a simpler style for easier maintenance.

- Modbus coil related events still don't work (I haven't finished the
  function for converting the data structures).

- Modbus file record events remain incomplete.
2012-09-17 09:19:52 -04:00