Commit graph

5140 commits

Author SHA1 Message Date
Bernhard Amann
902d52e261 add is_orig to heartbeat event 2014-04-08 08:43:38 -07:00
Bernhard Amann
ffd4711a41 Throw new event for heartbeat messages.
Not tested.
2014-04-08 07:42:12 -07:00
Robin Sommer
6b47350579 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  change the sumstats table that tracks recent intermediate requests back to create interval.
2014-04-03 15:56:33 -07:00
Robin Sommer
36358461ff Updating submodule(s).
[nomail]
2014-04-03 15:53:51 -07:00
Robin Sommer
2dcc631da6 Merge remote-tracking branch 'origin/topic/jsiwek/bif-loader-scripts'
BIT-1175 #merged

* origin/topic/jsiwek/bif-loader-scripts:
  Improve __load__.bro creation for .bif.bro stubs.
2014-04-03 15:53:46 -07:00
Bernhard Amann
9438bc166b change the sumstats table that tracks recent intermediate requests
back to create interval.

In this instance a read expiry actually makes much less sense.
2014-04-03 13:52:26 -07:00
Seth Hall
2f57c26d5b Merge remote-tracking branch 'origin/topic/seth/signatures-uid'
* origin/topic/seth/signatures-uid:
  Add a uid field to the signatures.log (contributed by Anthony Verez)
2014-04-03 10:52:54 -04:00
Seth Hall
df1647ee00 Add a uid field to the signatures.log (contributed by Anthony Verez)
- Addresses BIT-1172
2014-04-03 10:49:41 -04:00
Robin Sommer
2d170edb1e Merge remote-tracking branch 'origin/topic/bernhard/ticket-1163'
* origin/topic/bernhard/ticket-1163:
  Change #types description of sets to set

BIT-1163 #merged
2014-04-01 16:50:58 -07:00
Robin Sommer
141865d2ea Merge remote-tracking branch 'origin/topic/jsiwek/coverity'
* origin/topic/jsiwek/coverity:
  Fix a couple nits reported by Coverity.
  Fix potential mem leak in IP frag reassembly.

BIT-1174 #merged
2014-04-01 16:43:12 -07:00
Bernhard Amann
01d075bf2d Change #types description of sets to set
Addresses BIT-1163
2014-04-01 16:25:47 -07:00
Jon Siwek
e2c71abe9b Improve __load__.bro creation for .bif.bro stubs.
The new loader scripts should not try to @load .bif.bro scripts that
were part of a build of an earlier Bro version, but have since had their
.bif file removed.
2014-04-01 14:23:09 -05:00
Jon Siwek
0c82b6aa14 Fix a couple nits reported by Coverity.
An unnecessary null pointer check and uninitialized scalar fields.
Don't expect these to be actual problems, but easy enough to fix in
order to silence Coverity.
2014-04-01 11:00:10 -05:00
Jon Siwek
a30caf6960 Fix potential mem leak in IP frag reassembly.
Reported by Coverity, but it's not a typical code path.
2014-04-01 10:29:41 -05:00
Robin Sommer
9ec657eeb1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix mem leak and unchecked dynamic cast reported by Coverity.
  fix potential memleak in x509 parser reported by coverity
2014-03-31 18:56:37 -07:00
Robin Sommer
4f031449b4 Updating submodule(s).
[nomail]
2014-03-31 18:09:42 -07:00
Jon Siwek
acc721c36c Fix mem leak and unchecked dynamic cast reported by Coverity. 2014-03-31 16:32:58 -05:00
Bernhard Amann
b2f8196dc2 fix potential memleak in x509 parser reported by coverity 2014-03-31 14:06:34 -07:00
Robin Sommer
a9bbff932b Updating submodule(s).
[nomail]
2014-03-31 12:01:16 -07:00
Robin Sommer
559fa595c7 Updating submodule(s).
[nomail]
2014-03-31 11:57:53 -07:00
Robin Sommer
8fe5103176 Adding test baseline for scripts.policy.misc.dump-events. 2014-03-30 23:06:20 +02:00
Robin Sommer
f0eb144303 Updating submodule(s).
[nomail]
2014-03-30 22:51:26 +02:00
Robin Sommer
9efb549236 Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures'
* origin/topic/jsiwek/file-signatures:
  File type detection changes and fix https.log {orig,resp}_fuids fields.
  Various minor changes related to file mime type detection.
  Refactor common MIME magic matching code.
  Replace libmagic w/ Bro signatures for file MIME type identification.

