Commit graph

7254 commits

Author SHA1 Message Date
Robin Sommer
511ca9e043 Adding Broker ifdefs for new remote logging code. 2017-02-17 16:28:20 -08: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
Vlad Grigorescu
b3a18f3c80 Kerberos ciphertext had some additional ASN.1 content being lumped in. 2017-02-15 16:24:21 -06:00
Seth Hall
809660d48a Tiny mime-type fix from Dan Caselden. 2017-02-14 07:21:00 -08:00
Johanna Amann
2b694a1881 Update failing intel framework test. 2017-02-11 08:36:47 -08:00
Robin Sommer
a5e9a535a5 Changing semantics of Broker's remote logging to match old communication framework.
Broker had changed the semantics of remote logging: it sent over the
original Bro record containing the values to be logged, which on the
receiving side would then pass through the logging framework normally,
including triggering filters and events. The old communication system
however special-cases logs: it sends already processed log entries,
just as they go into the log files, and without any receiver-side
filtering etc. This more efficient as it short-cuts the processing
path, and also avoids the more expensive Val serialization. It also
lets the sender determine the specifics of what gets logged (and how).

This commit changes Broker over to now use the same semantics as the
old communication system.

TODOs:
     - The new Broker code doesn't have consistent #ifdefs yet.

     - Right now, when a new log receiver connects, all existing logs
     are broadcasted out again to all current clients. That doesn't so
     any harm, but is unncessary. Need to add a way to send the
     existing logs to just the new client.
2017-02-10 18:46:45 -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
ffa34180df Merge branch 'topic/jgras/bit-1790' of https://github.com/J-Gras/bro into topic/seth/BIT-1790 2017-02-10 09:39:27 -05:00
Jan Grashoefer
c6b16ad2ca Updated expiration test case to cover reinsertion.
Addresses BIT-1790
2017-02-09 19:40:25 +01:00
Jan Grashoefer
209a560cc6 Fixed intel expiration reset.
Reinserting the same indicator did not reset the expiration timer for
the indicator in the underlying data store.

Addresses BIT-1790
2017-02-09 19:36:05 +01:00
Jon Siwek
c857f5c4dd BIT-1785: fix scripts able to access uninitialized variables. 2017-02-06 23:30:54 -06:00
Seth Hall
3cfe8cd294 Merge branch 'master' of ssh://git.bro-ids.org/bro 2017-02-06 10:18:05 -05:00
Seth Hall
620be1e897 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1788'
* origin/topic/dnthayer/ticket1788:
  Fix to_json() to not lose precision for values of type double
  Fix the to_json() function for bool, enum, and interval types
  Add tests for the to_json() function
2017-02-06 10:15:25 -05:00
Johanna Amann
1de6cfc2e3 Fix memory leak in file analyzer.
This undoes the changes applied in merge 9db27a6d60
and goes back to the state in the branch as of the merge 5ab3b86.

Getting rid of the additional layer of removing analyzers and just
keeping them in the set introduced subtle differences in behavior since
a few calls were still passed along. Skipping all of these with SetSkip
introduced yet other subtle behavioral differences.
2017-02-04 16:47:07 -08:00
Robin Sommer
7beac6e404 Updating submodule(s).
[nomail]
2017-02-03 16:41:32 -08:00
Robin Sommer
d942b0e8e1 Merge branch 'master' of git.bro.org:bro 2017-02-03 16:39:13 -08:00
Johanna Amann
647eb9703f Change snaplens of a few more tests.
Recent pcap versions do not like the huge snaplens that the header in
these files uses.
2017-02-03 14:10:11 -08:00
Robin Sommer
8863fd4242 Updating submodule. 2017-02-03 12:38:14 -08:00
Seth Hall
d32e4b25f1 Small change to avoid potentially over reading memory. 2017-02-03 12:34:39 -08:00
Robin Sommer
bdbbed64f1 Merge remote-tracking branch 'origin/topic/johanna/l2flip'
BIT-1787 #merged

* origin/topic/johanna/l2flip:
  Fix layer 2 connection flipping.
2017-02-03 12:31:55 -08:00
Seth Hall
59f0477d29 Implement ERSPAN support.
This is a small caveat to this implementation.  The ethernet
header that is carried over the tunnel is ignored.  If a user
tries to do MAC address logging, it will only show the MAC
addresses for the outer tunnel and the inner MAC addresses
will be stripped and not available anywhere.
2017-02-03 12:29:22 -08:00
Daniel Thayer
6812a7febe Fix to_json() to not lose precision for values of type double
Also changed a few values in the tests for better numerical diversity.
2017-02-02 13:03:05 -06:00
Daniel Thayer
65d6e5a4f7 Fix the to_json() function for bool, enum, and interval types 2017-02-02 12:09:40 -06:00
Daniel Thayer
9370db8980 Add tests for the to_json() function 2017-02-02 11:58:38 -06: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
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