Commit graph

929 commits

Author SHA1 Message Date
Seth Hall
20167c20f2 Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-30 21:26:56 -04:00
Seth Hall
b4b990cfb5 Updates to the DPD framework.
- Removed the ProtocolViolation notice.  I'd like to hear
  if someone actually used that notice for something.
- Folded the dyn-disable functionality into the dpd/base script.
- Other small cleanup.
2011-06-30 21:26:30 -04:00
Seth Hall
e3f6909b93 Fixed a bug in the auth-addl DNS script. 2011-06-30 21:24:12 -04:00
Jon Siwek
9242f17978 Add RPC/SSL scripts to doc generation target. 2011-06-30 17:12:35 -05:00
Jon Siwek
446521d940 Merge branch 'topic/policy-scripts-new' of git://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-30 17:06:30 -05:00
Jon Siwek
5a2cd265ab Update the generated script doc organization.
Added an additional master TOC index for Bro script packages that
automatically gets filled in at ``make doc`` time.  The master TOC
links to per-package indexes which contains links to all the scripts
contained within it along with their summary.  The per-package index
is also now automatically generated/derived from the path component
of the script passed into the rest_target() macro.
2011-06-30 16:58:20 -05:00
Seth Hall
cf527147e7 Changing back the last commit. It made things worse. 2011-06-30 17:07:07 -04:00
Seth Hall
5382456f12 Trying a different method of record parsing for SSL analyzer. 2011-06-30 17:04:32 -04:00
Seth Hall
00065c88dd Moved the RPC script into the right place. 2011-06-30 16:47:11 -04:00
Seth Hall
556bc55068 More SSL script cleanup. 2011-06-30 16:45:13 -04:00
Seth Hall
06a0b2df67 Fixed a segfault from empty strings in the SSL analyzer. 2011-06-30 14:24:15 -04:00
Seth Hall
b9e36025a7 Removing what I believe is the last stray print statement from the SSL analyzer. 2011-06-30 13:44:46 -04:00
Seth Hall
a62d1d1fe0 Fixed more eternal looping bugs in the SSL analyzer. 2011-06-30 13:42:42 -04:00
Seth Hall
aebc2ea030 Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-30 13:23:45 -04:00
Seth Hall
24d570a94c Updates and fixes for the SSL analyzer.
- Fixed a pretty major eternal looping bug in the SSL analyzer and
  a few other parsing problems.
