Commit graph

7932 commits

Author SHA1 Message Date
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
Seth Hall
645ec39f4b New file types sigs from Keith Lehigh. 2017-01-31 23:33:58 -05:00
Robin Sommer
5ab3b86c72 Merge remote-tracking branch 'origin/master' into topic/robin/file-analysis-fixes 2017-01-31 14:53:33 -08:00
Robin Sommer
e21cca4ba8 Adding test with command line that used to trigger a crash. 2017-01-31 14:52:37 -08:00
Robin Sommer
16f20507fd Cleaning up a couple of comments. 2017-01-31 14:45:06 -08:00
Johanna Amann
6487446f27 Change snaplen of test trace from 1,000,000 to 10,000
Recent versions of libpcap are unhappy with values bigger than 262,144
and will refuse reading the file.
2017-01-31 13:10:36 -08:00
Johanna Amann
7feaf4499f Fix layer 2 connection flipping.
If connection flipping occured in Sessions.cc code (invoked e.g. when
the original SYN is missing), layer 2 flipping was not performed. This
change switches to always use the connection flipping code in Conn.cc
which performs the switch correctly.
2017-01-30 15:13:56 -08:00
John E. Rollinson
7caf507163 Add script to log ticket hashes in krb log 2017-01-29 09:40:11 +09:00
John E. Rollinson
68e3f0d96a Ensure TGS req does not stomp out AP data 2017-01-29 09:39:40 +09:00
John E. Rollinson
832f6d34b4 Add ciphertext to ticket data structures 2017-01-29 09:39:12 +09:00
Robin Sommer
fead5f5d5e Fix delay in disabling file analyzers.
When a file analyzer signaled being done with data delivery, the
analyzer would only be scheduled for removal at that poing, meaning it
could still receive more data until that action actually took effect.
Now we make sure to not send any more data to an analyzer.
2017-01-28 13:24:13 -08:00
Robin Sommer
3ce6a031d4 Fix file analyzer memory management.
File analyzers got deleted immediately once the queue with the
corresponding removal operation got drained. That however can happen
while the analyzer is still doing stuff: the queue is drained whenever
any the "special" file analysis events needing immediate attention has
been executed. This fix now only schedules the analyzer for deletion
at that time, but postpones the actual operation until file object
itself is being destroyed.
2017-01-28 13:07:51 -08: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
Robin Sommer
46368b718c Updating submodule. 2017-01-25 13:06:22 -08:00
Seth Hall
08bc5ccd42 Fixing tests 2017-01-25 02:06:35 -05:00
Seth Hall
2d1f007186 Extend file extraction log.
- New fields: extracted_cutoff and extracted_size.
   These fields will be null if the file isn't extracted.

 - Extended the extraction test to test the files log too.
