Commit graph

1347 commits

Author SHA1 Message Date
Robin Sommer
135fa9dc69 Updating submodule(s).
[nomail]
2018-04-20 07:47:10 -07:00
Jon Siwek
eb0c989ab3 Improve std::map usages in SMB code
Removed redundant lookup operations
2018-04-18 11:46:38 -05:00
Jon Siwek
55a925db96 Improve HLL cardinality estimate unit test.
The test could fail on the order of 100s of iterations, so I bumped to
desired accuracy to actually check for results that are outside the
error margin.
2018-04-18 10:55:37 -05:00
Jon Siwek
181b36cafb Merge remote-tracking branch 'origin/topic/seth/smb-pending-fix'
* origin/topic/seth/smb-pending-fix:
  Updating the defined SMB2 dialects to match Microsofts current docs.
  On rare occasions the server doesn't return the tree id on read responses.
  Fix an issue with pending commands.

BIT-1862 #merged
2018-04-18 10:48:03 -05:00
Robin Sommer
361b57ee09 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Trim the Travis CI build log output
  Remove unneeded lines from .travis.yml
2018-04-06 10:51:55 -07:00
Robin Sommer
281c9a5ba3 Merge branch 'master' of https://github.com/nnovzver/bro 2018-04-06 10:50:38 -07:00
Seth Hall
f7e16a487c Merge branch 'jrolli-gssapi-krb-fix'
* jrolli-gssapi-krb-fix:
  Cleaned up and moved parsing to binpac.
  removed check on kerberos request or response type.  allow the kerberos analyzer to handle what it can, gssapi shouldn't check this
  modified GSSAPI analyzer to parse NTLM and KRB tokens
  Added and verified correct test results
  Initial btest structure
  Changes proposed in #104

Addresses #110
2018-04-03 02:11:13 -04:00
Robin Sommer
f710d9a199 Updating submodule(s).
[nomail]
2018-03-29 14:11:56 -07:00
Robin Sommer
aec449cccc Merge remote-tracking branch 'origin/topic/johanna/cleanup'
Good stuff!

Closes BIT-1915

* origin/topic/johanna/cleanup:
  Mark one-parameter constructors as explicit & use override where possible
  Remove unimplemented & unused functions from header files.
  Make data flow more explicit for complilers.
2018-03-29 13:43:01 -07:00
Robin Sommer
bb34477b91 Merge remote-tracking branch 'origin/topic/johanna/tls13-version'
Closes BIT-1916.

* origin/topic/johanna/tls13-version:
  Recognize TLS 1.3 negotiation correctly.
2018-03-29 13:00:46 -07:00
Robin Sommer
288fcd0039 Merge remote-tracking branch 'origin/topic/seth/smb-mapping-memleak-fix'
Closes BIT-1911.

* origin/topic/seth/smb-mapping-memleak-fix:
  Fix a memory leak in SMBv1 share mapping
2018-03-21 13:57:26 -07:00
Robin Sommer
78f4ed690d Merge remote-tracking branch 'origin/topic/dnthayer/travis-ci-changes'
* origin/topic/dnthayer/travis-ci-changes:
  Configure Travis CI email recipients and build branches
2018-03-15 14:59:34 -07:00
Jon Siwek
57fa8f2708 Update a doc test/baseline 2018-03-07 12:48:08 -06:00
Jon Siwek
c54b607de1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix another warning when building the documentation
  Fix a warning when building documentation
  Fix the config framework several-files.bro test
2018-02-18 17:37:34 -06:00
Johanna Amann
94b422c88d Updating CHANGES and VERSION. 2018-02-14 10:01:17 -08: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
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
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
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
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
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
Jon Siwek
44175e0992 BIT-1894: fix bad integer casts in BIFs: sort, rand, order, to_int 2018-01-26 15:49:34 -06:00
Jon Siwek
f25a1453ee Remove TODO comments about using explicit bool operators 2018-01-19 11:40:57 -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
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
Jon Siwek
09438d2d06 Merge remote-tracking branch 'origin/topic/johanna/conn-tunnels-empty'
* origin/topic/johanna/conn-tunnels-empty:
  Make tunnel_parents in conn.log optional.

