Commit graph

5803 commits

Author SHA1 Message Date
Robin Sommer
770f833ea2 Removing deprecated fields from the connection record.
Removing "hot" and "addl", which haven't been used anymore for a long
time. Also removing the functions append_addl() and append_addl_marker().
2015-04-20 20:07:24 -07:00
Robin Sommer
de1e2fe20b Removing the NetFlow analyzer.
Since the command-line option for reading NetFlow went away, the has
been neither used nor tested anymore. We might bring this back later,
but for now I'd rather remove it than having dead code that seems to
suggest that we support it.
2015-04-20 20:07:24 -07:00
Robin Sommer
c81fbb7d3f Tweakings NEWS. 2015-04-20 19:33:58 -07:00
Robin Sommer
a9979d56a4 Merge remote-tracking branch 'origin/topic/vladg/file-analysis-exe-analyzer'
* origin/topic/vladg/file-analysis-exe-analyzer: (31 commits)
  Tweak the PE OS versions based on real-world traffic.
  Update pe/main.bro to user register_for_mime_types, ensuring it will also work with the upcoming Files framework changes.
  A bit of final core-level cleanup.
  A bit of final script cleanup.
  Update baselines.
  Add a btest for the PE analyzer.
  Add a PE memleak test, and fix a memleak.
  Documentation and a bit of overall cleanup.
  Add data about which tables are present.
  Remove the .idata parsing, as it can be more complicated in some cases.
  Fix a PE analyzer failure where the IAT isn't aligned with a section boundary.
  PE: Rehash the log a bit.
  Make base_of_data optional.
  Fix support for PE32+ files.
  PE Analyzer cleanup.
  Checkpoint - Import Address Table being parsed.
  Some changes to fix PE analyzer on master.
  Parse PE section headers.
  Updated PE analyzer to work with changes in master.
  In progress checkpoint.  Things are starting to work.
  ...

BIT-1369 #merged
2015-04-20 19:23:31 -07:00
Robin Sommer
ed91732e09 Merge remote-tracking branch 'origin/topic/seth/more-file-type-ident-fixes'
* origin/topic/seth/more-file-type-ident-fixes:
  File API updates complete.
  Fixes for file type identification.
  API changes to file analysis mime type detection.
  Make HTTP 206 reassembly require ETags by default.
  More file type identification improvements
  Fix an issue with files having gaps before the bof_buffer is filled.
  Fix an issue with packet loss in http file reporting.
  Adding WOFF fonts to file type identification.
  Extended JSON matching and added OCSP responses.
  Another large signature update.
  More signature updates.
  Even more file type ident clean up.
  Lots of fixes for file type identification.

BIT-1368 #merged
2015-04-20 13:31:00 -07:00
Robin Sommer
2932ad2bd6 Updating submodule(s).
[nomail]
2015-04-20 12:55:10 -07:00
Jon Siwek
de6112c41b Fix uninitialized field in raw input reader. 2015-04-20 14:11:54 -05:00
Jon Siwek
4dcd8d999b Updating submodule(s).
[nomail]
2015-04-20 13:27:18 -05:00
Jon Siwek
bd4bc25eda Remove unneeded documentation cross-referencing.
Noticed these gave warnings due to missing namespace, but rather than
fix I'm just removing because they reference names in the same
module/file that will appear inches away from each other in the final
output.
2015-04-20 13:04:33 -05:00
Jon Siwek
229307174e BIT-1380: Improve Broxygen output of &default expressions. 2015-04-20 12:49:10 -05:00
Vlad Grigorescu
d0e4d17f31 Tweak the PE OS versions based on real-world traffic. 2015-04-20 12:49:42 -04:00
Vlad Grigorescu
928f870f58 Update pe/main.bro to user register_for_mime_types, ensuring it will also work with the upcoming Files framework changes. 2015-04-20 11:54:34 -04:00
Seth Hall
ed375167c8 File API updates complete.
Addresses BIT-1368.
2015-04-20 10:46:48 -04:00
Seth Hall
038e4c24f6 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1368' into topic/seth/more-file-type-ident-fixes
Conflicts:
	src/file_analysis/File.cc
	testing/btest/Baseline/plugins.hooks/output
