Commit graph

10798 commits

Author SHA1 Message Date
Gregor Maier
13993e3291 Merge branch 'master' into fastpath 2011-08-04 17:19:19 -07:00
Gregor Maier
a823b3471e Updated submodules to current master 2011-08-04 17:19:04 -07:00
Gregor Maier
8910cd2dca Adding support to de-capsulate tunnels. Checkpoint.
Re-organizing code. Adding UDP tunnel handlers.
Using policy level redef'able consts to tune behavior. UDP port settings
not working yet.
2011-08-04 15:25:13 -07:00
Jon Siwek
d81bf27861 Updating README 2011-08-04 16:43:12 -05:00
Jon Siwek
495e987938 Remove $Id$ tags 2011-08-04 15:21:18 -05:00
Jon Siwek
05ff14a0b2 Remove policy.old directory, adresses #511 2011-08-04 15:04:33 -05:00
Robin Sommer
08bf644848 Updating submodule(s). 2011-08-03 22:19:50 -07:00
Robin Sommer
68171cf179 Updating submodule(s). 2011-08-03 17:05:27 -07:00
Robin Sommer
d8aece07d7 Merge remote-tracking branch 'origin/topic/jsiwek/raw_output'
* origin/topic/jsiwek/raw_output:
  Fix &raw_output and enable_raw_output interpretation of NUL characters
