Commit graph

1825 commits

Author SHA1 Message Date
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
Johanna Amann
ad345d7277 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1516'
* origin/topic/dnthayer/ticket1516:
  Remove wordexp functionality from broxygen
  Fix a failing test on OpenBSD
  Fix compiler warnings on OpenBSD
  Fix a build failure on OpenBSD
  Fix test core.pcap.dumper to work on OpenBSD

BIT-1516 #merged
2016-12-07 14:53:35 -08:00
Robin Sommer
99923583e4 Merge remote-tracking branch 'origin/topic/johanna/ocsp-validate-fix'
* origin/topic/johanna/ocsp-validate-fix:
  Fix validation of OCSP replies inside of Bro.

BIT-1763 #merged
2016-12-05 11:46:45 -08:00
Johanna Amann
9b9c3a6104 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1757'
* origin/topic/dnthayer/ticket1757:
  Fix a build failure on OpenBSD

BIT-1757 #merged
2016-11-29 12:52:36 -08:00
Robin Sommer
0bfd6424ab Updating submodule(s).
[nomail]
2016-11-15 13:26:03 -08:00
Robin Sommer
c1da7b4840 Updating submodule(s).
[nomail]
2016-11-15 13:24:18 -08:00
Robin Sommer
e9b0639ccb Adding missing '@load ./pubkey-hashes' to policy/frameworks/intel/seen. 2016-11-14 17:59:58 -08:00
Robin Sommer
6e1d55a3bb Merge remote-tracking branch 'origin/topic/dnthayer/doc-fixes-updates'
BIT-1748 #merged
2016-11-14 17:53:20 -08:00
Johanna Amann
ba5abf8dbe Updating CHANGES and VERSION. 2016-11-02 12:13:48 -07:00
Johanna Amann
c92060a8ca Merge remote-tracking branch 'origin/topic/seth/smb-auth-fixes'
* origin/topic/seth/smb-auth-fixes:
  Disable SMB2 error data parsing.
  Removed some files that aren't being used.
  Fix SMB tree connect handling.
  Fix a small issue where DCE_RPC commands were improperly being logged.
  SMB fixes and cleanup.
  Including a test for raw NTLM in SMB
  Updates for SMB auth handling from Martin van Hensbergen.

BIT-1721 #merged
2016-11-02 10:25:33 -07:00
Johanna Amann
6a0247fab1 Merge remote-tracking branch 'origin/topic/dnthayer/local-logger'
* origin/topic/dnthayer/local-logger:
  Add a new site policy script local-logger.bro

BIT-1700 #merged
2016-11-01 09:41:50 -07:00
Johanna Amann
be571986b2 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1750'
* origin/topic/dnthayer/ticket1750:
  Python 3 compatibility fixes for doc/ext/bro.py

BIT-1750 #merged
2016-10-31 14:25:23 -07:00
Robin Sommer
0d37c0df7b Fix for Sphinx >= 1.4 compability. 2016-10-27 09:00:34 -07:00
Robin Sommer
ce72a09c0c Merge remote-tracking branch 'origin/topic/johanna/xmpp-ns'
BIT-1743 #merged

* origin/topic/johanna/xmpp-ns:
  XMPP: Fix detection of StartTLS when using namespaces
2016-10-27 08:10:35 -07:00
Seth Hall
31492314d8 Merge remote-tracking branch 'origin/topic/seth/dce_rpc_fixes'
* origin/topic/seth/dce_rpc_fixes:
  Updating tests.
  Moved the DCE_RPC constants into init-bare.bro.
  Adding one more case to the DCE_RPC defrag logic.
  Make DCE_RPC skip input in strange fragment circumstances.
  Stop calling Remove() on DCE_RPC analyzer.
  More DCE_RPC improvements.
2016-10-26 09:47:57 -04:00
Johanna Amann
6aea681832 Merge branch 'patch-2' of https://github.com/balintm/bro
* 'patch-2' of https://github.com/balintm/bro:
  Update smb1-com-open-andx.pac
2016-10-25 09:46:37 -07:00
Robin Sommer
c57f83d8bf Merge remote-tracking branch 'origin/topic/johanna/gcc-6.2.1'
BIT-1732 #merged

* origin/topic/johanna/gcc-6.2.1:
  Fix alignment issue of ones_complement_checksum
2016-10-24 11:12:05 -07:00
Johanna Amann
96d14691df Merge remote-tracking branch 'origin/topic/dnthayer/ticket1731'
* origin/topic/dnthayer/ticket1731:
  Fix istate.pybroccoli test on systems using Python 3

