Commit graph

6667 commits

Author SHA1 Message Date
Jon Siwek
bb55f82809 Remove requestorName parameter of ocsp_request event
This field isn't publicly available via the OpenSSL 1.1 API, not used
in the base scripts, and has no example in the test suit, so removing
it is simpler than trying to support manually parsing it out of the
raw data.
2018-06-29 16:15:34 -05:00
Jon Siwek
8f990036f6 Fixes for OpenSSL 1.1 support
The following tests currently fail due to what seems like different
behavior in OpenSSL 1.1 vs 1.0:

    scripts/base/protocols/rdp/rdp-x509.bro
    bifs/x509_verify.bro
2018-06-29 15:58:53 -05:00
Johanna Amann
c28f1ae0ce Add sending of values to nodes that dropped out.
The only node that cannot be recovered is the manager - and the manager
should just re-read its own configuration and be ok :)
2018-06-29 13:10:00 -07:00
Vern Paxson
85c4b0d285 use PCRE syntax instead of the beautiful new (?i ...) syntax 2018-06-29 13:01:05 -07:00
Vern Paxson
5ce3d1b899 bug fix for recent memory leak patch 2018-06-29 11:30:21 -07:00
Johanna Amann
5f07673e25 Merge remote-tracking branch 'origin/master' into topic/johanna/config-cluster 2018-06-29 08:30:29 -07:00
Jon Siwek
4614dbe911 Updating submodule(s).
[nomail]
2018-06-28 09:29:45 -05:00
Jon Siwek
e2d5ca5f95 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1947'
* origin/topic/dnthayer/ticket1947:
  Fix some typos and formatting in NEWS
  Add pattern operators to the documentation of operators
  Fix minor typos in broker reference documentation
  Fix a broken link and some typos in broker documentation
  Fix reST formatting in documentation of "count" type
  Add documentation for some new Bro features
2018-06-27 20:27:34 -05:00
Jon Siwek
06e7f18a32 Prevent double-wrapping Broker::Data in published event args
In the following example, the republication of "arg" would result in
literally sending it as a Broker::Data record instead of the broker data
that it was already wrapping.

Sender:

    Broker::publish("topic", my_event, "hello")

Receiver:

    event my_event(arg: any)
        {
        Broker::publish("topic", my_event, arg)
        }
2018-06-27 19:17:54 -05:00
Daniel Thayer
cfe8e8f04b Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1947 2018-06-27 14:17:44 -05:00
Johanna Amann
ea040265c0 Merge remote-tracking branch 'origin/master' into topic/johanna/config-cluster 2018-06-27 11:32:47 -07:00
Daniel Thayer
ceefb6edaf Fix minor typos in broker reference documentation 2018-06-27 13:00:09 -05:00
Vern Paxson
9bdb24a719 d'oh there's isalpha. I looked earlier for isletter :-P 2018-06-26 20:47:12 -07:00
Vern Paxson
4bd8f3a5d5 fix for handling [:(lower|upper):] in case-insensitive patterns 2018-06-26 20:43:48 -07:00
Vern Paxson
80b3b82b54 implemented /re/i for case-insensitive patterns 2018-06-26 15:59:41 -07:00
Jon Siwek
daf8e3ad77 Merge remote-tracking branch 'origin/topic/vern/pattern-leaks'
* origin/topic/vern/pattern-leaks:
  whoops - patterns ops broke count bitwise ops
  fixed 3 leaks in creating pattern values
2018-06-26 17:29:41 -05:00
Jon Siwek
5968f91c4f Merge remote-tracking branch 'origin/topic/vern/pattern-ops'
* origin/topic/vern/pattern-ops:
  Update submodules to correct checkouts.
  test suite updates for &/| pattern operators
  documentation for &/| for patterns
  side-porting changes for supporting &/| pattern ops
  basic code implemented, but there's a memory problem somehwere :-(
2018-06-26 17:19:38 -05:00
Jon Siwek
fb5c32062b Merge remote-tracking branch 'origin/topic/vern/deprecations'
* origin/topic/vern/deprecations:
  deprecate merge_patterns()
  deprecate boolean scalar+vector operations
  bug fix (and typo fix) for vector+scalar boolean operations
  deprecate mixing scalars and vectors
  deprecate && / || operators for patterns
  fixed typos in NEWS