2011-08-03 16:27:52 -07:00
Robin Sommer
652ec272d6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix genDocSourcesList script lack of explicit sorting
  Fix PktSrc::Statistics returning bogus stats.
  --with-perftools configure option now assumes --enable-perftools (closes #527)
2011-08-03 15:27:18 -07:00
Gregor Maier
9c388a1809 Adding support to de-capsulate tunnels.
Checkpoint.
Decapsulation happens after IP Defragmentation. The "identity" of the
enclosing tunnel (the "parent") is added to the connection record of the
child (tunneled) connection as an optional field $tunnel_parent.
2011-08-03 14:12:47 -07:00
Jon Siwek
ef60a84b19 Fix genDocSourcesList script lack of explicit sorting
To make the doc.coverage test more portable/happy
2011-08-03 11:44:31 -05:00
Jon Siwek
f64ae5b7d6 Merge branch 'master' into fastpath 2011-08-03 11:43:34 -05:00
Jon Siwek
648e1bda26 Fix &raw_output and enable_raw_output interpretation of NUL characters
When using a `print` statement to write to a file that has raw output
enabled, NUL characters in string are no longer interpreted into "\0",
no newline is appended afterwards, and each argument to `print` is
written to the file without any additional separation.

(Re)Assigning to identifiers with the &raw_output attribute should also
now correctly apply the attribute to the file value being assigned.

Note that the write_file BiF should already be capable of raw string
data to a file, expect it bypasses the print_hook event.

Addresses #474
2011-08-03 10:51:40 -05:00
Seth Hall
6c806b0bce Async DNS lookups may cause memleaks under certain conditions. 2011-08-02 11:08:44 -04:00
Robin Sommer
0291083170 Spelling unification. 2011-08-01 21:03:06 -07:00
Robin Sommer
2832e9572e Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-08-01 20:56:41 -07:00
Robin Sommer
f95b645dd4 Updatin README. 2011-08-01 20:56:22 -07:00
Jon Siwek
d6d34f3a1f Fix PktSrc::Statistics returning bogus stats.
When reading from trace files, 'dropped' and 'link' fields are now
just zeroed.

When reading from an interface, the values filled in by pcap_stats()
are now only used when that function indicates success.

Closes #500.
2011-08-01 16:49:43 -05:00
Jon Siwek
c0c8b515f9 --with-perftools configure option now assumes --enable-perftools (closes #527) 2011-08-01 10:45:23 -05:00
Jon Siwek
31622bd35f Merge branch 'master' into topic/jsiwek/smtp-refactor 2011-08-01 10:34:21 -05:00
Robin Sommer
a34b0b5344 Updating changes. 2011-07-31 21:40:42 -07:00
Robin Sommer
f0fd0b3221 Updating submodule(s). 2011-07-31 21:30:31 -07:00
Robin Sommer
4f3dc4dba7 Updating CHANGES. 2011-07-30 18:45:14 -07:00
Robin Sommer
7c7daf258b Removing scripts from test-all that don't compile currently.
http-example.bro, line 11: unknown identifier Metrics::configure,
    at or near "Metrics::configure"
2011-07-30 18:34:28 -07:00
Robin Sommer
e25c61db83 Fixing merge relict. 2011-07-30 18:31:03 -07:00
Robin Sommer
a130b1f538 Updating submodule(s). 2011-07-30 18:29:04 -07:00
Robin Sommer
ac6f8c34a9 Updating submodule(s). 2011-07-30 18:26:43 -07:00
Robin Sommer
a5031ccce1 Merge remote-tracking branch 'origin/topic/jsiwek/dynamic-example-install'
* origin/topic/jsiwek/dynamic-example-install:
  Install example config files dynamically.

Closes #526.
2011-07-30 18:25:59 -07:00
Robin Sommer
ab09e4191f Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-07-30 18:25:23 -07:00
Robin Sommer
47d9b59263 Merge remote-tracking branch 'origin/topic/jsiwek/unit-tests'
* origin/topic/jsiwek/unit-tests:
  Fix utils/conn-ids test due to renamed conn-ids.bro
  Moving the test for site.bro to live w/ other utils/ tests.
  Fix test due to moving of site.bro
  More policy/utils unit tests and documentation.
  Updating documentation for some utils/ policy scripts
  Add unit tests for utils/paths.bro with some changes
  Adding unit tests for utils.
  Adding test for utils/addrs.bro.
  Add unit test for site.bro.

Conflicts:
	policy/utils/site.bro

Closes #525.
2011-07-30 18:18:26 -07:00
Seth Hall
8f8a4fd911 Fixed memory leak in SSL analyzer.
- This is a small enough fix and critical enough that I feel reasonably
  safe committing it directly to master.
2011-07-29 23:11:22 -04:00
Seth Hall
c3b850d6c1 Merge branch 'master' of ssh://git.bro-ids.org/bro
Conflicts:
	policy/protocols/http/base/detect-sqli.bro
2011-07-29 23:09:39 -04:00
Seth Hall
c2725ed58e In progress commit on a few items.
- Beginning rework of metrics interface.
- Updates to URI based SQLI detection to match metrics framework.
- Addition to SQLI regex to catch use of XOR.
2011-07-29 23:07:36 -04:00
Robin Sommer
96a9d488e0 Reworking logging's postprocessor logic.
The main change is that the postprocessor commands are no longer run
by the log writers themselves. Instead, the writers send back a
message to the log mgr once they have rotated. The manager then calls
a script level function to do somethign with the rotated file. By
default, it will be renamed to somethingn nice and then a
postprocessor shell command will be run on it if defined.

Pieces going into this:

    - Terminology change: "postprocessor" now refers to a script
    *function*. In addition, there are "postprocessor commands", which
    are shell commands that may be triggered by the function to run on
    a rotated file.

    - The RotationInfo record now comes with all the information that
    was previously provided internally to the C++ function running the
    post-processor command.

    - Changing the default time format to %Y-%m-%d-%H-%M-%S

    - rotation_path_func is gone

    - The default postprocessor function is defined individually by
      each LogWriter in frameworks/logging/plugin/*

    - The interface to postprocessor shell commands remains the same.

Needs a bit more testing ...
2011-07-29 17:32:33 -07:00
Jon Siwek
ca95ad9618 Install example config files dynamically.
They'll only get installed when the distribution version differs
from existing version on disk.
2011-07-29 17:29:57 -05:00
Jon Siwek
4b741293b1 Make the doc.coverage test happy. 2011-07-29 15:20:35 -05:00
Jon Siwek
17d74c23db SMTP script refactor. (addresses #509)
- message header state tracking is now done by handling mime_one_header
  instead of parsing the data in the smtp_data event
- changed the logging point to be when an smtp_reply is seen in response
  to the end of a DATA section
- the smtp package now uses it's own mime script and logging stream for
  logging entities, extraction, etc.
- fixes for mime file extraction: now logs the extracted file name, and
  the count of extracted files needed to be maintained in the State record
2011-07-29 14:55:53 -05:00
Robin Sommer
0e5bc16a60 Merge remote-tracking branch 'origin/topic/jsiwek/mask_addr_rval'
* origin/topic/jsiwek/mask_addr_rval:
  mask_addr bif now returns subnet (addresses #512)
2011-07-28 17:11:15 -07:00
Robin Sommer
4baf344278 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Normalize Notice::Type identifiers per convention. (closes #484)
  Another fix to the default-loaded-scripts test.
  Add new piped_exec BiF.
  Revert "Fixes for email_notice_to() function."
  Fixes for email_notice_to() function.
2011-07-28 17:05:55 -07:00
Jon Siwek
771728720d Normalize Notice::Type identifiers per convention. (closes #484) 2011-07-28 14:54:18 -05:00
Jon Siwek
451b43498f Another fix to the default-loaded-scripts test.
sed on some platforms like OS X (maybe FreeBSD in general) won't recognize
semi-colon delimited commands as multiple commands, instead use the -e
option multiple times to build the command list.
2011-07-27 15:11:05 -05:00
Jon Siwek
19dab4fdda Add new piped_exec BiF.
And changing email_notice_to() function in notice framework to
interface with sendmail through it.
2011-07-27 13:52:24 -05:00
Robin Sommer
73bb046b97 Revert "Fixes for email_notice_to() function."
This reverts commit a7db43efb1. We
decided to redo the interface between Bro and sendmail.
2011-07-27 08:14:28 -07:00
Jon Siwek
a7db43efb1 Fixes for email_notice_to() function.
Newline characters need escaping so that an echo command can interpret
them into a newline in the output piped to sendmail, else sendmail can't
parse the headers correctly.

I made the echo command a configurable option of the notice framework
in case `echo -e` is overshadowed by some shell-specific implementation
that doesn't support that option for interpreting char sequences.
2011-07-26 16:03:03 -05:00
Robin Sommer
58ceceac31 Fixing a couple tests. 2011-07-25 21:44:51 -07:00
Robin Sommer
28513b8325 Merge remote-tracking branch 'origin/topic/jsiwek/update-restdoc-target'
* origin/topic/jsiwek/update-restdoc-target:
  Adding a documentation coverage test.
  Fixes to relative @load'ing.

Closes #513.
2011-07-25 17:50:57 -07:00
Robin Sommer
5e7b727433 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Updating baseline for default loaded scripts... again.
  Update core.conn-uid test baseline.
  Rename/change policy.misc.loaded-scripts, again baselines default loaded scripts
  Changes to unit tests that rely on libmagic.
  Change policy.misc.loaded-scripts tests.
  core.load-pkg test now insensitive to default-loaded scripts.
  LogWriterAscii now prints time values w/ constant 6 digit precision.
2011-07-24 15:19:47 -07:00
Robin Sommer
1ce492e78c Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-07-24 15:09:50 -07:00
Jon Siwek
78e2d768c7 Adding a documentation coverage test.
- The CMake targets for generating reST docs from policy scripts are now
  automatically generated via the genDocSourcesList.sh script

- Fixed a lot of parsing errors in policy scripts that I saw along the way
2011-07-23 20:55:06 -05:00