Commit graph

7220 commits

Author SHA1 Message Date
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
Johanna Amann
333bb71ed1 Add rename, unlink, and rmdir bifs. 2017-04-24 11:58:05 -07:00
Robin Sommer
2c2c9c9052 Updating submodule(s).
[nomail]
2017-04-22 08:12:25 -07:00
Robin Sommer
ad4b2d6880 Updating submodule(s).
[nomail]
2017-04-22 08:12:15 -07:00
Robin Sommer
f80a10fb96 Merge remote-tracking branch 'origin/topic/johanna/format-checks'
* origin/topic/johanna/format-checks:
  Guard a few more format strings with __attribute__((format))
2017-04-21 14:19:47 -07:00
Robin Sommer
bf15ff4c83 Merge remote-tracking branch 'origin/topic/johanna/tls13-extensions'
* origin/topic/johanna/tls13-extensions:
  Add support for two TLS 1.3 extensions.
2017-04-21 14:15:23 -07:00
Robin Sommer
b307b29f42 Updating CHANGES and VERSION. 2017-04-21 14:14:00 -07:00
Johanna Amann
81dbbbd3a2 Update submodule
[nomail]
2017-04-17 22:02:39 +02:00
Johanna Amann
15375ba1e3 Guard a few more format strings with __attribute__((format))
This will cause compile-time error messages to be raised if someone
passes incorrect parameters to these strings.
2017-04-17 21:46:58 +02:00
Seth Hall
b3d7d8b1da Documentation updates for loading Bro scripts. 2017-04-17 12:09:18 -04:00
Johanna Amann
9e302c7e89 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix some failing tests
2017-04-10 13:31:17 -07:00
Daniel Thayer
817b9e01a3 Fix some failing tests
Increase delay time before launching 2nd process to give bro more of a
chance to startup.
2017-04-10 15:24:21 -05:00
Johanna Amann
a7b1161c12 Threading Types: add a bit of documentation to subnet type.
This explains how the length field is currently handled when exchanging
data in both directions.
2017-04-10 11:37:43 -07:00
Robin Sommer
7826cbdfb6 Fixing couple issues reported by Coverity. 2017-04-08 09:57:45 -07:00
Johanna Amann
a3b664c77d Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix the test group name in some broker test files
2017-04-07 10:33:47 -07:00
Johanna Amann
bdc693e72a NetControl: small rule_error changes
* add rule_error test for acld plugin

* add namespace for rule_error calls in OpenFlow
2017-04-07 10:26:34 -07:00
Daniel Thayer
fcbf54f697 Fix the test group name in some broker test files
Some broker leak tests were being ignored because the test group
name was incorrect.
2017-04-07 12:24:29 -05:00
Johanna Amann
6c9449c780 Add support for two TLS 1.3 extensions.
New events:

event ssl_extension_supported_versions(c: connection, is_orig: bool, versions: index_vec)

event ssl_extension_psk_key_exchange_modes(c: connection, is_orig: bool, modes: index_vec)
2017-04-05 11:55:40 -07:00
Johanna Amann
0cd0ffed13 SSL: update dpd signature for TLS1.3
The dpd signature missed a few cases that are used for TLS 1.3,
especially when draft versions (which are all that we are seeing at the
moment) are being negotiated.