2017-01-25 01:16:46 -05:00
Jon Siwek
fdb19872b4 Update submodule. 2017-01-24 19:40:33 -06:00
Robin Sommer
f5f517a97f Updating submodule. 2017-01-24 08:48:57 -08:00
Robin Sommer
9d2b69be42 Updating submodule. 2017-01-23 20:02:25 -08:00
Johanna Amann
07b7f1d193 Add new TLS extension type (cached_info) 2017-01-19 13:22:34 -08:00
Johanna Amann
e991189fff Remove brocon event.
It make the plugins/hooks test fail, because the number of the current
year shows up in the Baseline.
2017-01-19 13:01:35 -08:00
Johanna Amann
e3c7bcbb43 Add missing paths to SMM Log::create_streams calls 2017-01-12 13:45:39 +01:00
Johanna Amann
86271f2bdf Update submodule
[nomail]
2016-12-24 11:12:57 +01:00
Seth Hall
04d41dce5c Tiny xlsx file signature fix.
Thanks to Dan Caselden for noticing!
2016-12-08 08:32:45 -05:00
Johanna Amann
8eddeed78f Allow access to global variables using GLOBAL:: namespace.
Addresses BIT-1758. Patch was contributed by François Pennaneach
<francois.pennaneach@free.fr>.
2016-12-07 15:28:34 -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
Daniel Thayer
85ddd3ca8b Remove wordexp functionality from broxygen
Broxygen no longer attempts to do tilde expansion of PATH
components when trying to get the mtime of Bro (this involved removing
the wordexp functionality, which doesn't exist on OpenBSD).  In the
very unlikely event that this causes problems for someone (this could
occur by running "bro -X configfile" if bro is located in a PATH
component which starts with a tilde, such as "~/bin"), the error
message text has been improved so that a user knows the workaround
for this (just run bro with a relative or absolute path).

Broxygen also no longer attempts to get the mtime of the bro executable
when bro wasn't invoked with the "-X" option.
2016-12-07 16:42:44 -06:00
Daniel Thayer
0581364d86 Fix a failing test on OpenBSD
Update a test due to the changes in commit e198fba2.
2016-12-06 10:46:29 -06:00
Johanna Amann
9059af6579 Update submodule
[nomail]
2016-12-05 16:17:54 -08:00
Johanna Amann
19d47ec6a9 Update submodule
[nomail]
2016-12-05 15:54:21 -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
Daniel Thayer
f107336f21 Fix compiler warnings on OpenBSD
Needed to add an "#include" to get the declaration of "struct in_addr".
2016-12-02 16:15:12 -06:00
Daniel Thayer
31e46d37f0 Fix a build failure on OpenBSD
The wordexp function doesn't exist in OpenBSD.  Skipping this
functionality only affects users who have bro installed in a directory
in the PATH and the directory name as it appears in PATH starts with
a tilde (e.g. "~/bin").  A simple workaround for affected users
would be to change the PATH environment variable to not contain any
tildes.
2016-12-02 14:31:16 -06:00
Daniel Thayer
de1c13e3a3 Fix test core.pcap.dumper to work on OpenBSD
The sdiff command on OpenBSD truncates the output at a different
position than sdiff on other platforms.  Simple fix is to use diff
instead of sdiff.
2016-12-01 16:35:54 -06:00
Johanna Amann
37a51b354e Fix validation of OCSP replies inside of Bro.
At one place in the code, we do not check the correct return code. This
makes it possible for a reply to get a response of "good", when the ocsp
reply is not actually signed by the responder in question.

This also instructs ocsp verication to skip certificate chain
validation, which we do ourselves earlier because the OCSP verify
function cannot do it correctly (no way to pass timestamp).
2016-11-30 13:17:09 -08:00
Johanna Amann
b39594408c Update submodules
[nomail]
2016-11-30 10:32:16 -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
Johanna Amann
beaf491fa3 Fix compile error in krb-types.pac.
Introduced in 15f2b30c73
2016-11-29 12:41:15 -08:00
Daniel Thayer
e198fba2d9 Fix a build failure on OpenBSD
The definition of a "struct pcap_pkthdr" on OpenBSD contains a member
of type "struct bpf_timeval" instead of "struct timeval" used on other
systems.

Also, on OpenBSD the header netinet/if_ether.h does not #include
net/if_arp.h as it does on other systems.
2016-11-29 14:20:43 -06:00
Vlad Grigorescu
15f2b30c73 Merge pull request #90 from jamesecorrenti/patch-1
Update krb-types.pac to allow for names that can have 3 components
2016-11-29 10:56:14 -06:00
Vlad Grigorescu
5845737c0c Fix a typo 2016-11-29 10:55:18 -06:00
jamesecorrenti
4b4ccabd70 Update krb-types.pac
KerberosString formatting for principal name to be compliant with RFC 4120 section 5.2.2, which states that there can be a few components (and in practice we have seen 3, more than the 1 or 2 that is typical)
2016-11-22 16:41:56 -05:00
Robin Sommer
7b44974a58 Updating submodule(s).
[nomail]
2016-11-16 14:52:13 -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
a984a30fd0 Updating submodule(s).
[nomail]
2016-11-15 13:23:34 -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
a848b8785b Updating submodule(s).
[nomail]
2016-11-14 17:56:27 -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