Commit graph

7932 commits

Author SHA1 Message Date
Johanna Amann
dae55514f2 SMB: call Done() for analyzers instantiated by dce_rpc-auth 2016-07-07 11:02:57 -07:00
Robin Sommer
781fdfa5ba Merge remote-tracking branch 'origin/topic/seth/smb' into topic/robin/smb-merge 2016-07-07 10:41:31 -07:00
Seth Hall
c31c0ed2e2 Fix for an issue with GSSAPI mech_token from Florent Monjalet
From Florent's patch:
Previously, the ASN1EncodingMeta was in the NTLM_SSP_Token; this broke the
NTLM decoding when used directly with DCE-RPC. NTLM now works on DCE-RPC
and should work properly on other layers in the future (e.g. HTTP
Authentication data).
2016-07-07 13:03:33 -04:00
Seth Hall
5c744fa0c9 Merge branch 'topic/seth/smb' of ssh://git.bro-ids.org/bro into topic/seth/smb 2016-07-07 12:56:31 -04:00
Seth Hall
3a1a14d1c4 Now actually loading DCE-RPC's dpd.sig 2016-07-07 12:55:49 -04:00
Robin Sommer
75e3f9bc69 Removing ack_above_hole event.
This was a subset of content_gap and led to plenty noise.

Addresses BIT-688.
2016-07-06 15:35:21 -07:00
Robin Sommer
394b16e1f2 Flagging retransmissions in connection history.
This adds a t/T letter for the first TCP payload retransmission from
originator or responder, respectively.

Addresses BIT-977.
2016-07-06 15:01:16 -07:00
Robin Sommer
1d7bca21e4 Removing ack_above_hole event.
This was a subset of content_gap and led to plenty noise.

Addresses BIT-688.
2016-07-06 09:18:21 -07:00
Robin Sommer
ca3f7eadbe Fix segfault when an existing enum identifier is added again with a
different value.

Addresses BIT-931.

Also switching the internal enum ID map to storing std::string for
easier memory management.
2016-07-05 17:54:10 -07:00
Robin Sommer
721693425f Escape the empty indicator in logs if it occurs literally as a field's
actual content.

Addresses BIT-931.
2016-07-05 16:34:24 -07:00
Daniel Thayer
5a557436f7 Update broctl submodule to branch topic/dnthayer/ticket1627 2016-07-05 12:11:12 -05:00
Daniel Thayer
b80298a9ad Change how logger node is detected in cluster framework
Instead of assuming the logger node always has the name "logger", now
broctl will set a boolean which the cluster framework scripts can use
to determine if there is a logger node or not.

Also removed one line from the manager node script, because it has to do
with logging, which the logger.bro script handles.
2016-07-05 10:36:03 -05:00
Seth Hall
9360112e8a Updating broctl pointer 2016-07-05 11:31:27 -04:00
Robin Sommer
09ea84bb6e Merge remote-tracking branch 'origin/topic/johanna/netcontrol-improvements'
Great work, and great documentation!

I'm getting one test failure with
scripts.base.frameworks.netcontrol.catch-and-release-cluster Going
ahead and commiting, Jenkins will show the details I assume.

BIT-1584 #merged

* origin/topic/johanna/netcontrol-improvements:
  SMTP does not need to pull in the notice framework.
  Write NetControl framework documentation.
  Use NetControl for ACTION_DROP of notice framework.
  NetControl: slightly update catch and release logging
  NetControl: fix several small logging issues
  NetControl: more catch and release logging and cluster fix
  NetControl: rewrite catch and release and small fixes.
  NetControl: find_rules_subnet works in cluster mode
  NetControl: fix acld whitelist command
  NetControl: add rule exists as state besides added and failure.
  NetControl: Suppress duplicate "plugin activated" messages.
  NetControl: make new broker plugin options accessible
  NetControl: add predicates to broker plugin
