Commit graph

2206 commits

Author SHA1 Message Date
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
Johanna Amann
9e302c7e89 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix some failing tests
2017-04-10 13:31:17 -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
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
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
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
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
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
e0a72b6e5c Updating submodule. 2017-02-23 10:20:06 -08:00
Seth Hall
a44c4049b8 Merge remote-tracking branch 'origin/topic/seth/radius-script-refactor'
* origin/topic/seth/radius-script-refactor:
  Rework the RADIUS base script.
2017-02-20 00:25:47 -05:00
Seth Hall
f935675d82 Merge branch 'topic/seth/krb5-ticket-tracking-merge'
* topic/seth/krb5-ticket-tracking-merge:
  Refactor base krb scripts and update tests.
  Add script to log ticket hashes in krb log
  Ensure TGS req does not stomp out AP data
  Add ciphertext to ticket data structures
2017-02-18 14:03:04 -05:00
Johanna Amann
5f910e1005 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1785'
* origin/topic/jsiwek/bit-1785:
  BIT-1785: fix scripts able to access uninitialized variables.

BIT-1785 #merged
2017-02-15 16:19:21 -08:00
Johanna Amann
7c7e12ab94 Merge remote-tracking branch 'origin/topic/seth/BIT-1480'
* origin/topic/seth/BIT-1480:
  Small change to avoid potentially over reading memory.
  Implement ERSPAN support.

BIT-1480 #merged
2017-02-15 15:32:47 -08:00
Seth Hall
0dd0bfb5bb Merge branch 'topic/seth/BIT-1790'
* topic/seth/BIT-1790:
  Updated expiration test case to cover reinsertion.
  Fixed intel expiration reset.
2017-02-10 09:54:55 -05:00
Seth Hall
3cfe8cd294 Merge branch 'master' of ssh://git.bro-ids.org/bro 2017-02-06 10:18:05 -05:00
Robin Sommer
d942b0e8e1 Merge branch 'master' of git.bro.org:bro 2017-02-03 16:39:13 -08:00
Johanna Amann
9db27a6d60 Merge remote-tracking branch 'origin/topic/robin/file-analysis-fixes'
* origin/topic/robin/file-analysis-fixes:
  Adding test with command line that used to trigger a crash.
  Cleaning up a couple of comments.
  Fix delay in disabling file analyzers.
  Fix file analyzer memory management.

The merge changes around functionality a bit again - instead of having
a list of done analyzers, analyzers are simply set to skipping when they
are removed, and cleaned up later on destruction of the AnalyzerSet.

BIT-1782 #merged
2017-02-01 14:20:14 -08:00
Seth Hall
cd1f3114b7 Merge branch 'topic/seth/BIT-1781'
* topic/seth/BIT-1781:
  New file types sigs from Keith Lehigh.

Closes BIT-1781
2017-02-01 10:09:33 -05:00
Johanna Amann
572c9b49fd Merge remote-tracking branch 'origin/topic/seth/BIT-1786'
* origin/topic/seth/BIT-1786:
  Fixing tests
  Extend file extraction log.

BIT-1786 #merged
2017-01-26 13:49:35 -08:00