Commit graph

9176 commits

Author SHA1 Message Date
Jon Siwek
0ab550d3b1 Updating submodule(s).
[nomail]
2018-06-21 14:36:42 -05:00
Jon Siwek
8ee92c70da Add ability for BroControl to skip cluster setup
It does this by setting the BROCTL_CHECK_CONFIG env. variable.
Related to BIT-1938.
2018-06-21 11:57:18 -05:00
Jon Siwek
66ee376411 BIT-1938: fix crash in Broker manager shutdown 2018-06-21 11:48:10 -05:00
Johanna Amann
a00298c2d1 Merge remote-tracking branch 'origin/topic/jsiwek/config-cluster' into topic/johanna/config-cluster
* origin/topic/jsiwek/config-cluster:
  Teach Option::set to unwrap Broker::Data values
  Support unserializing broker data into type 'any'
  Fix a bug in broker data type-casting check
  Remove dead code in broker data/val conversion function
2018-06-20 15:00:15 -07:00
Vern Paxson
21614cd30d basic code implemented, but there's a memory problem somehwere :-( 2018-06-20 09:49:29 -07:00
Daniel Thayer
7b3bad635b Disable broxygen when running unit tests
Disable broxygen when running unit tests (except for the tests that use
broxygen).  On my dual-core MacBook Pro, this change results in the
unit tests taking about 13% less time to finish running.
2018-06-19 16:30:40 -05:00
Vern Paxson
344382ee7b documentation clarification for "p1 | p2" 2018-06-19 11:50:38 -07:00
Jon Siwek
c11039cb73 Make old comm. system usages an error unless old_comm_usage_is_ok is set 2018-06-15 17:15:46 -05:00
Jon Siwek
3c6afc8409 Add --disable-broker-tests configure option 2018-06-15 15:30:32 -05:00
Jon Siwek
bf246e59d0 Updating submodule(s).
[nomail]
2018-06-15 14:57:16 -05:00
Jon Siwek
5ac2cdecd4 Updating submodule(s).
[nomail]
2018-06-14 17:34:38 -05:00
Jon Siwek
32bd0bfb6e Updating submodule(s).
[nomail]
2018-06-14 16:32:01 -05:00
Jon Siwek
e578c1c231 Add Broker::max_threads and Broker::max_sleep tuning options
The former replaces the pcap vs. live versions of the same tuning
option.  If a user does not change these, Bro makes some internal
decisions that may help avoid performance problems on systems with high
core counts: the number of CAF threads is capped at 8 and the maximum
sleep duration for under-utilized threads is increased to 64ms (CAF's
default is 10ms).
2018-06-14 12:57:23 -05:00
Jon Siwek
197ea03f8f Minor optimization to bro_broker::Manager::FlushPendingQueries 2018-06-14 12:41:21 -05:00
Jon Siwek
8a00a2dbf8 Updating submodule(s).
[nomail]
2018-06-13 14:48:28 -05:00
Jon Siwek
c9fe9a943c Add Broker::max_live_threads and Broker::max_pcap_threads tunables
These may be used to change the number of scheduler threads that the
underlying CAF library creates.  In pcap mode, it's currently hardcoded
to the minimal 4 threads due to potentially significant overhead in CAF.
2018-06-12 13:54:43 -05:00
Jon Siwek
6752ffcc8e Updating submodule(s).
[nomail]
2018-06-11 10:39:56 -05:00
Robin Sommer
280e8c7dcc Merge branch 'master' of ssh://git.bro.org/bro 2018-06-08 16:41:28 +00:00
Robin Sommer
554e8cc73d Merge remote-tracking branch 'origin/topic/jsiwek/broker-listen-env'
BIT-1935 #merged

* origin/topic/jsiwek/broker-listen-env:
  Allow BRO_DEFAULT_LISTEN_ADDRESS to control broker listen address
2018-06-08 16:38:31 +00:00
Jon Siwek
b51e6f39dd Correct conn history field documentation 2018-06-08 10:43:32 -05:00
Jon Siwek
8bbe84a1b6 Updating submodule(s).
[nomail]
2018-06-08 10:00:42 -05:00
Jon Siwek
c2c35ed178 Updating submodule(s).
[nomail]
2018-06-07 16:56:14 -05:00
Jon Siwek
da593e7aaa GH-131: disable krb ticket decryption on non-Linux
A test case fails on macOS and FreeBSD fails to build.
2018-06-07 13:58:01 -05:00
Jon Siwek
f50effd364 Fix signed/unsigned comparison compiler warning
The signed int in this case is essentially a constant anyway.
2018-06-07 09:57:55 -05:00
Jon Siwek
9822fc252d Improve Broker performance
Now manually keeps track of peer count instead of querying Broker for
that information (which would result in waiting upon a blocking request
to the core actor).
2018-06-06 16:25:30 -05:00
Jon Siwek
10fdb16f3b Updating submodule(s).
[nomail]
2018-06-06 14:02:22 -05:00
Jon Siwek
0b4871daf4 BIT-1936: improve Broxygen warnings 2018-06-05 17:33:11 -05:00
Jon Siwek
b5b688b5f5 Update make doc: don't copy broker docs 2018-06-05 15:20:49 -05:00
Jon Siwek
a43c7d0691 Merge remote-tracking branch 'origin/topic/jsiwek/ncp-fixes'
* origin/topic/jsiwek/ncp-fixes:
  Add NCP::max_frame_size tuning option
  Migrate NCP analyzer to use latest analyzer API