2016-06-30 17:34:44 -07:00
Robin Sommer
6e483c1f4f Updating submodule(s).
[nomail]
2016-06-30 16:55:40 -07:00
Robin Sommer
d06a22968e Updating submodule(s).
[nomail]
2016-06-30 16:52:54 -07:00
Robin Sommer
716a07adde Updating submodule(s).
[nomail]
2016-06-30 16:50:22 -07:00
Daniel Thayer
fb0b1fcc62 Update test baselines for the new logger node type 2016-06-30 17:13:05 -05:00
Robin Sommer
9632a1474c Updating submodule(s).
[nomail]
2016-06-30 14:10:18 -07:00
Daniel Thayer
ce0b9d42d3 Update docs for the new logger node type 2016-06-30 15:45:36 -05:00
Seth Hall
ec4c4ee2d1 Fix a compile breakage. 2016-06-30 11:32:30 -04:00
Daniel Thayer
f45a3e8878 Add a new node type for logging
Changed the cluster framework scripts by adding a new Bro node type
for doing logging (this is intended to reduce the load on the manager).
If a user chooses not to specify a logger node in the cluster
configuration, then the manager will write logs locally as usual.
2016-06-29 17:55:49 -05:00
Jan Grashoefer
a7d3f530fa Minor documentation cleanups. 2016-06-29 20:58:39 +02:00
Seth Hall
94a4777fff Fixes for some SMB merge conflicts with master. 2016-06-29 11:12:30 -04:00
Seth Hall
514dfc3479 Merge remote-tracking branch 'origin/master' into topic/seth/smb
# Conflicts:
#	testing/btest/Baseline/plugins.hooks/output
#	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log
#	testing/btest/Baseline/scripts.policy.misc.dump-events/smtp-events.log
2016-06-29 09:43:31 -04:00
Seth Hall
98a272b9fd Merge branch 'master' of git.bro.org:bro 2016-06-28 11:17:54 -04:00
Seth Hall
1c4a9e6132 Updating the broctl pointer. 2016-06-28 11:17:38 -04:00
Seth Hall
873981e06b Updating the broctl pointer. 2016-06-28 11:16:39 -04:00
Seth Hall
cfe3bddd75 Fixing SMB tests again. 2016-06-28 11:03:16 -04:00
Seth Hall
7936cdd958 Simplify SMB string handling.
This normalizes unicode strings from the SMB
analyzer to UTF-8 so that they display in the
logs better.
2016-06-28 10:31:26 -04:00
Seth Hall
91161f790c SMB test clean up and docs 2016-06-28 10:30:41 -04:00
Johanna Amann
971f7e236f Fix a number of documentation building errors 2016-06-27 12:41:40 -07:00
Johanna Amann
94e242f2fd Input/Logging: Make operator explicit
This fixes a long-standing todo for once we switch to C++11.
2016-06-27 12:09:31 -07:00
Johanna Amann
27a7edc0c5 Update submodule.
[nomail]
2016-06-27 10:37:47 -07:00
Johanna Amann
743d4672bd SMTP does not need to pull in the notice framework.
This caused test baseline changes in one of the test: notice now ties in
netcontrol due to ACTION_DROP. Catch and release uses the new_connection
event, which was not before triggered and can cause uids to be generated
for connections that are not usually assigned uids in bare mode.
2016-06-23 13:22:16 -07:00
Johanna Amann
72903c8199 Add new ciphers from RFC 7905. 2016-06-22 17:17:01 -07:00
Johanna Amann
f1267b0b94 Write NetControl framework documentation.
In the process, some of the script documentation of the NetControl
framework was also updated.
2016-06-22 16:02:48 -07:00
Johanna Amann
3b55a917ac Use NetControl for ACTION_DROP of notice framework.
So far, this action did nothing...
2016-06-22 16:01:26 -07:00
Jan Grashoefer
df5d9adfb4 Fixed insertion of nested subnets.
When inserting, existance of the given subnet is checked using exact
matching instead of longest prefix matching. Before, inserting a subnet
would have updated the subnet item, which is the longest prefix of the
inserted subnet, if present.
2016-06-22 21:14:06 +02:00
Robin Sommer
7ce220f8e7 Updating submodule(s).
[nomail]
2016-06-21 22:09:45 -07:00
Robin Sommer
1b5af579be Merge remote-tracking branch 'origin/topic/johanna/leaks'
BIT-1633 #merged

* origin/topic/johanna/leaks:
  Fix one more memory leak.
  Fix two memory leaks reported on mailing list.
2016-06-21 18:25:57 -07:00
Johanna Amann
6361a0d658 Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol-improvements 2016-06-21 12:42:06 -07:00
Seth Hall
5df4775cef Merge branch 'master' of ssh://git.bro.org/bro 2016-06-21 14:07:21 -04:00
Seth Hall
e27f311059 Fix an off-by-one error when grabbing x-originating-ip header in email. 2016-06-21 13:59:01 -04:00
Johanna Amann
eece0ff096 Fix one more memory leak.
The delete function was not set for one of the dictionaries used by
sessions.

Found by dnj0496@gmail.com
2016-06-21 10:26:47 -07:00
Johanna Amann
be92821a69 SMB: fix number of small issues.
Changes:
* change virtual to override where appropriate
* analyzer triggered assert in debug mode because it did not call Done()
  on manually instantiated analyzers.
* added a few length checks to methods
* commented unused code and removed a few unused class members
2016-06-20 15:16:01 -07:00
Seth Hall
0e49b9ef98 Fix a small poor implementation in SMB string handling. 2016-06-20 16:23:49 -04:00
Seth Hall
8eb67a0a6c Update tests to match move of smb base scripts into policy/ 2016-06-20 16:22:57 -04:00
Johanna Amann
87da09ddca Fix two memory leaks reported on mailing list.
http://mailman.icsi.berkeley.edu/pipermail/bro/2016-June/010089.html
2016-06-20 11:28:30 -07:00
Robin Sommer
66e7e4be04 Merge branch 'master' of git.bro.org:bro 2016-06-18 13:32:42 -07:00