Commit graph

9059 commits

Author SHA1 Message Date
Johanna Amann
9bc42385f3 Update submodule
[nomail]
2018-02-16 09:02:21 -08:00
Daniel Thayer
45cc4d0e2f Fix another warning when building the documentation 2018-02-14 18:43:34 -06:00
Daniel Thayer
d0c29e81e1 Fix a warning when building documentation 2018-02-14 17:01:04 -06:00
Johanna Amann
94b422c88d Updating CHANGES and VERSION. 2018-02-14 10:01:17 -08:00
Johanna Amann
1aa9578021 Update submodule
[nomail]
2018-02-14 08:49:27 -08:00
Daniel Thayer
873049ce12 Fix the config framework several-files.bro test
The test script needs to wait until the Input::end_of_data event has
been raised for each of the config input files.
2018-02-12 15:05:38 -06:00
Jon Siwek
85b5c6ffbd Fix pessimizing-move compiler warning.
Returning via move() should never be needed and may result in a compiler
warning: "moving a local object in a return statement prevents copy
elision".
2018-02-12 11:13:04 -06:00
Jon Siwek
6766f52cdd Add limit to number of auth flavors parsed out of MNT replies 2018-02-12 11:01:25 -06:00
Xiaogrill
cbe585dd87 Treat LibreSSL as an older OpenSSL 2018-02-11 09:07:22 -08:00
Robin Sommer
0e83bd3193 Fixing unstable test. 2018-02-07 14:21:25 -08:00
Robin Sommer
fff4db5145 Merge remote-tracking branch 'origin/topic/johanna/config'
Closes BIT-1900.

* origin/topic/johanna/config:
  Use port_mgr->Get() in the input framework config changes.
  Allow the empty field separator to be empty; use in config framework.
  Fix small bug in config reader.
  Fix segmentation fault when parsing sets containing invalid elements.
  Add config framework.
2018-02-07 14:10:48 -08:00
Robin Sommer
c0aab7cf15 Fix compile.
One final change hadn't made it in.
2018-02-06 17:05:09 -08:00
Robin Sommer
ae51f72de0 Updating NEWS. 2018-02-06 08:54:54 -08:00
Robin Sommer
cbd96a65cf Merge remote-tracking branch 'origin/topic/jsiwek/bit-1854-reassembler-improvements'
Includes small readability tweaks, see BIT-1854.

Closes BIT-1854.

* origin/topic/jsiwek/bit-1854-reassembler-improvements:
  BIT-1854: improve reassembly overlap checking
  BIT-1854: fix the 'tcp_excessive_data_without_further_acks' option
2018-02-06 08:42:29 -08:00
Robin Sommer
2ecfae8810 Merge remote-tracking branch 'origin/topic/johanna/ssl_signature_details'
Closes BIT-1897.

* origin/topic/johanna/ssl_signature_details:
  Make parsing of ServerKeyExchange work for D(TLS) < 1.2.
  Add more details to ssl_server_signature.
2018-02-05 15:21:28 -08:00
Robin Sommer
9f4cef23ad Merge remote-tracking branch 'origin/topic/jsiwek/sumstats-non-cluster-fixes'
Closes BIT-1898.

* origin/topic/jsiwek/sumstats-non-cluster-fixes:
  Fix problems with SumStats non-cluster.bro script
2018-02-05 15:14:40 -08:00
Robin Sommer
f735ad382b Updating submodule(s).
Closes BIT-1902.
2018-02-05 15:08:22 -08:00
Robin Sommer
678cf7fa6c Merge remote-tracking branch 'origin/topic/dnthayer/travis-ci'
* origin/topic/dnthayer/travis-ci:
  Add a .travis.yml file
2018-02-05 15:07:29 -08:00
Jon Siwek
4cd9f0edf9 Merge branch 'smb-transaction-messages' of https://github.com/jbencteux/bro
* 'smb-transaction-messages' of https://github.com/jbencteux/bro:
  add test for smb1_com_transaction_response event changes
  add test for smb1_com_transaction2_secondary_request event changes
  add test for smb1_com_transaction2_request event changes
  add test for smb1_com_transaction_secondary_request event changes
  add test for smb1_com_transaction_request event changes
  fix setup field handling in smb1_com_transaction_request messages
  fix smb1_com_transaction* messages
  add smb1_transaction2_secondary_request event
  add smb1_transaction_secondary_request event
  add parameters and data to smb1_transaction_request/response messages
  add SMB_Parameters.Words to smb1_transaction2_request event