2018-06-26 17:03:49 -05:00
Jon Siwek
ac495e729b Fix deprecated actor_system_config field usages 2018-06-26 15:05:53 -05:00
Vern Paxson
bd5414d8d5 whoops - patterns ops broke count bitwise ops 2018-06-26 10:57:24 -07:00
Vern Paxson
2fa1ea77e4 fixed 3 leaks in creating pattern values 2018-06-26 10:43:06 -07:00
Jon Siwek
9c0303804d Remove header self-inclusions 2018-06-26 11:46:40 -05:00
Jon Siwek
a33d2d13bf Reorganize private broker/Manager members 2018-06-25 16:41:55 -05:00
Jon Siwek
0200b5bd88 Move internal broker/Manager classes out of header 2018-06-25 16:35:25 -05:00
Jon Siwek
0ae022205e Reduce proliferation of including broker header files
This change should roughly halve compilation time
2018-06-25 16:35:25 -05:00
Vern Paxson
072a25df0f set intersection implemented 2018-06-24 10:43:58 -07:00
Vern Paxson
6449b0ab9e mirroring previous topic/vern/set-ops to get branch up to date, since I'm a n00b 2018-06-23 14:46:47 -07:00
Johanna Amann
610d1ae407 Update submodules to correct checkouts. 2018-06-22 22:01:42 -07:00
Jon Siwek
e93c638f8d Fix null pointer deref in AST traversal
Specifically in the case where parsing bro scripts had failed.
2018-06-22 20:18:36 -05:00
Vern Paxson
1732b18e7d Merge branch 'topic/vern/pattern-ops' of ssh://git.bro.org/bro into topic/vern/pattern-ops 2018-06-22 15:12:44 -07:00
Vern Paxson
04b7f8276c side-porting changes for supporting &/| pattern ops 2018-06-22 15:12:22 -07:00
Vern Paxson
4afc1d01ec Merge branch 'topic/vern/pattern-ops' of github.com:bro/bro into topic/vern/pattern-ops
Conflicts:
	src/Expr.cc
	src/parse.y
2018-06-22 14:49:24 -07:00
Vern Paxson
9e2c70b90b deprecate merge_patterns() 2018-06-22 14:17:15 -07:00
Vern Paxson
89b7b88e75 deprecate boolean scalar+vector operations 2018-06-22 13:43:51 -07:00
Vern Paxson
b811a8e7a6 bug fix (and typo fix) for vector+scalar boolean operations 2018-06-22 13:40:53 -07:00
Johanna Amann
948bb4b9ec Merge remote-tracking branch 'origin/master' into topic/johanna/config-cluster 2018-06-22 10:43:09 -07:00
Vern Paxson
cff68b4371 deprecate mixing scalars and vectors 2018-06-22 10:03:13 -07:00
Vern Paxson
6c8562bbdd deprecate && / || operators for patterns 2018-06-21 15:50:56 -07:00
Johanna Amann
2470954795 Fix for ancient reference-counting bug in NFA.cc
This patch fixes a *19 year old* reference-counting bug (which could
lead to a use-after-free, not merely a leak) in the regular expression
code.

Patch by Vern Paxson.
2018-06-21 14:21:36 -07:00
Jon Siwek
e5275b0c92 Merge branch 'topic/vern/bit-ops' of https://github.com/bro/bro
* 'topic/vern/bit-ops' of https://github.com/bro/bro:
  documentation clarification for "p1 | p2"
  documentation for bitwise operators
  document the '|' operator for patterns
  test suite for bitwise operators brief NEWS blurb allow for "counter" operands (does anyone still use these?) for one (but not both) of the bitwise operands
  bitwise operations for "count" types implemented
  Starting branch for supporting bit operations on count's.
2018-06-21 16:05:07 -05:00
Jon Siwek
0ab550d3b1 Updating submodule(s).
[nomail]
2018-06-21 14:36:42 -05:00
Jon Siwek
66ee376411 BIT-1938: fix crash in Broker manager shutdown 2018-06-21 11:48:10 -05:00
Vern Paxson
21614cd30d basic code implemented, but there's a memory problem somehwere :-( 2018-06-20 09:49:29 -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
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
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
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
Robin Sommer
280e8c7dcc Merge branch 'master' of ssh://git.bro.org/bro 2018-06-08 16:41:28 +00:00