BIT-1731 #merged
2016-10-20 11:41:19 -04:00
Johanna Amann
8ce746cc25 Merge remote-tracking branch 'origin/topic/vladg/bit-1641'
* origin/topic/vladg/bit-1641:
  Logic fix for ssh/main.bro when the auth status is indeterminate, and fix a test. Addresses BIT-1641.
  Clean up the logic for ssh_auth_failed. Addresses BIT-1641
  Update baselines for adding a field to ssh.log as part of BIT-1641
  Script-land changes for BIT-1641.
  Change SSH.cc to use ssh_auth_attempted instead of ssh_auth_failed. Addresses BIT-1641.
  Revert "Fixing duplicate SSH authentication failure events."
  Create new SSH events ssh_auth_attempt and ssh_auth_result. Add auth_attempts to SSH::Info. Address BIT-1641.

I extended the tests a bit and did some small cleanups. I also moved the
SSH events back to the global namespace for backwards compatibility and
for consistency (the way it was at the moment, some of them were global
some SSH::).

Furthermore, I fixed the ssh_auth_result result event, it was only
raised in the success case. ssh_auth_result is now also checked in the
testcases. I also have a suspicion that the intel integration never
really worked before.

BIT-1641 #merged
2016-10-18 21:57:27 -04:00
Robin Sommer
f17d92d3cc Updating submodule(s).
[nomail]
2016-10-13 16:29:52 -07:00
Johanna Amann
38f6ca87ae Merge remote-tracking branch 'origin/topic/dnthayer/ticket1720'
BIT-1720 #merged

* origin/topic/dnthayer/ticket1720:
  Added missing README files for documentation
  List new log files in the log-files.rst document
2016-10-13 14:09:44 -07:00
Robin Sommer
4477b8a1ab Merge remote-tracking branch 'origin/topic/seth/dce_rpc_fixes'
* origin/topic/seth/dce_rpc_fixes:
  Fixes for DCE_RPC analyzer
2016-10-10 08:29:14 -07:00
Robin Sommer
54191cc390 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1719'
BIT-1719 #merged

* origin/topic/dnthayer/ticket1719:
  Fix httpd.py test script for Py3 compatibility
2016-10-10 08:24:04 -07:00
Robin Sommer
d9ba7ea0dd Fixing documentation piece.
The interesting-hostname script has changed.
2016-10-06 14:28:52 -07:00
Seth Hall
ddb905408f Merge remote-tracking branch 'origin/topic/johanna/bit-1695'
* origin/topic/johanna/bit-1695:
  Normalize http host in seen script.
2016-10-02 17:39:36 -04:00
Seth Hall
d70f895be3 Merge branch 'J-Gras-topic/jgras/bit-1679'
* J-Gras-topic/jgras/bit-1679:
  Handle removing non-existent intel items.
  Separated file and default info added to matches.
2016-10-02 14:44:43 -04:00
Robin Sommer
b6a0802227 Prettifying reporter output in case no epxression is associated with
runtime error.
2016-09-28 18:18:58 -07:00
Robin Sommer
4059d4b4f1 Merge remote-tracking branch 'origin/topic/johanna/bit-1683'
Looks like the right fix. Two tiny tweaks:

     - changed the order of arguments for DeleteVals() for consistency
       with the corresponding Manager function.

     - turned the InternalWarning into a Warning: if I understand
       correctly, this can happen when scripts on nodes diverge; which
       is a user-side problem, not an internal Bro logic issue.

BIT-1683 #merged

* origin/topic/johanna/bit-1683:
  Actually check if the number of fields in a write are equal to the number of fields required.
2016-09-27 12:40:36 -07:00
Johanna Amann
48f505f706 Fix a debugger bug where it would not support statements like print(3).
This is a manual merge of a branch of Vlad Grigorescu.

BIT-1703 #merged
2016-09-26 10:17:12 -07:00
Robin Sommer
0bc4a5ea52 Updating submodule(s).
[nomail]
2016-09-19 17:18:38 -07:00
Robin Sommer
51b1c6470e Merge branch 'master' of git.bro.org:bro 2016-09-19 17:15:12 -07:00
Robin Sommer
2bf4c2072c Merging topic/vladg/bit-1681.
(Note this a "manual" merge: I've copied just the two relevant *pac
files over, as there were a bunch of independent commits in the branch
history that I didn't want to pull in.)

BIT-1681 #merged
2016-09-19 17:04:44 -07:00