2018-06-05 11:32:38 -05:00
Johanna Amann
a891517762 Fix read at invalid address in X509 extension parser.
When encountering an extension unknown to OpenSSL, we would read from
the wrong memory location. Also added a testcase to prevent this specific
case from happening again.
2018-06-04 12:05:56 -07:00
Jon Siwek
19b893a5bc Make 0 be a valid packet source timestamp
For fuzzed/damaged/corrupted pcaps, a timestamp of 0 could lead to an
infinite loop in Bro as it interprets that as meaning the packet source
is not ready yet.
2018-06-04 13:56:52 -05:00
Johanna Amann
791b24d232 Merge remote-tracking branch 'origin/topic/jsiwek/broker-misc'
* origin/topic/jsiwek/broker-misc:
  Add Broker::publish_and_relay BIF
  Document variable argument list BIFs using ellipsis
  Support unserializing broker data into type 'any'
  Fix a bug in broker data type-casting check
  Remove dead code in broker data/val conversion function
2018-06-04 10:00:49 -07:00
Johanna Amann
2f250637c1 Merge remote-tracking branch 'origin/topic/vladg/ssh-fix'
* origin/topic/vladg/ssh-fix:
  #120: Pull in PR, and make a couple small cleanup tweaks.
  SSH protocol now assesses the packet length at an earlier stage within binpac. Stops SSH analyzer constantly raising binpac exceptions. Seems to be because a packet continues to go through binpac when empty and only calls the next packet when asked for more data and not on operations.
2018-06-03 08:43:08 -07:00
Vlad Grigorescu
fde88fa717 #120: Pull in PR, and make a couple small cleanup tweaks. 2018-06-02 17:29:01 -05:00
Vlad Grigorescu
7e5788bff0 Merge branch 'topic/andrew/ssh-fix' of https://github.com/Andrew-Woodford/bro into topic/vladg/ssh-fix 2018-06-02 16:26:05 -05:00
Seth Hall
cd18d96205 Removed a few more discovered UTF-8 characters in Bro scripts. 2018-06-02 04:57:48 -04:00
Seth Hall
51f20136d5 Remove some UTF-8 characters that snuck into a few strings. 2018-06-02 04:37:08 -04:00
Johanna Amann
81d6b4c645 Updating submodule(s).
[nomail]
2018-06-01 15:09:07 -07:00
Johanna Amann
3a9575bf8a Make kerberos initialization static.
There does not seem to be any reason to initialize the members more than
once globally.
2018-06-01 13:49:08 -07:00
Jon Siwek
1b4e0116f4 Allow BRO_DEFAULT_LISTEN_ADDRESS to control broker listen address
This environment variable is now set to listen only on IPv4 loopback
when running unit tests (instead of using the default INADDR_ANY).

This also moves some of the @loads out from init-bare.bro into a new
init-frameworks-and-bifs.bro in order to better support calling BIFs
(like `getenv`) from variable initializations in those particular
frameworks.
2018-06-01 15:38:11 -05:00
Johanna Amann
6f3ccd507b Allow setting KRB5 root dir in configure 2018-06-01 12:48:38 -07:00
Johanna Amann
327acf6555 KRB: do not set keytab by default.
Only enable decryption if a user purposefully sets a keytab.
2018-06-01 12:46:26 -07:00
Johanna Amann
8bb76cd3c1 KRB: do not set authentication info to nouser.
Simply do not set it at all in this case - it is an optional after
all...
2018-06-01 12:32:34 -07:00
Johanna Amann
5d5dd65cab Merge branch 'krb_changes2' of https://github.com/jwallior/bro
I did some cleanup work.
2018-06-01 12:28:45 -07:00
Jon Siwek
55f14c2eb8 Relocate temporary script coverage files
So they don't clutter the top-level of unit test .tmp/ dir.
2018-06-01 11:30:36 -05:00
Jon Siwek
f9e5777e6f BIT-1635: fix make doc warnings
References to Input::Reader and Log::Writer enum types no longer emit
warnings as they are now hardcoded to be documented as part of their
associated framework scripts and so links to them now work.
2018-06-01 10:08:44 -05:00
Johanna Amann
b2dc7ffb26 Merge branch 'smb2-updates' of https://github.com/dtrejod/bro 2018-05-31 21:13:20 -07:00
Johanna Amann
7e801563a0 Merge branch 'topic/p-l-/add-badarp-tests' of https://github.com/p-l-/bro
* 'topic/p-l-/add-badarp-tests' of https://github.com/p-l-/bro:
  Add bad ARP tests
2018-05-31 15:06:33 -07:00
Johanna Amann
1fec186c39 Fix SCT validation when invalid certificates are in chain.
At the moment it would try to access an unset optional in this case.
2018-05-31 14:58:46 -07:00
Jon Siwek
224ee790e2 Add Broker::publish_and_relay BIF
Like Broker::relay, except the relaying-node also calls event handlers.
2018-05-31 15:26:22 -05:00