Commit graph

5468 commits

Author SHA1 Message Date
Gilbert Clark
d3a5440cff Merge branch 'master' into topic/gilbert/plugin-api-tweak 2015-02-23 13:22:47 -05:00
Jon Siwek
8a758d2eb7 Merge remote-tracking branch 'origin/topic/robin/plugin-updates'
* origin/topic/robin/plugin-updates:
  Doc tweak.
  Submodule update.
  Updating plugin docs to recent changes.
  Update submodules.
  Updating submodule.
  Updating submodules.
  Updating plugin tests.
  Making plugin names case-insensitive for some internal comparisions.
  Updating submodules.
  Explicitly removing some old scripts on install.
  Removing setting installation plugin path from  bro-path-dev.sh .
  Creating the installation directory for plugins at install time.

BIT-1318 #merged
BIT-1302 #closed
BIT-1312 #closed
2015-02-23 12:20:39 -06:00
Gilbert Clark
ce18a2867e Merge branch 'master' of ssh://git.bro-ids.org/bro into topic/gilbert/plugin-api-tweak 2015-02-23 00:00:38 -05:00
Robin Sommer
d29679484d Removing dependency on PCAP_NETMASK_UNKNOWN to compile with libpcap <
1.1.1.
2015-02-20 13:49:58 -08:00
Robin Sommer
abcb8e7c95 Merge remote-tracking branch 'origin/topic/jsiwek/while'
Added documentation to statement reference.

* origin/topic/jsiwek/while:
  Add 'while' statement to Bro language.

BIT-1315 #merged
2015-02-20 12:59:39 -08:00
Robin Sommer
a2189c0338 Merge remote-tracking branch 'origin/fastpath'
(No way to activate/test it it seems?)

* origin/fastpath:
  Add the ability to remove surrounding braces from the JSON formatter.
2015-02-20 12:40:00 -08:00
Robin Sommer
15fe0abc3f Updating submodule(s).
[nomail]
2015-02-20 12:36:42 -08:00
Robin Sommer
751b6590b5 Doc tweak. 2015-02-17 15:35:28 -08:00
Robin Sommer
802580b0a7 Submodule update. 2015-02-17 14:47:54 -08:00
Robin Sommer
093d406920 Updating plugin docs to recent changes. 2015-02-17 14:03:05 -08:00
Robin Sommer
818ba9127f Update submodules. 2015-02-17 13:59:21 -08:00
Robin Sommer
9025b42534 Updating submodule. 2015-02-17 12:56:36 -08:00
Robin Sommer
bdb2707a08 Updating submodules. 2015-02-16 20:26:26 -08:00
Robin Sommer
b6bbf90643 Updating plugin tests.
The init-plugin scripts now expects a destination directory. Normally
that would be a new subdirectory, but for the tests to keep working we
can also put it right into the current directory.
2015-02-16 20:26:26 -08:00
Robin Sommer
0f96d06252 Making plugin names case-insensitive for some internal comparisions.
Makes the plugin system a bit more tolerant against spelling
inconsistencies that would be hard to catch otherwise.
2015-02-16 20:26:23 -08:00
Robin Sommer
ab3cdf494a Updating submodules. 2015-02-16 13:40:21 -08:00
Robin Sommer
d36422fde1 Explicitly removing some old scripts on install.
Some scripts have moved into plugins, but may cause confusion if they
stick around from old installations. Explicitl removing them on install.

We had this problem before in other cases, and it should be ok to help
people upgrading a bit here, even though hardcoding these isn't great.
2015-02-16 13:37:59 -08:00
Robin Sommer
ff16f6215a Removing setting installation plugin path from bro-path-dev.sh .
Also, adding to existing BRO_PLUGIN_PATH rather than replacing.

Addresses #1312
2015-02-16 12:49:54 -08:00
Robin Sommer
2e043c0ff6 Creating the installation directory for plugins at install time. 2015-02-16 12:11:59 -08:00
Seth Hall
b00bd7702f Add the ability to remove surrounding braces from the JSON formatter. 2015-02-13 22:02:54 -05:00
Jon Siwek
4bcb9d2d92 Updating submodule(s).
[nomail]
2015-02-13 18:04:17 -06:00
Jon Siwek
8e4f4b46f7 Updating submodule(s).
[nomail]
2015-02-13 16:23:43 -06:00
Jon Siwek
062baefde0 Add 'while' statement to Bro language. 2015-02-13 11:26:54 -06:00
Jon Siwek
212368b245 Merge remote-tracking branch 'origin/topic/jsiwek/socks-authentication'
* origin/topic/jsiwek/socks-authentication:
  Refactor SOCKS5 user/pass authentication support.
  Update the SOCKS analyzer to support user/pass login.

BIT-1011 #merged
2015-02-13 09:15:50 -06:00
Jon Siwek
961fd06cad Refactor SOCKS5 user/pass authentication support.
- Rename event "socks_login_userpass" to "socks_login_userpass_request"
- Rename event "socks_login_reply" to "socks_login_userpass_reply"
- Split unsupported authN weird into 2 types: method vs. version

Addresses BIT-1011
2015-02-12 17:06:38 -06:00
Jon Siwek
035cce96ac Merge branch 'fastpath'
* fastpath:
  Submodule update - newest sqlite version
