Commit graph

7254 commits

Author SHA1 Message Date
Johanna Amann
b11d9b5ccd Add missing include directive. 2016-08-12 06:54:53 -07:00
Johanna Amann
fb3bc05df5 Merge remote-tracking branch 'origin/topic/johanna/component-initialization-order'
* origin/topic/johanna/component-initialization-order:
  Make tags generated during component initialization stable.
2016-08-11 21:50:53 -07:00
Johanna Amann
65d977f278 Make tags generated during component initialization stable.
The order in which the plugin initializers are executed is compiler
dependent. With this change, Tags will always be generated in
alphabetical ordering, not in compiler-dependent order.
2016-08-11 19:48:53 -07:00
Johanna Amann
2756dfe581 Make x509 intel seen script robust against file analyzer ordering.
Now it consistently works, even if the SHA1 file analyzer gets the data
before the X509 file analyzer.
2016-08-11 16:12:08 -07:00
Johanna Amann
19057c663f Input: DisableFrontend was not called upon Init failure.
This was introduced in 5b73345b73 due to a
chance how disable messages are handled.
2016-08-11 12:44:39 -07:00
Seth Hall
c9666086e4 DCE_RPC code simplification attempting to address a crash. 2016-08-11 14:05:50 -04:00
Johanna Amann
abbb01edb9 Update submodules
[nomail]
2016-08-11 07:58:17 -07:00
Johanna Amann
0e44b91cd9 Merge remote-tracking branch 'origin/topic/seth/log-framework-ext'
* origin/topic/seth/log-framework-ext:
  Log extensions: series of small fixes and new tests.
  Change the function for log extension to take a path only and update tests.
  Final changes to log framework ext code.
  Add logging framework metadata mechanism.
  Add unrolling separator & field name map to logging framework.
2016-08-11 07:47:13 -07:00
Johanna Amann
5ec2108bc7 Make invalidtext.bro test stable. 2016-08-10 18:28:38 -07:00
Johanna Amann
e7611e8521 Fix memory leak in EnumType.
Introduced in ca3f7eadbe.

This took a while to find.
2016-08-10 18:12:26 -07:00
Johanna Amann
6e769db23b Log extensions: series of small fixes and new tests.
The extensions now work with optional types, as well with complex types
(like subrecords). Not returning a record in the ext_func no longer
crashes bro.

The default_ext_func was switched to return void in
cases where no extension revord is defined (was bool).

I also got rid of the offsets in the indices - with the rest of the
implementation, that was not really necessary and made the code more
complex.
2016-08-10 14:14:03 -07:00
Seth Hall
79e49e1ab5 Change the function for log extension to take a path only and update tests.
We were having stack overflow issues creep in with the self-referential
field for the log extension function.
2016-08-10 13:53:27 -04:00
Johanna Amann
a3b7c91ba4 Fix configure warning when compiling with --enable-broker
We do no longer need to define BROKER_PYTHON_HOME, because as of
5bae0ee6f202038ad6ed74c1c2fdf1c07c81, broker uses PY_MOD_INSTALL_DIR as
the install location, which is already set.

Please note that this means that now the broker python bindings will be
installed to /lib/broctl instead of /lib/python.

Addresses BIT-1667
2016-08-10 10:21:55 -07:00
Johanna Amann
f9f948f617 Add netcontrol-connectors to aux 2016-08-10 10:16:10 -07:00
Seth Hall
5f6565d62c Final changes to log framework ext code.
The "metadata" functionality has been renamed to "ext" to
represent that the logs are being extended.  The function that
returns the record which is used to extend the log now receives
a log filter as it's single argument.