Conflicts:
	scripts/base/init-default.bro
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log

BIT-1143 #merged
2014-03-30 22:51:05 +02:00
Robin Sommer
4fb0288aa2 Updating submodule(s).
[nomail]
2014-03-30 22:21:58 +02:00
Robin Sommer
1289790f13 Merge remote-tracking branch 'origin/topic/bernhard/file-analysis-x509'
* origin/topic/bernhard/file-analysis-x509:
  x509 version always has to be incremented. Baselines already committed.
  Fix x509 certificate Version (the +1 was missing...).
  Add policy script to suppress non host-certificate logging in x509.log
  Forgot the preamble for the new leak test
  (hopefully) last change -> return real opaque vec instead of any_vec
  Fix dump-events - it cannot be used with ssl anymore, because openssl does not give the same string results in all versions.
  Finishing touches of the x509 file analyzer.
  Revert change to only log certificates once per hour.
  Change x509 log - now certificates are only logged once per hour.
  Fix circular reference problem and a few other small things.
  X509 file analyzer nearly done. Verification and most other policy scripts work fine now.
  Add verify functionality, including the ability to get the validated chain. This means that it is now possible to get information about the root-certificates that were used to secure a connection.
  Second try on the event interface.
  Backport crash fix that made it into master with the x509_extension backport from here.
  Make x509 certificates an opaque type
  rip out x509 code from ssl analyzer. Note that since at the moment the file analyzer does not yet re-populate the info record that means quite a lot of information is simply not available.
  parse out extension. One event for general extensions (just returns the openssl-parsed string-value), one event for basicconstraints (is a certificate a CA or not) and one event for subject-alternative-names (only DNS parts).
  Very basic file-analyzer for x509 certificates. Mostly ripped from the ssl-analyzer and the topic/bernhard/x509 branch.

BIT-1150 #merged
2014-03-30 22:16:36 +02:00
Robin Sommer
27b661cc24 Merge remote-tracking branch 'origin/topic/jsiwek/improve-type-checks'
* origin/topic/jsiwek/improve-type-checks:
  Add unit tests covering vector/set/table ctors/inits.
  Fix parsing of "local" named table constructors.
  Improve type checking of records, addresses BIT-1159.

BIT-1159 #merged
2014-03-30 20:28:07 +02:00
Robin Sommer
1292f1957d Updating submodule(s).
[nomail]
2014-03-30 20:22:23 +02:00
Robin Sommer
1b2bf6e1b3 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1160'
* origin/topic/dnthayer/ticket1160:
  More improvements to install/setup documentation
  Improve documentation of Bro clusters

BIT-1160 #merged
2014-03-30 20:21:21 +02:00
Robin Sommer
806851a21e Don't include locations into serialization when cloning values.
This should save some memory, see BIT-1161.
2014-03-30 20:20:06 +02:00
Robin Sommer
2f6146aa55 Merge remote-tracking branch 'origin/topic/jsiwek/faster-val-clone'
* origin/topic/jsiwek/faster-val-clone:
  Refactor SerializationFormat::EndWrite and ChunkedIO::Chunk mem mgmt.
  Improve SerializationFormat's write buffer growth strategy.

BIT-1161 #merged
2014-03-30 20:13:26 +02:00
Robin Sommer
a0d389bf4b Merge remote-tracking branch 'origin/topic/jsiwek/parse-only'
* origin/topic/jsiwek/parse-only:
  Add --parse-only option to exit after parsing scripts.

BIT-1169 #merged
2014-03-30 20:01:12 +02:00
Robin Sommer
c35b5f80c2 Merge remote-tracking branch 'origin/topic/bernhard/sumstats-read-expire'
* origin/topic/bernhard/sumstats-read-expire:
  Change all &create_expire attributes to &read_expire in the cluster part of the sumstats framework.