BIT-1889 #merged
2018-01-16 14:56:15 -06:00
Johanna Amann
cc738544eb Merge remote-tracking branch 'remotes/origin/topic/jsiwek/prealloc-ports'
* remotes/origin/topic/jsiwek/prealloc-ports:
  Clean up PortManager class, mark PortVal ctors deprecated.
  Add BRO_DEPRECATED macro.
  Preallocate all possible PortVals.

BIT-1881 #merged
2018-01-12 10:06:30 -08:00
Jon Siwek
89ef5a7b7d Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a test that fails in some environments
2018-01-11 11:48:00 -06:00
Johanna Amann
8b28b73124 Add CVE ID for BIT-1856. 2018-01-02 09:12:09 +01:00
Jon Siwek
1c25df6f26 Merge remote-tracking branch 'origin/topic/seth/remove-dns-weird'
* origin/topic/seth/remove-dns-weird:
  Updated news.
  Remove some DNS weirds that caused volume and didn't help anyone.
2017-12-15 15:11:29 -06:00
Jon Siwek
4965a7e156 Fix typo in analyzer::Manager API docs 2017-12-13 14:24:54 -06:00
Jon Siwek
895e7b06b1 Merge branch 'topic/jazoff/speedup-for'
* topic/jazoff/speedup-for:
  problem: for loops over empty tables are slow.

BIT-1878 #merged
2017-12-08 13:12:09 -06:00
Jon Siwek
ecfacbe96e Fix documentation for ReassemblerStats. 2017-12-05 11:01:09 -06:00
Jon Siwek
9d2c41a4ff Merge remote-tracking branch 'origin/topic/johanna/socks-password'
* origin/topic/johanna/socks-password:
  Do not log SOCKS passwords by default.

BIT-1791 #merged
2017-12-02 09:53:56 -06:00
Jon Siwek
f8f343fd3a Add --ccache option to configure script (requires CMake 3.10+).
This just provides a convient way of indicating that ccache should
be used as compiler-wrapper during builds. e.g. when I want dev/debug
builds that (re)compile quickly, I do:

./configure --build-type=debug --generator=Ninja --ccache
2017-11-29 14:11:37 -06:00
Johanna Amann
577357d509 Small fixes and changes for the recent ssl-keyexchange-event merge.
This commit fixes a few small issues.

* server key exchange parameters are only parsed when a named curve is
  given.

* I removed the ssl-verbose.bro and moved the functionality into the
  testcase.

  The information that we get with these events is likely irrelevant to
  the majority of Bro users; I do not think that we have to ship a
  script that uses them by default. A script like this would be
  something to publish via the Bro package manager instead; this is the
  approach that we have taken with a number of the recent SSL addition.

* I marked the ssl_server_curve event as deprecated. More information is
  contained in the new ssl_ecdh_server_params event.

  This is an events that is probably seldomly (or never) directly used
  by anyone; I plan to completely remove it right after the 2.6 release.
2017-11-28 12:33:27 -08:00
Jon Siwek
57b3e21de7 Merge remote-tracking branch 'origin/topic/robin/event-args'
* origin/topic/robin/event-args:
  Fix assignments to event arguments becoming visible to subsequent handlers.
2017-11-21 13:24:07 -06:00
Jon Siwek
787b1e6bf2 Merge branch 'topic/corelight/reporter-hook' of https://github.com/corelight/bro
* 'topic/corelight/reporter-hook' of https://github.com/corelight/bro:
  Add reporter hook.
2017-11-21 12:28:52 -06:00
Jon Siwek
deced3795c Fix a nb_dns.c compile error (older OSs) due to C90 vs C99. 2017-11-21 11:35:33 -06:00
Jon Siwek
82a51e0731 Merge branch 'topic/corelight/load-hook' of https://github.com/corelight/bro
* 'topic/corelight/load-hook' of https://github.com/corelight/bro:
  Fix and extend behavior of HookLoadFile

I refactored some parts of scan.l to avoid the ambiguity of some
branches returning 0 and some branches not returning anything.
2017-11-20 14:06:45 -06:00
Jon Siwek
26dc94c31d BIT-1827: fix error on initializing DNS w/ IPv6 nameserver.
This just skips over IPv6 nameserver addresses for now and uses the
first IPv4 one in the resolver config.  Should be possible to support
IPv6, but that may need more testing (e.g. need to make sure the code
will be portable to various platforms).
2017-11-20 11:36:04 -06:00
Robin Sommer
7139e30bed Updating submodule(s).
[nomail]
2017-11-17 15:27:26 -08:00