Commit graph

7220 commits

Author SHA1 Message Date
Daniel Thayer
aa8d200e80 Fix various typos in the openflow framework docs 2016-11-09 14:29:03 -06:00
Daniel Thayer
462eaefc43 Fix some warnings seen while building the docs
Removed references in the docs to a few identifiers that aren't
defined in any Bro scripts.
2016-11-09 14:16:42 -06:00
Daniel Thayer
3057d2b8fb Fix various typos in the NetControl docs
Also fixed warnings that were seen while building the docs
with "make doc".
2016-11-08 15:25:28 -06:00
Daniel Thayer
261c6907d8 Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-fixes-updates 2016-11-07 13:47:45 -06:00
Johanna Amann
ba5abf8dbe Updating CHANGES and VERSION. 2016-11-02 12:13:48 -07:00
Johanna Amann
8c3a3b45f3 Update VERSION and submodules. 2016-11-02 12:13:11 -07:00
Johanna Amann
c92060a8ca Merge remote-tracking branch 'origin/topic/seth/smb-auth-fixes'
* origin/topic/seth/smb-auth-fixes:
  Disable SMB2 error data parsing.
  Removed some files that aren't being used.
  Fix SMB tree connect handling.
  Fix a small issue where DCE_RPC commands were improperly being logged.
  SMB fixes and cleanup.
  Including a test for raw NTLM in SMB
  Updates for SMB auth handling from Martin van Hensbergen.

BIT-1721 #merged
2016-11-02 10:25:33 -07:00
Seth Hall
15f5deed87 Add a files framework signature for VIM tmp files. 2016-11-02 11:51:38 -04:00
Johanna Amann
24b7566b1f Update submodule
[nomail]
2016-11-01 15:30:12 -07:00
Seth Hall
5e63584b48 Disable SMB2 error data parsing.
It is not implemented correctly and is causing a lot of
parse errors.
2016-11-01 16:03:36 -04:00
Seth Hall
5832b872c2 Removed some files that aren't being used.
- I went ahead and finished implementing smb2 tree_disconnect.
   This made it possible to address an edge case when packet
   loss occurs.
 - Fixes BIT-1721
2016-11-01 15:56:15 -04:00
Johanna Amann
681efc2b8d Version parsing scripts now supports several beta versions.
Versions such as 2.5-beta2 now don't throw an error.
2016-11-01 11:19:14 -07:00
Johanna Amann
6a0247fab1 Merge remote-tracking branch 'origin/topic/dnthayer/local-logger'
* origin/topic/dnthayer/local-logger:
  Add a new site policy script local-logger.bro

BIT-1700 #merged
2016-11-01 09:41:50 -07:00
Seth Hall
bb5c2c94ec Fix SMB tree connect handling.
It was misidentifying share mappings as FILE shares
sometimes when they were actually PIPE shares.
2016-11-01 03:14:15 -04:00
Seth Hall
19a4376a9a Fix a small issue where DCE_RPC commands were improperly being logged. 2016-11-01 03:13:04 -04:00
Daniel Thayer
dc74fab2d5 Add a new site policy script local-logger.bro
Addresses BIT-1700
2016-10-31 20:43:50 -05:00
Johanna Amann
be571986b2 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1750'
* origin/topic/dnthayer/ticket1750:
  Python 3 compatibility fixes for doc/ext/bro.py

BIT-1750 #merged
2016-10-31 14:25:23 -07:00
Seth Hall
ff682b8c2c Merge remote-tracking branch 'origin/master' into topic/seth/smb-auth-fixes 2016-10-31 16:17:01 -04:00
Seth Hall
4f3fe047f4 SMB fixes and cleanup.
SMB error handling improved. The analyzer isn't destroyed when a problem
is encoutered anymore.  The flowbuffer in the parser is now flushed and
the analyzer is set to resync against an SMB command.  This was needed
because there is some state about open files that is kept within the
parser itself which was being destroyed and that was causing analysis
after content gaps or parse errors to be faulty.  The new mechanism
doesn't detroy the parser so parsing after gaps is improved.

DCE_RPC handling in SMB is improved in the edge case where a drive
mapping isn't seen. There is a new const named SMB::pipe_filenames
which is used as a heuristic for identifying "files" opened on named
pipe shares.  If the share mapping type isn't known and a filename
in this set is found, the share type will change to "PIPE" by
generating an event named "smb_pipe_connect_heuristic".  Reads and
writes to that file will be sent to the DCE_RPC analyzer instead of
to the files framework.

The concept of "unknown" share types has been removed due to the new
heuristic detection of share types.

Some general clean up of how the SMB cmd log is written and when.
2016-10-31 13:35:47 -04:00
Johanna Amann
43a127fb89 Update submodule
[nomail]
2016-10-31 10:35:46 -07:00
Daniel Thayer
0fc0a89e4a Python 3 compatibility fixes for doc/ext/bro.py 2016-10-29 15:16:42 -05:00
Johanna Amann
65d7419be4 Update submodules
[nomail]
2016-10-27 14:45:03 -07:00
Daniel Thayer
99a898b6ae Update install instructions
Removed some outdated info, and improved the section for Mac OS X.
2016-10-27 16:35:43 -05:00
Johanna Amann
8d40f99831 Update submodule
[nomail]
2016-10-27 10:40:40 -07:00
Johanna Amann
af1d7d1f21 correct elasticsearch link in plugins 2016-10-27 09:14:53 -07:00
Robin Sommer
0d37c0df7b Fix for Sphinx >= 1.4 compability. 2016-10-27 09:00:34 -07:00
Robin Sommer
ce72a09c0c Merge remote-tracking branch 'origin/topic/johanna/xmpp-ns'
BIT-1743 #merged