BIT-1170 #merged
2014-03-30 19:58:33 +02:00
Robin Sommer
6cac21a9bf Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Update instructions on how to build Bro docs
2014-03-30 19:55:39 +02:00
Robin Sommer
53dd2bb62d Updating CHANGES and VERSION. 2014-03-30 19:54:45 +02:00
Bernhard Amann
254dd85bff Change all &create_expire attributes to &read_expire in the cluster
part of the sumstats framework.

This seems to fix a few rare problems.
2014-03-28 10:57:45 -07:00
Seth Hall
9d6c8769ea Quick fix to the ElasticSearch writer. 2014-03-28 08:37:37 -04:00
Jon Siwek
06b6dc8447 Add --parse-only option to exit after parsing scripts.
May be useful for syntax-checking tools.
2014-03-27 16:07:52 -05:00
Daniel Thayer
11d3685f88 Update instructions on how to build Bro docs
Also added a note in the main docs about building the Bro docs.
2014-03-25 13:55:20 -05:00
Jon Siwek
8dad5026fd File type detection changes and fix https.log {orig,resp}_fuids fields.
- Removed "binary" and "octet-stream" mime type detections. They don't
  provide any more information than an uninitialized mime_type field
  which implicitly means no magic signature matches and so the media
  type is unknown to Bro.

- Slight change to "text/plain" signature.  It's still not the most
  accurate, which is reflected in its -20 strength value.

- The logic for adding file ids to {orig,resp}_fuids fields of
  the http.log incorrectly depended on the state of
  {orig,resp}_mime_types fields, so sometimes not all file ids
  associated w/ the session were logged.
2014-03-25 12:44:11 -05:00
Jon Siwek
bebedcd873 Merge branch 'master' into topic/jsiwek/file-signatures
Conflicts:
	scripts/policy/frameworks/files/detect-MHR.bro
2014-03-24 14:35:37 -05:00
Jon Siwek
9a8226935d Add unit tests covering vector/set/table ctors/inits. 2014-03-21 09:22:03 -05:00
Jon Siwek
bf3c3887fd Fix parsing of "local" named table constructors. 2014-03-20 16:47:20 -05:00
Jon Siwek
b1fd161274 Improve type checking of records, addresses BIT-1159. 2014-03-20 13:54:26 -05:00
Bernhard Amann
ae165fb262 x509 version always has to be incremented. Baselines already committed. 2014-03-19 21:50:02 -07:00
Bernhard Amann
a185631e1e Fix x509 certificate Version (the +1 was missing...).
This was wrong all along in the ssl protocol parser and no one ever
noticed :)

(And I missed it in the new logfiles until now *cough*)
2014-03-19 21:46:19 -07:00
Bernhard Amann
b32c7c7a88 Add policy script to suppress non host-certificate logging in x509.log
Addresses BIT-1150
2014-03-19 21:32:01 -07:00
Daniel Thayer
80fe5874a5 More improvements to install/setup documentation
Addresses BIT-1160
2014-03-19 16:56:29 -05:00
Seth Hall
0f3ed1a553 Merge remote-tracking branch 'origin/topic/jsiwek/faster-mhr'
* origin/topic/jsiwek/faster-mhr:
  Improve performance of MHR script, addresses BIT-1139.
2014-03-19 17:22:23 -04:00
Seth Hall
63751665ce Merge remote-tracking branch 'origin/topic/seth/sumstats-standalone-fix'
* origin/topic/seth/sumstats-standalone-fix:
  Now the standalone sumstats works even if Bro is shutting down by blocking.
  Change the standalone sumstats mode to work incrementally.
2014-03-19 14:51:05 -04:00
Daniel Thayer
2e8d0945a4 Improve documentation of Bro clusters
Renamed the bro cluster doc to better indicate its purpose (it provides
a high-level overview rather than detailed configuration instructions).
Moved the location of the bro cluster doc in the index so that it makes
more sense (it is an introductory section, not a section about using bro).

Added links in the quick start guide and the bro cluster doc so that
readers can more easily locate more detailed information on configuring
a bro cluster.

Addresses BIT-1160
2014-03-18 16:29:27 -05:00