2015-04-20 09:36:40 -04:00
Seth Hall
faabe8a5e3 Fixes for file type identification.
- Backed out eTag changes.  The real world is more complicated
   than just using eTags to identify the same file.
 - A bit of code simplication in the http base scripts.
 - Test updates (more existing small problems were identified!).
 -
2015-04-20 09:34:09 -04:00
Vlad Grigorescu
49d54b6a4e A bit of final core-level cleanup. 2015-04-19 21:59:42 -04:00
Vlad Grigorescu
e3d63bfee8 A bit of final script cleanup. 2015-04-19 21:38:34 -04:00
Vlad Grigorescu
71230fec81 Update baselines. 2015-04-19 21:16:35 -04:00
Vlad Grigorescu
0199ac5ece Add a btest for the PE analyzer. 2015-04-19 20:27:24 -04:00
Vlad Grigorescu
93b84463f5 Add a PE memleak test, and fix a memleak. 2015-04-19 20:22:42 -04:00
Vlad Grigorescu
d4bd5672c0 Documentation and a bit of overall cleanup. 2015-04-19 20:21:49 -04:00
Vlad Grigorescu
a2eff14e05 Add data about which tables are present. 2015-04-19 18:41:32 -04:00
Vlad Grigorescu
ea36686524 Remove the .idata parsing, as it can be more complicated in some cases. 2015-04-19 18:15:21 -04:00
Vlad Grigorescu
546cbf50c9 Fix a PE analyzer failure where the IAT isn't aligned with a section boundary. 2015-04-18 19:41:16 -04:00
Vlad Grigorescu
da89837693 Merge remote-tracking branch 'origin/master' into topic/vladg/file-analysis-exe-analyzer 2015-04-18 11:22:25 -04:00
Robin Sommer
b514bb5cd6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add broctl items to NEWS

Conflicts:
	NEWS
2015-04-17 14:18:55 -07:00
Robin Sommer
c2df6bb839 Updating NEWS. 2015-04-17 13:41:14 -07:00
Robin Sommer
7b7e0b8662 Slight comment tweak. 2015-04-17 13:26:29 -07:00
Robin Sommer
d6dda8e984 Merge remote-tracking branch 'origin/topic/johanna/bit-985'
* origin/topic/johanna/bit-985:
  add seeking functionality to raw reader.

BIT-985 #merged
2015-04-17 13:13:45 -07:00
Daniel Thayer
e0fb634f0c Add broctl items to NEWS 2015-04-17 15:02:37 -05:00
Robin Sommer
1e010fbb76 Merge remote-tracking branch 'origin/topic/johanna/conn-threshold'
* origin/topic/johanna/conn-threshold:
  Wrap threshold stuff up - fix two small bugs and update baselines.
  update GridFTP analyzer to use connection thresholding instead of polling
  Add high level api for thresholding that holds lists of thresholds and raises an event for each threshold exactly once.
  Allow setting packet and byte thresholds for connections.

BIT-1377 #merged
2015-04-17 13:02:31 -07:00
Robin Sommer
43a873d9b3 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1376'
* origin/topic/jsiwek/bit-1376:
  Fix attempt for "internal error: unknown msg type 115 in Poll()"

BIT-1376 #merged
2015-04-17 12:40:05 -07:00
Johanna Amann
cbba73ab12 add seeking functionality to raw reader.
one can now add an option "offset" to the config map. Positive offsets
are interpreted to be from the beginning of the file, negative from the
end of the file (-1 is end of file).

Only works for raw reader in streaming or manual mode. Does not work
with executables.

