Commit graph

10798 commits

Author SHA1 Message Date
Robin Sommer
ff7b92ffc8 Fixing bug with logging &optional records.
Closes #476.
2011-06-16 17:24:15 -07:00
Jon Siwek
7b7b15a18c Update istate.pybroccoli test.
For changes made to broccoli-python repository in
commit dbc73389e3a8c17734815993626d83084eb93615
2011-06-16 16:35:10 -05:00
Jon Siwek
4f15628146 Fix logging.ascii-empty & logging.ascii-options test failures.
Logging to stdout for use in a baseline doesn't work well when
there may be scripts that get loaded by default (in this case,
packet-filter) and also do logging.  Instead just baseline against
the logs generated by the test in question.
2011-06-16 15:23:47 -05:00
Seth Hall
8b9c1f1dcd Merge remote branch 'origin/topic/jsiwek/pybroccoli-fixes' into topic/policy-scripts-new 2011-06-16 16:04:00 -04:00
Jon Siwek
626c028f4f Merge branch 'master' into topic/policy-scripts-new 2011-06-16 13:29:58 -05:00
Seth Hall
57297eeca4 Removed webapp detection from default load. 2011-06-16 13:22:19 -04:00
Seth Hall
50f378a335 Small cleanup to netstats script. 2011-06-16 11:15:19 -04:00
Seth Hall
51b926f16a Fixed problem with HTTP file hashing
- HTTP file hashing now won't generate MD5 sums if
  a content gap happened during the file transfer.
2011-06-16 10:48:55 -04:00
Robin Sommer
88509e2191 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix istate.events-ssl test failing because of expired cert.
2011-06-15 17:52:38 -07:00
Jon Siwek
55c7c42eb7 Fix istate.events-ssl test failing because of expired cert.
Replaced expired certificate w/ one that's valid for ~100 years.
2011-06-15 16:34:33 -05:00
Seth Hall
bc7b7eb235 More rework to the notice framework to simplify it.
- The action-filters don't work now because of a
  meta-programming limitation so the notice policy
  tuning is more manual by fully defining a PolicyItem.
- There are two default action cheats defined.  ignore_types
  and email_types are sets which will ignore or email
  notices of those types.
2011-06-15 15:41:40 -04:00
Jon Siwek
303dba6372 Coerce event handler record arguments to correct record type.
This lets events be sent to bro that contain record arguments that
don't have to fill in all &optional record fields.

This corresponds to broccoli-python tests that were updated in
commit 8b87d8f61ef89162019cd4acc01be93700b0c588
2011-06-15 13:56:37 -05:00
Jon Siwek
4f6690776c Update pybroccoli test.
This corresponds to changes in the broccoli-python repository's
commit 5b843ecc02a5d04b281409a05cee3a947665cfd2
2011-06-15 12:41:48 -05:00
Jon Siwek
b7e5d4169e Fix (py)broccoli unit tests being skipped on Mac. 2011-06-15 12:33:35 -05:00
Seth Hall
a8893052ac Added some HTTP tests.
- Tests HTTP pipelining, MD5 summing and general HTTP handling.
- I checked over the baseline closely and it appears correct.
2011-06-15 13:29:04 -04:00
Seth Hall
a8f760c570 Loading the http/file-extract by default with the http/ scripts.
- Nothing is extracted by default.
2011-06-15 13:27:49 -04:00
Seth Hall
e792faab04 File identification and hashing now working and improved.
- File type identification falls back to libmagic
  if nothing is detected by the sigs.
- File extraction broken and waiting upon a fix for
  ticket #474
2011-06-15 13:11:11 -04:00
Seth Hall
dbbf73214c KnownServices only doing TCP based services now. 2011-06-15 13:09:22 -04:00
Seth Hall
cc0cab1f9a Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-15 11:27:54 -04:00
Seth Hall
ad66c9c4d9 Script cleanup.
- Defaults for all built-in asset tracking changed to LOCAL_HOSTS
- Added a tuning script for changing asset tracking
  to ALL_HOSTS in all of the core scripts that do
  asset tracking.
- Default Notice::policy files notices instead of alarming on them.
- Moved KnownHosts::Info back to export section because
  the log_known_hosts event can't be defined in the
  export section without it.
- Moved the Malware Hash Registry detection out of
  the core HTTP protocol scripts and added it to the
  all.bro script.
2011-06-15 11:27:39 -04:00
Seth Hall
9d55c694cd Script cleanup.
- Defaults for all built-in asset tracking changed to LOCAL_HOSTS
- Added a tuning script for changing asset tracking
  to ALL_HOSTS in all of the core scripts that do
  asset tracking.
- Default Notice::policy files notices instead of alarming on them.
- Moved KnownHosts::Info back to export section because
  the log_known_hosts event can't be defined in the
  export section without it.
- Moved the Malware Hash Registry detection out of
  the core HTTP protocol scripts.
