Commit graph

10798 commits

Author SHA1 Message Date
Jon Siwek
454fd9578e Fixes to relative @load'ing.
The currently loading script's path is prepended (vs. appended) to
BROPATH to search for the @load'd file to prevent being overshadowed by
scripts/directories/packages in the normal BROPATH with the same name.

This extra search path should also only be prepended to BROPATH in the
case when the @load'd file we're looking for is actually relative
(i.e. the name starts with "./" or "../").
2011-07-23 20:46:35 -05:00
Jon Siwek
b6f030dd1a Updating baseline for default loaded scripts... again. 2011-07-23 18:53:23 -05:00
Jon Siwek
b6a371f32d mask_addr bif now returns subnet (addresses #512) 2011-07-23 16:45:29 -05:00
Jon Siwek
6dd202a061 Update core.conn-uid test baseline.
The UIDs changed because notice policy isn't generating unique_ids anymore.
2011-07-23 13:24:05 -05:00
Jon Siwek
d8cbccd0eb Merge branch 'master' into fastpath 2011-07-23 13:21:14 -05:00
Seth Hall
64bc53e621 Lots of script updates.
- Updates to cluster framework to finish the separation between broctl and bro

- Extension technique for extending notice emails with extra content.

- Deleting the connection record from notices after calling apply_policy.
  It may have been causing some load and memory issues from copying
  lots of data to other cluster members.  This is a test to see if we are
  right about the memory trouble.

- Abstracted some of the notice actions into separate scripts.

-

- Lots of small cleanup and fixes.
2011-07-23 01:21:20 -04:00
Jon Siwek
e59c4b8c3c Rename/change policy.misc.loaded-scripts, again baselines default loaded scripts 2011-07-22 20:27:39 -05:00
Jon Siwek
dc839ff3f7 Merge branch 'master' into fastpath 2011-07-22 20:18:40 -05:00
Robin Sommer
8fd632f858 Removing release checklist.
Need to write a new one, but later when we actually do a release.
2011-07-22 17:38:23 -07:00
Robin Sommer
ae9c6a8fea Updating submodule(s). 2011-07-22 17:37:44 -07:00
Robin Sommer
ba40200ba2 Moving devel-tools to bro-aux. 2011-07-22 17:34:18 -07:00
Robin Sommer
6b857094c9 Updating submodule(s). 2011-07-22 17:16:08 -07:00
Robin Sommer
4a15b8668f Merge remote-tracking branch 'origin/topic/jsiwek/pybroccoli-float-repr'
* origin/topic/jsiwek/pybroccoli-float-repr:
  Update pybroccoli unit test baseline.

Closes #507.
2011-07-22 17:15:50 -07:00
Jon Siwek
a4029006ed Changes to unit tests that rely on libmagic.
If a test doesn't rely on libmagic, mime type related columns of baselined
logs are filtered out.

If a test does rely on libmagic, it needs to use the TEST-REQUIRES btest
macro to check that the bro build supports it, and then mime type related
columns of logs can be normalized via a logging filter to reduce sensitivity
to varying version of libmagic.
2011-07-22 16:33:51 -07:00
Jon Siwek
b340604346 core.load-pkg test now insensitive to default-loaded scripts. 2011-07-22 16:33:50 -07:00
Jon Siwek
b05c34ed29 LogWriterAscii now prints time values w/ constant 6 digit precision.
closes #508
2011-07-22 16:33:50 -07:00
Robin Sommer
8dc1a52d9d Fix for disable_analyzer() problem.
When calling an Analyzer's method to remove a child analyzer, we now
postpone the actual removal to later, as otherwise the call to Done()
might trigger further analyzer activity that can interfere with code
running after that that triggered the removal.

This should fix the SSL assertion crashes that we have seen.

This change is a bit tricky internally, but the trace-based tests
produce the same output as before so things should be fine ...
2011-07-22 16:19:24 -07:00
Robin Sommer
d01b8c9d3d Removing non-existent script from test-all.bro. 2011-07-22 16:18:47 -07:00
Robin Sommer
e9bd122f8a Fixing potential segfault in DebugLogger.
The Reporter may not have been initialized yet when the logger ctor runs.
2011-07-22 13:36:21 -07:00
Robin Sommer
1a46d78584 Some small layout tweaks that didn't get committed with the last merge. 2011-07-22 13:35:29 -07:00
Jon Siwek
624abd642f Changes to unit tests that rely on libmagic.
If a test doesn't rely on libmagic, mime type related columns of baselined
logs are filtered out.

If a test does rely on libmagic, it needs to use the TEST-REQUIRES btest
macro to check that the bro build supports it, and then mime type related
columns of logs can be normalized via a logging filter to reduce sensitivity
to varying version of libmagic.
2011-07-22 13:32:02 -05:00
Jon Siwek
cd5c564eb4 Change policy.misc.loaded-scripts tests.
To make it insensitive to scripts loaded by default, now it just
checks that the loaded_scripts log is created and has contents.
2011-07-22 11:59:17 -05:00
Jon Siwek
6fb488c587 core.load-pkg test now insensitive to default-loaded scripts. 2011-07-22 11:14:53 -05:00
Jon Siwek
d30a335dba LogWriterAscii now prints time values w/ constant 6 digit precision.
closes #508
2011-07-22 10:49:43 -05:00
Robin Sommer
eb1e76600c Merge remote-tracking branch 'origin/topic/script-load-changes'
* origin/topic/script-load-changes:
  Fix reST file name associated w/ stdin when in doc mode (closes #497)
  Update @prefixes test.
  Rewrite a test using btest's TEST-START-FILE directive
  Fix @unload'd files from generating bro_script_loaded event.
  Renaming a test better.
  Reimplementation of the @prefixes statement.
  Fix accidental overwrite of BROPATH copy.
  Make @load statements recognize relative paths.
2011-07-21 15:29:15 -07:00
Jon Siwek
8a24d8d410 Update pybroccoli unit test baseline.
Corresponds to commit 46e1b99c1d90900689fb47cf12ac9c5e2340a023
in broccoli-python repo.
2011-07-21 15:26:44 -05:00
Robin Sommer
2892026201 Merge remote-tracking branch 'origin/topic/jsiwek/irc-orig'
* origin/topic/jsiwek/irc-orig:
  Shorten what's displayed in the IRC's log mime_type column for DCC transfers
  Add IRC unit tests.
  Small tweak to IRC event handlder priorities
  Fix IRC analyzer supplying wrong type to irc_dcc_message event.
  Changes to IRC analyzer and events (addresses #469).
2011-07-20 17:13:06 -07:00
Jon Siwek
54c14025d9 Fix reST file name associated w/ stdin when in doc mode (closes #497) 2011-07-20 16:13:22 -05:00
Jon Siwek
2a997f5ef3 Update @prefixes test. 2011-07-20 16:02:38 -05:00
Jon Siwek
f6dfbef952 Rewrite a test using btest's TEST-START-FILE directive 2011-07-20 15:59:07 -05:00
Jon Siwek
0dd1a1e21e Fix @unload'd files from generating bro_script_loaded event. 2011-07-20 15:56:25 -05:00
Jon Siwek
089b822302 Merge branch 'master' into topic/script-load-changes 2011-07-20 15:38:22 -05:00
Robin Sommer
9c44994fbf Merge remote-tracking branch 'origin/fastpath' 2011-07-20 13:16:59 -07:00
Jon Siwek
717a2a54f6 Merge branch 'master' into topic/jsiwek/irc-orig 2011-07-20 15:11:43 -05:00
Jon Siwek
beb44aee62 Shorten what's displayed in the IRC's log mime_type column for DCC transfers 2011-07-20 15:08:19 -05:00
Jon Siwek
73c138152c Add IRC unit tests. 2011-07-20 14:49:20 -05:00
Jon Siwek
ed1f1317e3 Small tweak to IRC event handlder priorities 2011-07-20 13:22:16 -05:00
Jon Siwek
063ad9a103 Fix IRC analyzer supplying wrong type to irc_dcc_message event.
And other IRC policy tweaks.
2011-07-20 13:19:44 -05:00
Robin Sommer
2b2a8d527f Removing debugging output from script. 2011-07-19 19:11:21 -07:00
Robin Sommer
ffe6fcf2a7 Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-07-19 19:08:50 -07:00
Robin Sommer
d6b8b4a65f Updating submodule(s). 2011-07-19 19:07:30 -07:00
Robin Sommer
31f68c7627 Adding a script to update CHANGES and VERSION.
This is still experimental ...
2011-07-19 19:07:11 -07:00
Seth Hall
cedbd7db35 Test. Closes #499 2011-07-19 21:54:17 -04:00
Robin Sommer
c4fd6c9280 Updating CHANGES.
This is just an approximation of the many things going into master
recently.
2011-07-19 18:53:29 -07:00
Seth Hall
cfaadc46ea Test, closes #499 2011-07-19 21:50:05 -04:00
Seth Hall
8c633daade Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-07-19 21:44:48 -04:00
Seth Hall
f0458ff6ac Closes #499
This is closing a test ticket.
2011-07-19 21:44:34 -04:00
Robin Sommer
2e9b64a7dd Updating submodule(s). 2011-07-19 17:54:57 -07:00
Robin Sommer
6253c7c02c Removing undocumented -H command line flag.
Closes #496.
2011-07-19 17:49:52 -07:00
Robin Sommer
5d7af681f4 Fixing comment. 2011-07-19 17:46:44 -07:00