2018-02-05 16:33:25 -06:00
Jon Siwek
7bdbcfc568 Fix warnings when building sphinx docs 2018-02-05 15:19:08 -06:00
Jon Siwek
9603deeb64 Merge branch 'nfs-updates' of https://github.com/dtrejod/bro
* 'nfs-updates' of https://github.com/dtrejod/bro:
  Format print nfs units tests to improve output readability. Add unit tests for new NFS events -- nfs_proc_symlink, nfs_proc_link, nfs_proc_sattr.
  Bug fix: nfs3_writeargs didn't properly return filehandle.
  Add nfs_proc_symlink, nfs_proc_link, nfs_proc_sattr.
2018-02-05 14:15:18 -06:00
Jon Siwek
35fa1261f3 Merge branch 'mount-protocol' of https://github.com/dtrejod/bro
* 'mount-protocol' of https://github.com/dtrejod/bro:
  Add unit tests for new MOUNT events -- mount_proc_mnt, mount_proc_umnt, mount_proc_umnt_all, mount_proc_not_implemented.
  Add mount_proc_null, mount_proc_mnt, mount_proc_umnt, mount_proc_umnt_all, mount_proc_not_implemented, mount_reply_status.
2018-02-05 13:32:36 -06:00
Jon Siwek
445e5bfc18 Fix (unlikely) memory leak in nb_dns.c 2018-02-05 10:45:02 -06:00
Daniel Thayer
97160b15da Add a .travis.yml file 2018-02-02 15:29:03 -06:00
Seth Hall
c2f35920fd First step of DHCP analyzer rearchitecture.
Old event prototypes have changed and the events are broken right
now and may be removed in favor of the new generic "dhcp_message"
event.

DHCP option parsing is abstracted from the main code base of the
protocol parser and are all now located in their own file.

Documentation, tests, and final code cleanup are still pending.
2018-02-02 10:14:15 -05:00
Johanna Amann
884f47a994 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove bro-plugins submodule from .gitmodules file
2018-02-01 13:21:31 -08:00
Daniel Thayer
5de87ce660 Remove bro-plugins submodule from .gitmodules file 2018-02-01 14:44:20 -06:00
Seth Hall
ba49ab8201 Merge branch 'feature/new_dhcp_data' of https://github.com/Mr-Click/bro into topic/seth/merge-121-dhcp-extensions 2018-02-01 10:06:35 -05:00
Jon Siwek
343dbf4100 BIT-1854: improve reassembly overlap checking
It now skips looping over buffered blocks in the common case where the
new block is at the end and so can't possibly overlap anything.
2018-01-31 21:14:45 -06:00
Jon Siwek
c2af3daa9f BIT-1854: fix the 'tcp_excessive_data_without_further_acks' option
This previously checked against the amount of out-of-sequence data
being buffered by the reassembler.  It now checks against the total
size of all blocks being buffered in the reassembler, which, by nature
of still being buffered there, means it's not been acked yet.
2018-01-31 21:09:12 -06:00
Johanna Amann
a8c0580b45 Merge branch 'topic/johanna/openssl-1.1'
* topic/johanna/openssl-1.1:
  Fix recently introduced double free in OpenSSL code.
  Adjust coding style & fix test failures.
  Adapt most of the X509 support to OpenSSL 1.1
2018-01-30 14:33:32 -08:00
Johanna Amann
eb32a44da5 Use port_mgr->Get() in the input framework config changes. 2018-01-29 14:43:39 -08:00
Johanna Amann
ac9fd000e0 Merge remote-tracking branch 'origin/master' into topic/johanna/config 2018-01-29 14:43:20 -08:00
Johanna Amann
196994a48d Allow the empty field separator to be empty; use in config framework.
This small change allows the empty field separator to be empty. This
means that we can represent an empty list by a empty input string, which
was not possible before.