* origin/topic/johanna/xmpp-ns:
  XMPP: Fix detection of StartTLS when using namespaces
2016-10-27 08:10:35 -07:00
Johanna Amann
0dc7ef7749 Update submodules
[nomail]
2016-10-26 14:31:51 -07:00
Seth Hall
a836ece4e6 Including a test for raw NTLM in SMB 2016-10-26 10:41:08 -04:00
Seth Hall
31492314d8 Merge remote-tracking branch 'origin/topic/seth/dce_rpc_fixes'
* origin/topic/seth/dce_rpc_fixes:
  Updating tests.
  Moved the DCE_RPC constants into init-bare.bro.
  Adding one more case to the DCE_RPC defrag logic.
  Make DCE_RPC skip input in strange fragment circumstances.
  Stop calling Remove() on DCE_RPC analyzer.
  More DCE_RPC improvements.
2016-10-26 09:47:57 -04:00
Robin Sommer
b0a2586309 Updating tests. 2016-10-25 17:06:25 -07:00
Robin Sommer
b7a774ab28 Moved the DCE_RPC constants into init-bare.bro. 2016-10-25 16:50:48 -07:00
Robin Sommer
1f36ae61ba Adding one more case to the DCE_RPC defrag logic.
(and fixing a couple of compiler warnings)
2016-10-25 16:45:10 -07:00
Robin Sommer
aab3819c70 Merge remote-tracking branch 'origin/master' into topic/seth/dce_rpc_fixes 2016-10-25 16:31:18 -07:00
Johanna Amann
3284e92677 NEWS file tweaks: input error events & OpenFlow.
These were pointed out by Daniel.
2016-10-25 10:21:57 -07:00
Johanna Amann
6aea681832 Merge branch 'patch-2' of https://github.com/balintm/bro
* 'patch-2' of https://github.com/balintm/bro:
  Update smb1-com-open-andx.pac
2016-10-25 09:46:37 -07:00
Johanna Amann
0f29405d6e Merge remote-tracking branch 'origin/topic/robin/sig-fixes'
* origin/topic/robin/sig-fixes:
  Fix a couple of problems with signature matching.

BIT-1737 #merged
2016-10-25 09:42:29 -07:00
Johanna Amann
860cfa7002 Update submodule
[nomail]
2016-10-25 09:32:11 -07:00
Johanna Amann
784fc7f042 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Python 3 compatibility fix for coverage-calc script
2016-10-25 09:28:44 -07:00
Seth Hall
8276c250bd Updates for SMB auth handling from Martin van Hensbergen.
- Raw NTLM (not in GSSAPI) over SMB is now handled correctly.
 - The encrypted NTLM session key is now passed into scriptland
   through the ntlm_authenticate event.
2016-10-25 02:52:09 -04:00
Johanna Amann
89f9315fb0 XMPP: Fix detection of StartTLS when using namespaces
the starttls command will sometimes be issued with a namespace, e.g. as
<ns2:starttls xmlns:ns2='urn:ietf:params:xml:ns:xmpp-tls'/>. The XMPP
analyzer did not handle this scenario correctly.

This is very similar to the following ejabberd bug:
https://support.process-one.net/browse/EJAB-1123
2016-10-24 11:54:47 -07:00
Robin Sommer
c57f83d8bf Merge remote-tracking branch 'origin/topic/johanna/gcc-6.2.1'
BIT-1732 #merged

* origin/topic/johanna/gcc-6.2.1:
  Fix alignment issue of ones_complement_checksum
2016-10-24 11:12:05 -07:00
Seth Hall
36ae5e6662 Make DCE_RPC skip input in strange fragment circumstances.
If there are too many concurrent fragments or too much
data fragmented, skip further input on DCE_RPC.
2016-10-24 13:50:13 -04:00
Seth Hall
c88719472b Stop calling Remove() on DCE_RPC analyzer.
This was crashing Bro when it was called on DCE_RPC traffic
carried over SMB.
2016-10-24 13:44:44 -04:00
Seth Hall
e4b620673b More DCE_RPC improvements.
- The logic for fragment handling has been rewritten and should be correct now.
 - There are now tunables for fragment handling overflow situations.
   - DCE_RPC::max_cmd_reassembly and DCE_RPC::max_frag_data
   - They result in weirds and analyzer removal.
 - Memory leak fixed by unique_ptr auto cleanup.
 - DCE_RPC is now intolerate of content gaps and will stop
   analyzing traffic if content gaps happen (like most other analyzers currently).
2016-10-24 03:22:20 -04:00
Daniel Thayer
8ae064006b Merge remote-tracking branch 'origin/master' into fastpath 2016-10-21 09:35:04 -05:00
Daniel Thayer
99cd34f57d Python 3 compatibility fix for coverage-calc script 2016-10-21 09:33:04 -05:00
Johanna Amann
3d1f35f85b Update submodule
[nomail]
2016-10-20 11:53:34 -04:00
Johanna Amann
96d14691df Merge remote-tracking branch 'origin/topic/dnthayer/ticket1731'
* origin/topic/dnthayer/ticket1731:
  Fix istate.pybroccoli test on systems using Python 3

BIT-1731 #merged
2016-10-20 11:41:19 -04:00
Robin Sommer
5cf2320fbc Fix a couple of problems with signature matching.
- IPv4 CIDR specifications didn't work with dst-ip/src-ip.

    - The "payload-size" condition was unreliable with UDP traffic.
2016-10-19 14:23:43 -07:00