Addresses BIT-985
2015-04-17 11:19:12 -07:00
Johanna Amann
b44b725d59 Wrap threshold stuff up - fix two small bugs and update baselines. 2015-04-17 09:59:34 -07:00
Jon Siwek
ee5f87c634 Add more info about Broker to NEWS. 2015-04-17 10:59:33 -05:00
Johanna Amann
024bb7206e update GridFTP analyzer to use connection thresholding instead
of polling
2015-04-17 07:15:53 -07:00
Johanna Amann
86c54c3dbd Add high level api for thresholding that holds lists of thresholds
and raises an event for each threshold exactly once.
2015-04-17 06:57:58 -07:00
Johanna Amann
f7edf70882 Allow setting packet and byte thresholds for connections.
This extends the ConnSize analyzer to be able to raise events when each
direction of a connection crosses a certain amount of bytes or packets.

Thresholds are set using
set_conn_bytes_threshold(c$id, [num-bytes], [direction]);
and
set_conn_packets_threshold(c$id, [num-packets], [direction]);
respectively.

They raise the event
event conn_bytes_threshold_crossed(c: connection, threshold: count, is_orig: bool)
and
event conn_packets_threshold_crossed(c: connection, threshold: count, is_orig: bool)
respectively.

Current thresholds can be examined using
get_conn_bytes_threshold and get_conn_packets_threshold

Currently only one threshold can be set per connection.

This also fixes a bug where child packet analyzers of the TCP analyzer
where not found using FindChild.
2015-04-17 06:57:51 -07:00
Vlad Grigorescu
81bafb6c36 PE: Rehash the log a bit. 2015-04-16 22:56:47 -04:00
Vlad Grigorescu
4753e4a3c2 Make base_of_data optional. 2015-04-16 19:44:39 -05:00
Jon Siwek
effeaa5b13 Fix attempt for "internal error: unknown msg type 115 in Poll()"
Under remote communication overload conditions, the child->parent
chunked IO may start rejecting chunks if over the hard cap.  Some
messages are made of two chunks, accepting the first part, but rejecting
the second can put the parent in a bad state and the next two chunks it
reads are likely to cause the error.

This patch just removes the rejecting functionality completely and so
now relies solely on shutting down remote peer connections to help
alleviate temporary overload conditions. The
"chunked_io_buffer_soft_cap" script variable can now tune when this
shutting down starts happening and the default setting is now double
what it used to be.  For constant overload conditions, communication.log
should keep stating "queue to parent filling up; shutting down heaviest
connection".

An alternative to completely removing the hard cap rejection code could
be ensuring that messages that involve a pair of chunks can never have
the second chunk be rejected when attempting to write it.

Addresses BIT-1376
2015-04-16 17:15:42 -05:00
Jon Siwek
a129911272 Updating submodule(s).
[nomail]
2015-04-16 10:22:32 -05:00
Robin Sommer
175fe2c9de Updating submodule(s).
[nomail]
2015-04-16 08:16:58 -07:00
Robin Sommer
fa039c1c7c Updating submodule(s).
[nomail]
2015-04-16 08:15:04 -07:00
Robin Sommer
fc3e5a5fb0 Updating submodule(s).
[nomail]
2015-04-16 08:14:16 -07:00
Robin Sommer
a7b7397f02 Merge branch 'master' of git.bro.org:bro 2015-04-16 08:14:10 -07:00
Robin Sommer
4059dd9879 Merge remote-tracking branch 'origin/topic/johanna/ca-list'
Note: loading external-ca-list.bro in the external tests increases
execution times by 1-2%; if I remove that @load, things get back to
normal so doesn't seem to indicate a problem.

* origin/topic/johanna/ca-list:
  Update mozilla CA list.

BIT-1375 #merged
2015-04-16 08:12:48 -07:00
Jon Siwek
ceebad38a4 Fix the to_count function to use strtoull versus strtoll. 2015-04-16 09:56:18 -05:00
Jon Siwek
8789d7f527 Updating submodule(s).
[nomail]
2015-04-15 15:12:15 -05:00
Robin Sommer
9260638948 Removing error check if an ASCII writer has been properly finished.
Turns out that in error situations, the final finish message might not
reach the writer anymore, as communication between the threads will be
shut down. Instead of aborting, we now just clean up in that case and
proceed. This isn't changing any other behaviour. The original error
check was in place mostly for helping debug the data flow between the
threads anyways.

Addresses BIT-1331.
2015-04-15 09:55:15 -07:00