Before, an empty empty field separator meant that there is no empty
field - to get back to this behavior one now has to set the empty field
separator to a string that is guaranteed to not be part of the input
data. Note that we did not use "empty" empty field separators anywhere
and I am not aware of this being used by anyone - the new behavior seems
like it is much more useful in practice.

This also changes the config framework to interpret empty lists as...
empty, instead of interpreting them as lists that have one zero-length
element; this seems like the saner default.
2018-01-29 14:22:59 -08:00
Johanna Amann
01005e99af Fix small bug in config reader.
The configure reader had a small bug that caused the tracking of changed
variables to be incorrect after the second update. This resulted in
change-events for unchanged variables.
2018-01-29 14:22:56 -08:00
Johanna Amann
b0be6c90fe Fix segmentation fault when parsing sets containing invalid elements.
Currently the destructor would try to free unallocated memory. This
could e.g. be triggered by the input framework reading a set with an
invalid element.
2018-01-29 14:22:44 -08:00
Jon Siwek
44175e0992 BIT-1894: fix bad integer casts in BIFs: sort, rand, order, to_int 2018-01-26 15:49:34 -06:00
Johanna Amann
141394ac9b Merge remote-tracking branch 'origin/master' into topic/johanna/ssl_signature_details 2018-01-26 10:33:18 -08:00
Jon Siwek
fd91f58192 Updating submodule(s).
[nomail]
2018-01-26 11:32:03 -06:00
Robin Sommer
419e69f9e4 Updating submodule(s).
[nomail]
2018-01-19 15:17:32 -08:00
Jon Siwek
f25a1453ee Remove TODO comments about using explicit bool operators 2018-01-19 11:40:57 -06:00
Jeffrey Bencteux
015eec8c71 add test for smb1_com_transaction_response event changes 2018-01-19 14:29:31 +01:00
Jeffrey Bencteux
4c0b6e0984 add test for smb1_com_transaction2_secondary_request event changes 2018-01-19 14:29:26 +01:00
Jeffrey Bencteux
4807b7d847 add test for smb1_com_transaction2_request event changes 2018-01-19 14:29:20 +01:00
Jeffrey Bencteux
314e992284 add test for smb1_com_transaction_secondary_request event changes 2018-01-19 14:29:09 +01:00
Johanna Amann
41285abea5 Make nearly all bool operators explicit.
These are a bit dangerous because the casting can happen in quite
unexpected circumstances and lead to undesirable comparison results.
2018-01-18 14:02:03 -08:00
Jon Siwek
3495b2fa9d Fix problems with SumStats non-cluster.bro script
* Add proper namespace scoping to a 'SumStats::process_epoch_result'
  scheduled event.

* Fix iterator invalidation within 'SumStats::process_epoch_result'

* Give 'SumStats::process_epoch_result' a copy of the result table so
  that the SumStats framework can clear the original and move on to the
  next epoch immediately.

* The previous baseline of the basic sumstats unit test did look wrong
  to me and probably was actually indicative of the iterator invalidation
  problem.

Thanks to Jim Mellander for reporting the issues.
2018-01-18 11:14:39 -06:00
Jon Siwek
5ed5587b5c Merge remote-tracking branch 'origin/topic/feature/logging-filter-list'
* origin/topic/feature/logging-filter-list:
  Logging: implement get_filter_names and small fixes.

Removed some superfluous existence checks before deleting table indices.

BIT-1890 #merged
2018-01-17 16:17:43 -06:00
Johanna Amann
a4a9bf4199 Logging: implement get_filter_names and small fixes.
get_filter_names(id: ID) : set[string] returns the names of the current
list of filters for a specified log stream.

Furthermore this commit makes a number of logging functions more robust
by checking existence of values before trying to modify them. This
commit also really implements (and tests) the enable_stream function.
2018-01-17 09:47:20 -08:00
Jon Siwek
fc6e3b4e36 Merge remote-tracking branch 'origin/topic/johanna/recognize-websockets'
* origin/topic/johanna/recognize-websockets:
  HTTP: Recognize and skip upgrade/websocket connections.

BIT-1888 #Merged
2018-01-16 15:45:29 -06:00