2015-02-12 12:19:23 -06:00
Jon Siwek
88af106b6b Fix use of deprecated gperftools headers.
As of gperftools 2.0 (Feb. 2012), they've been renamed in to
gperftools/ instead of google/, and as of gperftools 2.2, including
the later emits deprecation warnings.
2015-02-11 13:56:34 -06:00
Johanna Amann
5f0a27ca31 Submodule update - newest sqlite version 2015-02-09 12:10:49 -08:00
Robin Sommer
23b9705a7b Fixing analyzer tag types for some Files::* functions. 2015-02-08 18:23:22 -08:00
Robin Sommer
530c3c0c6b Changing load order for plugin scripts.
This can be need if they depends on each other.
2015-02-08 18:22:59 -08:00
Seth Hall
9592f64225 Update the SOCKS analyzer to support user/pass login.
- This addresses BIT-1011
 - Add a new field to socks.log; "password".
 - Two new events; socks_login_userpass and socks_login_reply.
 - One new weird for unsupported authentication method.
 - A new test for authenticated socks traffic.
 - Credit to Nicolas Retrain for the initial patch.  Thanks!
2015-02-05 12:44:10 -05:00
Jon Siwek
1012539ded Merge branch 'topic/seth/small-files-bof-handling-fix'
* topic/seth/small-files-bof-handling-fix:
  Fix a bug in the core files framework with handling the BOF buffer.

BIT-1310 #merged
2015-02-05 10:10:00 -06:00
Jon Siwek
8859c73bde Add/fix log fields in x509 diff canonifier. 2015-02-05 10:04:04 -06:00
Jon Siwek
08bb4b2274 Merge branch 'master' of https://github.com/msmiley/bro
* 'master' of https://github.com/msmiley/bro:
  "id" not defined for debug code
2015-02-05 10:03:39 -06:00
Seth Hall
a97cd1f3a2 Fix a bug in the core files framework with handling the BOF buffer.
- Any files where the total size was below the size of the
   default bof_buffer size couldn't have stream analyzers successfully
   attached because the bof_buffer never reached the full size
   and was never flushed.  This branch explicitly marks the buf_buffer
   as full and flushes it when the file is being removed.
2015-02-05 09:09:08 -05:00
Jon Siwek
565ad360c6 Add x509 canonifier to a unit test. 2015-02-03 17:04:26 -06:00
Mike Smiley
51203d7193 "id" not defined for debug code
"id" not defined for debug code when using -DPROFILE_BRO_FUNCTIONS
2015-02-03 14:29:34 -05:00
Jon Siwek
21c7642f62 Fix memory leak in new split_string* functions. 2015-02-02 11:18:06 -06:00
Robin Sommer
f82adb724c Merge remote-tracking branch 'origin/topic/jsiwek/deprecation'
Fixing one missing index adjustment (I believe ...)

BIT-757 #merged

* origin/topic/jsiwek/deprecation:
  Fix typo.
  Update documentation (broken links, outdated tests).
  Update NEWS for deprecated/changed functions.
  Deprecate split* family of BIFs.
  Improve use of &deprecated on functions.
  Add a new attribute: &deprecated.
2015-01-30 14:37:05 -08:00
Jon Siwek
36bc7ba5b5 Handle guess_lexer exceptions in pygments reST directive 2015-01-27 10:15:22 -06:00
Jon Siwek
6cedd67c38 DNP3: fix reachable assertion and buffer over-read/overflow.
A DNP3 packet using a link layer header that specifies a zero length can
trigger an assertion failure if assertions are enabled.  Assertions are
enabled unless Bro is compiled with the NDEBUG preprocessor macro
defined.  The default configuration of Bro will define this macro and so
disables assertions, but using the --enable-debug option in the
configure script will enable assertions.  When assertions are disabled,
or also for certain length values, the DNP3 parser may attempt to pass a
negative value as the third argument to memcpy (number of bytes to copy)
and result in a buffer over-read or overflow.

Reported by Travis Emmert.
2015-01-23 11:25:00 -06:00
Jon Siwek
d6d5276d76 Update binpac: Fix potential out-of-bounds memory reads in generated code.
Field lengths derived from other data in the input could potentially
lead to reading from outside the bounds of the input buffer.

Reported by John Villamil and Chris Rohlf - Yahoo Paranoids
2015-01-23 10:43:28 -06:00
Robin Sommer
4d0a09a037 Updating submodule(s).
[nomail]
2015-01-22 07:25:27 -08:00
Jon Siwek
e62c711e09 Fix typo. 2015-01-21 16:57:16 -06:00
Jon Siwek
7b2316262d Update documentation (broken links, outdated tests). 2015-01-21 16:38:31 -06:00
Jon Siwek
f4d18e6940 Update NEWS for deprecated/changed functions. 2015-01-21 16:15:17 -06:00
Jon Siwek
23f04835c6 Deprecate split* family of BIFs.
These functions are now deprecated in favor of alternative versions that
return a vector of strings rather than a table of strings.

Deprecated functions:

- split: use split_string instead.
- split1: use split_string1 instead.
- split_all: use split_string_all instead.
- split_n: use split_string_n instead.
- cat_string_array: see join_string_vec instead.
- cat_string_array_n: see join_string_vec instead.
- join_string_array: see join_string_vec instead.
- sort_string_array: use sort instead instead.
- find_ip_addresses: use extract_ip_addresses instead.

Changed functions:

- has_valid_octets: uses a string_vec parameter instead of string_array.

Addresses BIT-924, BIT-757.
2015-01-21 15:34:42 -06:00
Jon Siwek
011e2cdd32 Improve use of &deprecated on functions.
- Don't report warnings on function definition if declaration is marked
  deprecated.
- Allow &deprecated to apply to a standalone function definition.
2015-01-21 12:27:09 -06:00
Jon Siwek
87962a48dd Add a new attribute: &deprecated.
While scripts are parsed, a warning is raised for each usage of an
identifier marked as &deprecated.  This also works for BIFs.

Addresses BIT-924, BIT-757.
2015-01-21 09:40:50 -06:00
Robin Sommer
f51dc5cbb8 Fixing (harmless) Coverity warning. 2015-01-17 08:07:18 -08:00