Commit graph

1825 commits

Author SHA1 Message Date
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
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
Robin Sommer
b99f4d1331 Merge branch 'master' of git.bro.org:bro 2017-11-17 15:16:26 -08:00
Robin Sommer
b6e3603481 Merge branch 'topic/christian/doc-tweaks' of https://github.com/ckreibich/bro 2017-10-27 14:42:28 -07:00
Johanna Amann
9b59157d19 Updating CHANGES and VERSION. 2017-10-16 14:34:26 -07:00
Robin Sommer
70456d9f6b Updating submodule(s).
[nomail]
2017-10-16 12:21:12 -07:00
Johanna Amann
bcd5624f79 Merge remote-tracking branch 'origin/topic/vladg/bit-1838'
* origin/topic/vladg/bit-1838:
  Add btest for new SSH curve25519 KEX
  Updates the SSH analyzer to support the "curve25519-sha256" KEX.
2017-10-05 14:35:16 -07:00
Jon Siwek
76764fb135 Merge branch 'topic/corelight/script-debug-output' of https://github.com/corelight/bro
* 'topic/corelight/script-debug-output' of https://github.com/corelight/bro:
  Add -B scripts flag to allow debug output of script load order.
2017-10-03 12:02:27 -05:00
Seth Hall
be08ae26b3 Merge remote-tracking branch 'origin/topic/jazoff/fix-intel-error' 2017-09-29 10:00:18 -04:00
Johanna Amann
39a026c88d Merge remote-tracking branch 'origin/topic/jazoff/fix-gridftp'
* origin/topic/jazoff/fix-gridftp:
  problem: gridftp threshold is being applied to all connections
2017-09-21 09:15:57 -07:00
Jon Siwek
8403fd9f94 Updating CHANGES and VERSION. 2017-09-20 11:04:04 -05:00
Johanna Amann
fc33bf2014 Make strerror_r portable.
This uses the same code that broker already uses to determine if we use
the XSI or gnu version of strerror_r. Patch by Thomas Petersen.
2017-09-18 14:50:30 -07:00
Johanna Amann
1a6b6f2586 Updating CHANGES and VERSION. 2017-09-11 21:02:07 -05:00
Jon Siwek
fcd735cecd Fix core.truncation unit test on macOS.
The pcap file format has a global header and a header per packet.  The
global header of the pcap in question had a snaplen of 1, but with
packet headers indicating the full number of bytes saved within the
file.  It seems like the pcap file must of been artifically edited in
order for it to be this way.

When reporting the captured length of a packet, Apple's version of
libpcap now seems to report the full number of bytes saved within the
pcap's per-packet headers, but other versions seem to report the snaplen
from the global pcap header.  This caused the core.truncation test to
behave differently on macOS from other platforms.

I've manually hexedit'd the pcap so that the snaplen is still 1, but
contains just a single packet with a pcap header indicating a length of
8, which is less than the size of the link layer header and so should
still test the original code path that the unit test intended to
exercise.
2017-08-11 14:03:06 -05:00
Robin Sommer
6ba710fbf7 Updating CHANGES, NEWS, and VERSION. 2017-08-04 15:09:51 -07:00
Robin Sommer
310ef6974f Small fix to revert to double-% handling in HTTP back to old behaviour. 2017-07-28 12:22:54 -07:00
Robin Sommer
a85a2821d7 Updating submodule(s).
[nomail]
2017-07-28 10:09:39 -07:00
Johanna Amann
089f87d8da Merge remote-tracking branch 'origin/topic/robin/plugin-version-check'
I added another small change - since we are inlining Configure(), we can
just set bro_plugin directly to BRO_PLUGIN_BRO_VERSION in
src/plugin/Plugin.h, instead of depending on the plugin to do it. This
also means we do not need to change init-plugin in bro-aux at this
moment.

BIT-1828 #closed

* origin/topic/robin/plugin-version-check:
  Adding plugin API number into versioned function name, and removing old runtime API version check.
  Extend plugin infrastructure to catch Bro version mismatches at link time.
2017-07-25 16:14:49 -07:00
Robin Sommer
ffa7480ce4 Fix documentation build.
(I had these locally, but not yet commited.)
2017-07-07 14:35:38 -07:00
Robin Sommer
94192989e7 Removing aux/plugins.
Most of the plugins are now Bro packages.
2017-07-07 13:48:15 -07:00
Johanna Amann
b43ac81eea Updating CHANGES and VERSION. 2017-07-07 12:24:40 -07:00
Johanna Amann
251ed3a4d9 Add 2.5.1 news file to master. 2017-06-13 11:04:15 -07:00
Johanna Amann
046f368622 Update version and submodules. 2017-06-05 15:17:28 -07:00
Jon Siwek
5540b228e5 Merge branch 'nfs_changes' of https://github.com/jwallior/bro
* 'nfs_changes' of https://github.com/jwallior/bro:
  Add nfs unittest. Includes an example for the new nfs_proc_rename.
  Added rename event to rpc/nfs protocol analyzer. 	This event identifies and reports information 	about nfs/rpc calls and replies of the type 	rename.
  Expand parsing of RPC Call packets to add Uid, Gid, Stamp, MachineName and AuxGIDs
  Fix NFS protocol parser.
2017-05-22 20:35:56 -05:00
Jon Siwek
4d06ee85ce Merge branch 'topic/corelight/ascii-gzip' of https://github.com/corelight/bro
* 'topic/corelight/ascii-gzip' of https://github.com/corelight/bro:
  Add gzip log writing to the ascii writer.
2017-05-22 00:10:09 -05:00
Seth Hall
7c107f9f02 Merge remote-tracking branch 'origin/topic/johanna/notice-suppression'
* origin/topic/johanna/notice-suppression:
  Lessen cluster node of notice suppression.
2017-05-12 15:35:55 -04:00
Jon Siwek
874d2b9fb0 Merge branch 'topic/corelight/logging-hooks' of https://github.com/corelight/bro
* 'topic/corelight/logging-hooks' of https://github.com/corelight/bro:
  Plugin: Add hooks for log init and writing.
2017-05-04 11:44:43 -05:00
Jon Siwek
12e809dfa0 Merge branch 'topic/corelight/file-rename-unlink' of https://github.com/corelight/bro
* 'topic/corelight/file-rename-unlink' of https://github.com/corelight/bro:
  Add rename, unlink, and rmdir bifs.
2017-05-01 10:41:28 -05:00
Robin Sommer
ad4b2d6880 Updating submodule(s).
[nomail]
2017-04-22 08:12:15 -07:00
Robin Sommer
b307b29f42 Updating CHANGES and VERSION. 2017-04-21 14:14:00 -07:00