The field name "unrolling" is now renamed to "scope" so the variables
names now look like this: "Log::default_scope_sep"
2016-08-10 12:43:32 -04:00
Johanna Amann
fa4806d375 Update Mozilla CA list.
We now use the list from NSS 3.26
2016-08-10 09:21:46 -07:00
Johanna Amann
ba825e8910 update scripts loaded by default in local.bro.
We now load stats and capture-loss by default. Traceroute is disabled by
default because it can cause a lot of message load.
2016-08-10 08:57:22 -07:00
Robin Sommer
cdb27a953d Updating CHANGES and VERSION. 2016-08-10 08:47:26 -07:00
Seth Hall
a60ce35103 Merge remote-tracking branch 'origin/master' into topic/seth/log-framework-ext 2016-08-10 10:28:04 -04:00
Seth Hall
fea63eef30 Merge branch 'master' of ssh://git.bro-ids.org/bro 2016-08-09 15:42:17 -04:00
Seth Hall
ce26dee408 Fix a small script bug that was causing a test failure. 2016-08-09 15:42:07 -04:00
Robin Sommer
9157c37953 Updating CHANGES, VERSION, NEWS.
Moved the log changes into the "changed functionality" section.
2016-08-09 08:23:05 -07:00
Seth Hall
cbde25f1b8 GSSAPI analyzer now forwards authentication blobs more correctly (and other fixes).
Previously, the GSSAPI analyzer blindly forwarded authentication
blobs to the NTLM analyzer (which it instantiated too early). Now
it waits to instantiate sub analyzers until a blob of a particular
type has been seen.  It also makes the distinction between krb and
ntlm and forwards to the correct analyzer.

This required some fixes to the KRB analyzer because KRB over GSSAPI
looks slightly different than raw KRB.

The KRB analyzer also now includes support for the PA_ENCTYPE_INFO2
pre-auth data type.
2016-08-09 10:27:21 -04:00
Seth Hall
4a3dfe69b1 Add an argument to "disable_analyzer" to not do a reporter message by default.
If the analyzer is not found directly attached to the connection,
useless error messages are being output.  There are now several
cases where analyzers are attached within other analyzers so the
connection itself doesn't know about the analyzer.  This hides
these useless messages.
2016-08-09 10:22:31 -04:00
Seth Hall
6ee543220c Small SMB bug fix. 2016-08-08 16:50:35 -04:00
Seth Hall
5fc0fc5116 Fixing tests for SMB. 2016-08-08 16:15:20 -04:00
Seth Hall
86665e381b Merge branch 'master' into topic/seth/smb 2016-08-08 15:47:39 -04:00
Seth Hall
520ac8d92c Merge remote-tracking branch 'origin/master' into topic/seth/smb
# Conflicts:
#	scripts/base/protocols/dce-rpc/main.bro
#	scripts/base/protocols/ntlm/main.bro
#	scripts/policy/protocols/smb/smb1-main.bro
#	src/analyzer/protocol/smb/smb-common.pac
#	src/analyzer/protocol/smb/smb-strings.pac
#	src/analyzer/protocol/smb/smb1-com-locking-andx.pac
#	src/analyzer/protocol/smb/smb1-com-logoff-andx.pac
#	src/analyzer/protocol/smb/smb1-com-nt-create-andx.pac
#	src/analyzer/protocol/smb/smb1-com-open-andx.pac
#	src/analyzer/protocol/smb/smb1-com-read-andx.pac
#	src/analyzer/protocol/smb/smb1-com-session-setup-andx.pac
#	src/analyzer/protocol/smb/smb1-com-transaction-secondary.pac
#	src/analyzer/protocol/smb/smb1-com-transaction.pac
#	src/analyzer/protocol/smb/smb1-com-tree-connect-andx.pac
#	src/analyzer/protocol/smb/smb1-com-write-andx.pac
#	src/analyzer/protocol/smb/smb1-protocol.pac
2016-08-08 15:46:49 -04:00
Seth Hall
117b5c3ac7 Lots of SMB1 parsing fixes. 2016-08-08 15:36:07 -04:00
Johanna Amann
203e63416e Update submodule
[nomail]
2016-08-08 11:50:51 -07:00
Robin Sommer
84b372a772 Merge remote-tracking branch 'origin/topic/johanna/rule-reasons'
BIT-1655 #merged

* origin/topic/johanna/rule-reasons:
  NetControl: allow reasons in remove_rule calls.
2016-08-05 18:48:19 -07:00
Robin Sommer
01205492d1 NEWS update. 2016-08-05 18:24:38 -07:00
Robin Sommer
89610bf19b Updating submodule(s).
[nomail]
2016-08-05 15:43:52 -07:00
Robin Sommer
cf22492c3f Updating submodule(s).
[nomail]
2016-08-05 15:42:47 -07:00
Robin Sommer
982612b66f Merge remote-tracking branch 'origin/topic/johanna/remove-z'
BIT-1663 #merged

* origin/topic/johanna/remove-z:
  Remove -z/--analysis option.