- New core scripts and log for SSL connection analysis.
- New known-certs script for logging certificate assets.
2011-06-30 13:23:31 -04:00
Jon Siwek
fe5f4b8e53 Changes to make generated script docs understand new policy/ hierarchy.
Added an arg to the search_for_files() util function that can return
the subpath of BROPATH's policy/ dir in which the loaded file is found.
This subpath is then used in both the the reST file's document title
(so that script's named e.g. "base.bro" actually have some context) and
in figuring out how to interlink with other generated docs of other
scripts that are found in @load directives.

I still need to overhaul things so the loading of "packages" is
documented in a meaningful way and that the CMake targets are able
to generate indexes for packages.
2011-06-30 11:37:15 -05:00
Jon Siwek
f307a3f408 Update core.vlan-mpls baseline.
conn UIDs changed because they're now also generated for notices.
2011-06-29 12:57:45 -05:00
Jon Siwek
3c055b16a5 Update core.conn-uid test/baseline.
All the UIDs in the baselines changed because they're now also
being generated for notices.
2011-06-29 12:49:07 -05:00
Jon Siwek
0d4be5d772 Fixing tests / updating baselines.
- core.load-unload: scripts that get loaded by default changed, so to
  make the test insensitive to that in the future, I changed the test
  to just check that the stdout is empty (the @unload'd script would have
  had output there)

- policy.frameworks.logging.rotate-custom: I saw that the ordering of
  the log postprocessor output caused a failure for me even though the
  overall content was the same, so it now sorts that part before diff'ing

- core.print-bpf-filters-ipv[4|6]: packet-filter log file name changed

- policy.protocols.conn.known-services: logging file names changes and
  local_nets is now in the Site module
2011-06-29 12:34:14 -05:00
Seth Hall
dddfc1009a Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-27 15:47:37 -04:00
Seth Hall
de21409921 Renaming a poorly named notice. 2011-06-27 15:46:50 -04:00
Jon Siwek
73fa60f769 Resolving a conflict in scan.l.
Caused by changes made while working on the way loaded scripts are tracked
(commit 9de6e9170c to master branch) that
didn't take into account an unmerged commit on the policy-scripts-new branch
(56a946568a).

(re-added warning comments that were removed in the former commit since they
still seem relevant now)
2011-06-27 13:08:30 -05:00
Seth Hall
9efb27b6c6 Notice framework updates.
- Fixed problem where notices were logged even if they
  didn't have the ACTION_FILE action applied.
- New PolicyItem element, $halt.  It's used for halting
  the policy processing if a predicate returns T.
  This replaces the ACTION_STOP action.
- Initial hacky email extension mechanism.
- Removed the IDMEF line.  When that added back later
  it will likely be done more modularly.
2011-06-27 13:16:04 -04:00
Seth Hall
16b9a0e025 Fixed bug I just introduced to known-services. 2011-06-27 12:59:23 -04:00
Seth Hall
0337107a95 Known services now only logs for "normal" connections. 2011-06-27 12:46:05 -04:00
Seth Hall
4c51794874 Fix the name of the DPD log. 2011-06-27 12:44:56 -04:00
Seth Hall
4364f572df Updating the netstats script to match the new internal code. 2011-06-27 01:08:42 -04:00
Seth Hall
bdbfa2642c Removed expected_connection_timeout variable.
- expected_connection_timeout is unused and gone now.
2011-06-27 00:58:36 -04:00
Seth Hall
ab182e792e Merge remote branch 'origin/master' into topic/policy-scripts-new 2011-06-27 00:45:56 -04:00
Robin Sommer
3ddba11e87 Changing logging's default naming scheme.
We now take the enum ID name rather than the module. Closes #483.
2011-06-26 16:45:44 -07:00
Seth Hall
c070cb31da Merge remote branch 'origin/master' into topic/policy-scripts-new
Conflicts:
	policy/bro.init
	testing/btest/language/rare-events.bro
2011-06-25 23:49:20 -04:00
Robin Sommer
ed8301a4df Updating CHANGES. 2011-06-25 20:04:35 -07:00
Robin Sommer
704cc45165 Updating submodule(s). 2011-06-25 18:22:45 -07:00
Robin Sommer
a7ced3228b Removing language.rare-events test which is no longer meaningful.
It relied on the now removed netstats_update event.
2011-06-25 18:10:40 -07:00
Robin Sommer
6b9d23abb2 Applying DNS TTL patch from #368.
I've restructured/cleaned up the original patch by thomas.other a bit.
2011-06-25 17:44:56 -07:00
Robin Sommer
ded395007f Merge remote branch 'origin/topic/jsiwek/script-load-cleanup'
* origin/topic/jsiwek/script-load-cleanup:
  Cleaning up the script loading implementation.
  Fix baseline for core.conn-id (now core.conn-uid) test.
2011-06-25 17:11:54 -07:00
Robin Sommer
6d2a89f1f8 Merge remote branch 'origin/topic/seth/net-stats-bif'
* origin/topic/seth/net-stats-bif:
  Removing a stray print statement.
  Changed netstats (packet loss) handling to script-land.

Nice idea to pass the old data into a regular scheduled event!

Conflicts:
	src/event.bif
2011-06-25 17:05:15 -07:00
Robin Sommer
85f7d2e809 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Raise internal error when failing to read contents of state file with -x option

I've changed this to use error() instead of internal_error(). The
latter should only be used for logic errors that indicate a bug in
Bro. In this case, the message flags a problem that's more likely to
be external.
2011-06-25 16:44:56 -07:00
Seth Hall
663b0eed7b Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new
Conflicts:
	policy/frameworks/notice/base.bro
2011-06-25 01:18:59 -04:00
Seth Hall
04aa03e4ab New default notice actions for emailing network admins.
- When ACTION_EMAIL_ADMIN_ORIG or ACTION_EMAIL_ADMIN_RESP
  is applied to a notice,
  the email addresses associated with the address
  are collected from the new local_admins table
  and the email is sent to all discovered email addresses.
- The site.bro script is now in the Site module.
- Some other small cleanup.
2011-06-25 01:17:09 -04:00
Seth Hall
71d6488637 New default notice action for emailing network admins.
- When ACTION_EMAIL_ADMIN is applied to a notice,
  the email addresses associated with the address
  are collected from the new local_admins table
  and the email is sent to all discovered email addresses.
- The site.bro script is now in the Site module.
- Some other small cleanup.
2011-06-25 00:57:02 -04:00
Seth Hall
09e242f98f weird.bro moved into notice framework.
- That might not be the right place to put it though.
2011-06-24 16:40:05 -04:00
Seth Hall
e19e050121 Removed a redundant and out of place mozilla CA list. 2011-06-24 16:30:36 -04:00
Seth Hall
124ae1bc41 Renamed the stream for the notice log. 2011-06-24 16:14:59 -04:00
Seth Hall
3fce0f89f2 Small consistency tweaks for the communications framework. 2011-06-24 16:14:26 -04:00
Seth Hall
77948482b6 Finishing the inactivity script. 2011-06-24 16:13:45 -04:00
Seth Hall
cb3d312d5a Intel framework test passes now. 2011-06-24 16:10:13 -04:00
Seth Hall
0b918eb140 Reorganized some of the tests for consistency. 2011-06-24 15:40:56 -04:00
Jon Siwek
adeec23201 Merge branch 'topic/policy-scripts-new' of git://git.bro-ids.org/bro into topic/policy-scripts-new 2011-06-24 13:36:49 -05:00
Jon Siwek
4f33dcf59e Updating software version parsing test.
Tweaked parsing code a bit catch a couple that were failing.
2011-06-24 13:27:35 -05:00