This fix mostly allows draft versions in the server hello (identified by
7F[version]; since we do not know how many drafts there will be, we are
currently allowing a rather safe upper limit.
2017-04-05 08:58:08 -07:00
Robin Sommer
391685af73 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a test that was failing on some platforms
2017-03-23 07:26:18 -07:00
Daniel Thayer
ca51dfc9c7 Fix a test that was failing on some platforms
Fixed by sorting the .stderr file, since the ordering of lines was
not consistent on all platforms.
2017-03-22 14:37:37 -05:00
Robin Sommer
05915571db Updating submodule(s).
[nomail]
2017-03-20 12:17:40 -07:00
Johanna Amann
6544e36564 Remove cluster catch and release.
This test keeps failing intermittently because of timing issues that are
surprisingly hard to fix.
2017-03-15 08:00:36 -07:00
Robin Sommer
98c808fbfe Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix some Coverity warnings
2017-03-15 06:44:56 -07:00
Johanna Amann
750e3e358f Update submodule
[nomail]
2017-03-14 06:58:42 -07:00
Johanna Amann
2d7c84956c Update submodule
[nomail]
2017-03-13 16:08:14 -07:00
Johanna Amann
7180c704f6 Update submodule
[nomail]
2017-03-13 11:56:55 -07:00
Johanna Amann
0d691a5032 Merge branch 'patch-1' of https://github.com/petiepooo/bro
* 'patch-1' of https://github.com/petiepooo/bro:
  print version string to stdout on --version
2017-03-13 11:22:59 -07:00
Johanna Amann
17fa1b6fed Fix compiler warnings raised by llvm 8.0.
Warning was:

warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
2017-03-13 11:16:19 -07:00
Johanna Amann
a38f44b1fd Fix coverity warning in Ascii reader. 2017-03-13 11:16:15 -07:00
Pete
05746ab7fc print version string to stdout on --version
When running a *nix command from the prompt, and output is expected, that output should be sent to stdout, not stderr.  The --version option is such a case.  The outputted version string is not an indication of error or a diagnostic output; it is the expected output, thus should follow standard conventions and be output to stdout..
2017-03-12 12:53:12 -04:00
Seth Hall
d505670f59 Updating NEWS 2017-03-09 12:43:41 -05:00
Seth Hall
b9c8bae0fd Merge branch 'topic/seth/input-thread-behavior'
* topic/seth/input-thread-behavior:
  Minor documentation fixes.
  Ascii reader error changes - fix small bugs
  Tiny fix to correct a warning message.
  Input's ascii reader is now more resilient.
  Another resilient Ascii reader checkpoint.
  In progress on ascii writer behavior change.
2017-03-09 12:23:02 -05:00
Seth Hall
ffdd684eaa Merge remote-tracking branch 'origin/master' into topic/seth/input-thread-behavior 2017-03-09 12:18:41 -05:00
Seth Hall
ff4d624ebe Minor documentation fixes. 2017-03-09 12:18:35 -05:00
Daniel Thayer
5ec4e00fcd Fix some Coverity warnings
Fixed some Coverity warnings in RemoteSerializer::ProcessLogCreateWriter().
Upon failure, CreateWriterForRemoteLog() frees the "info" and "fields"
pointers, so they are now set to null in order to avoid freeing them
a second time.
2017-03-08 14:19:31 -06:00
Robin Sommer
dc2cfd8a10 Updating submodule(s).
[nomail]
2017-03-03 12:51:54 -08:00
Johanna Amann
b6e6302b40 Ascii reader error changes - fix small bugs
The changes are now a bit more succinct with less code changes required.
Behavior is tested a little bit more thoroughly and a memory problem
when reading incomplete lines was fixed. ReadHeader also always directly
returns if header reading failed.

Error messages now are back to what they were before the change, if the
new behavior is not used.

I also tweaked the documentation text a bit.
2017-03-03 12:42:44 -08:00
Robin Sommer
f616903e5f Updating submodule(s).
[nomail]
2017-03-03 10:44:24 -08:00
Robin Sommer
6302b103f4 Merge remote-tracking branch 'origin/topic/johanna/threads'
Tweaked the new threading code a bit more.

* origin/topic/johanna/threads:
  Move threading to c++11 primitives (mostly).
2017-03-03 10:40:04 -08:00
Robin Sommer
766bab0771 Updating submodule. 2017-03-02 16:45:07 -08:00
Johanna Amann
9341ff801c Move threading to c++11 primitives (mostly).
This moves all threading code in Bro from pthreads to the c++11
primitives, which make for shorter, easier to use, and less error-prone
code.

pthreads is still used in 2 places in Bro currently. BasicThread uses
two bits of functionality that are not available using the c++ API
(setting thread names & setting signal masks). Since all c++
implementations that I am aware of still use an underlying pthreads
implementation, we just use native_handle to access the underlying
pthreads implementation for these cases. I do not expect this to lead to
problems in the forseable future. If we ever encounter a platform where
a different thread architecture is used, we might have to change that
around.

This code is guarded by static_asserts, so we will notice if a platform
uses a different implementation.

sqlite also uses pthreads directly.
2017-03-02 08:53:38 -08:00
Seth Hall
1c973f4adf Merge branch 'master' of ssh://git.bro-ids.org/bro 2017-02-28 12:40:12 -05:00
Seth Hall
01a3943635 Do some updates to remove build time warnings.
The linker was complaining about linking files that didn't
have any symbols.  These were actually empty files so I just
got rid of them and removed references to them.
2017-02-28 12:40:01 -05:00
Robin Sommer
38d9f07bbd Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a test that sometimes fails on FreeBSD
2017-02-28 08:00:24 -08:00
Seth Hall
b89fe748c9 Merge remote-tracking branch 'origin/topic/robin/broker-logging'
* origin/topic/robin/broker-logging:
  Another fix for the new Broker-based remote logging.
  Fix some minor issues.
  Adding Broker ifdefs for new remote logging code.
  Changing semantics of Broker's remote logging to match old communication framework.
2017-02-27 15:10:36 -05:00
Robin Sommer
58a2d06c93 Another fix for the new Broker-based remote logging. 2017-02-27 08:22:16 -08:00
Daniel Thayer
0f695a7316 Fix a test that sometimes fails on FreeBSD 2017-02-25 21:53:02 -06:00
Johanna Amann
22c89a83f5 Update submodule
[nomail]
2017-02-24 09:02:16 -08:00
Seth Hall
5078159080 Tiny fix to correct a warning message. 2017-02-23 23:13:48 -05:00