2016-08-05 15:26:48 -07:00
Robin Sommer
6339d62673 Merge remote-tracking branch 'origin/topic/johanna/no-xml'
BIT-1666 #merged

* origin/topic/johanna/no-xml:
  Remove unused and only partially implemented ConversionSerializer.
  Remove code for XML serialization.
2016-08-05 15:25:43 -07:00
Robin Sommer
7d2f404aea Updating CHANGES. 2016-08-05 15:23:20 -07:00
Robin Sommer
2a854acd2b Revert "Merge branch 'topic/seth/smb'"
This reverts commit 9d9c7bafd3, reversing
changes made to eeb8c0cbb0.

The SMB analyzer wasn't ready yet.
2016-08-05 15:04:49 -07:00
Johanna Amann
3bec30ae93 Remove unused and only partially implemented ConversionSerializer.
Seems like the main use of this was to convert from file to XML
serialization format.
2016-08-05 14:06:46 -07:00
Johanna Amann
39d811ff06 Remove code for XML serialization.
Code was apparently defunct and was not user-accessible for a long time.
2016-08-05 14:02:28 -07:00
Seth Hall
f03e4ce041 Updating broctl. 2016-08-05 14:22:18 -04:00
Johanna Amann
4f1a2c7b62 NetControl: allow reasons in remove_rule calls.
This adds the capability for the user to attach a reason when removing
or destroying a rule. The message will both be logged in netcontrol.log
and forwarded to the responsible plugins.

Addresses BIT-1655
2016-08-05 10:49:09 -07:00
Seth Hall
f0bce636cf Merge remote-tracking branch 'origin/topic/dnthayer/ticket1627'
* origin/topic/dnthayer/ticket1627:
  Add a test for starting a cluster with a logger node
  Update broctl submodule
  Update broctl submodule to branch topic/dnthayer/ticket1627
  Change how logger node is detected in cluster framework
  Update test baselines for the new logger node type
  Update docs for the new logger node type
  Add a new node type for logging
2016-08-05 12:59:05 -04:00
Seth Hall
9d9c7bafd3 Merge branch 'topic/seth/smb'
* topic/seth/smb: (93 commits)
  Update NEWS
  Add some more DCE_RPC endpoints.
  SMB cleanup.
  Add rename and delete events for SMB2.
  Remove a file that wasn't even being compiled
  Simplify how packets go into the SMB analyzer.
  Minor cleanup.
  Add a DCE-RPC test.
  SMB: call Done() for analyzers instantiated by dce_rpc-auth
  Fix for an issue with GSSAPI mech_token from Florent Monjalet
  Now actually loading DCE-RPC's dpd.sig
  Fix a compile breakage.
  Fixes for some SMB merge conflicts with master.
  Updating the broctl pointer.
  Fixing SMB tests again.
  Simplify SMB string handling.
  SMB test clean up and docs
  SMB: fix number of small issues.
  Fix a small poor implementation in SMB string handling.
  Update tests to match move of smb base scripts into policy/
  ...
2016-08-05 12:45:18 -04:00
Seth Hall
3f26be4dd6 Update NEWS 2016-08-05 12:29:53 -04:00
Seth Hall
ebd064de17 Add some more DCE_RPC endpoints. 2016-08-05 12:29:45 -04:00
Seth Hall
7b3ec047d0 Merge remote-tracking branch 'origin/master' into topic/seth/smb 2016-08-05 11:46:13 -04:00
Seth Hall
eeb8c0cbb0 Merge branch 'topic/seth/intel-update-merge'
Closes github's #77 and closes BIT-1606

* topic/seth/intel-update-merge:
  Tiny scoping updates and test baseline updates for Intel framework.
  Minor documentation cleanups.
  Fixed insertion of nested subnets.
  Refactored FAF integration of intel framework.
  Added expiration for intelligence items.
  Improved intel notices.
  Added hook to allow extending the intel log.
  Added remove function to intel-framework.
  Added support for subnets to intel-framework.
  Refactoring of meta data handling for intel.
  Added testcase for intel updates.
2016-08-05 09:36:52 -04:00
Seth Hall
4bb4c54f96 Tiny scoping updates and test baseline updates for Intel framework. 2016-08-05 09:29:23 -04:00
Johanna Amann
b7ab6a5332 Remove -z/--analysis option.
It was only used for one special case that is not commonly used by
anyone.
2016-08-04 17:44:38 -07:00