2011-06-15 11:26:14 -04:00
Robin Sommer
e00e29273a Updating submodule(s). 2011-06-14 21:16:01 -07:00
Robin Sommer
244ee664e5 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Change bro doc mode to write out docs immediately after parsing.
2011-06-14 21:15:51 -07:00
Seth Hall
5be7caa4d8 Updates to misc scripts based on comments from Robin and Jon. 2011-06-14 15:55:30 -04:00
Seth Hall
9ee7d02554 Renaming direction and host functions for clarity. 2011-06-14 14:28:34 -04:00
Seth Hall
c10b9b4608 Updates to directions and hosts enum naming from Jon. 2011-06-14 14:24:32 -04:00
Seth Hall
4d35c0b8ca Reworked the directions and hosts functionality again.
- Split enum values into two separate enums.
- Renamed to fit the enum naming convention.
- New global variable named default_asset_tracking
  that changes default behavior of any script that
  tracks assets, usually by storing some amount
  of information about the network in memory.
2011-06-14 14:23:02 -04:00
Seth Hall
dc7229f15a Updates for directions-and-hosts 2011-06-14 13:53:50 -04:00
Seth Hall
844afba017 Added Apple Mail to the software parsing tests. 2011-06-14 13:40:29 -04:00
Seth Hall
f13cf830ea Updates to several things that are loosely linked together.
- Changed enum values to determine hosts and directions.
- Fixed a bug in detecting mail clients.
- Fixed a couple of problems with vulnerable software detection.
- New variable "Software::asset_tracking" for
  determining which software to track.
2011-06-14 13:39:50 -04:00
Seth Hall
9253157302 Updates for the metrics framework.
- Partially responding to Robin's comments on it.
2011-06-14 13:37:03 -04:00
Seth Hall
00f4751ada Merge remote branch 'origin/master' into topic/policy-scripts-new 2011-06-14 13:02:19 -04:00
Seth Hall
e0e0c99889 Cleaned up the webmail detection.
- Moved webmail detection into the smtp/software script.
- Added an option to detect mail clients based on
  the actual TCP connection the mail was seen being
  transferred over.
2011-06-14 12:47:25 -04:00
Seth Hall
c327144ac0 Extract application server software based on X-Powered-By header. 2011-06-13 21:56:18 -04:00
Jon Siwek
71c2e79202 Merge branch 'master' into fastpath 2011-06-13 20:21:24 -05:00
Robin Sommer
a73fc15659 Merge remote branch 'origin/fastpath' 2011-06-13 18:03:02 -07:00
Robin Sommer
5bd8caa7a0 Merge remote branch 'origin/topic/gregor/rpc'
Note, I haven't gone through the script-level code as that will change
soon anyway.
2011-06-13 17:56:28 -07:00
Jon Siwek
53dc4ef084 Change bro doc mode to write out docs immediately after parsing.
Originally docs were written right after parsing, but it changed to after
the bro_init event happens when I was experimenting with auto-documenting
logging streams by querying the LogMgr after bro_init.  That experiment
dead-ended, and that location is bad for other reasons: the doc framework
may try to access BroObj's that have already been freed.
2011-06-13 19:50:11 -05:00
Seth Hall
08dca169f6 Fixed a problem with accessing the method attribute on an HTTP::Info record.
- Found by Jim Barlow.
2011-06-13 14:30:16 -04:00
Jon Siwek
eb85ae9654 Really, null-terminate full 15-char NetBIOS host names, too. 2011-06-12 08:46:58 -05:00
Seth Hall
c6bf94f276 First commit of intelligence framework.
- Data insertion and querying works.
- A few tests are implemented to show usage scenarios.
2011-06-10 16:52:46 -04:00
Jon Siwek
b4d70a22db Fixed core.load-pkg test w/ diff canonifier instead 2011-06-10 15:07:32 -05:00
Jon Siwek
9e747a040d Revert "Fix core.load-pkg unit test."
This reverts commit 80558a994a.
2011-06-10 15:01:35 -05:00
Jon Siwek
cb89440593 Fix language.wrong-delete-field test by running through abs path canonifier 2011-06-10 14:56:49 -05:00
Jon Siwek
90196b4dc8 Fix bifs.unique_id-rnd test failing because of wc output formatting 2011-06-10 13:27:08 -05:00
Seth Hall
270758267e Updating the default policy script paths for the new scripts organization. 2011-06-10 14:10:56 -04:00
Seth Hall
999b48e801 Tuning fragment storage down to 5 minutes in the default tuning. 2011-06-10 14:09:58 -04:00
Seth Hall
d29ffc759d Added Zimbra to the webmail detection over SMTP. 2011-06-10 14:09:26 -04:00
Jon Siwek
d358ef1e71 Null-terminate the string created by decode_netbios_name BiF.
(initially observed through failures of bifs.netbios-functions unit test)
2011-06-10 12:59:05 -05:00
Seth Hall
64c296311c Add a field to the packet-filter log to indicate if it's the initial filter. 2011-06-10 13:48:31 -04:00