Commit graph

370 commits

Author SHA1 Message Date
Seth Hall
6a25b2494e Merge commit '0bae127b3e' into topic/policy-scripts-new
* commit '0bae127b3e':
  Started rewrite of software.bro
2011-03-16 17:02:58 -04:00
Seth Hall
3bba5af34f Merge commit '8fff1d70fd' into topic/policy-scripts-new
* commit '8fff1d70fd':
  ftp.bro is done except for a few points
2011-03-16 17:02:53 -04:00
Seth Hall
d003f1e27b Merge commit '670ceb94d3' into topic/policy-scripts-new
* commit '670ceb94d3':
  Switched to using SSL::Log as the type for the state table; moved state table into export section; added &default=F for weak ciphers booleans; combined two handlers for event bro_init(); reduced number of dependencies; updated to use Notice:: namespace as needed; deleted obsolete code; added documentation
2011-03-16 17:02:47 -04:00
Seth Hall
cb4ca01c22 Merge commit '03044c329e' into topic/policy-scripts-new
* commit '03044c329e':
  Initial movement towards rewritten ftp.bro script.
2011-03-16 17:02:40 -04:00
Seth Hall
dcabacc8e1 Merge commit '723b46a410' into topic/policy-scripts-new
* commit '723b46a410':
2011-03-16 17:02:30 -04:00
Seth Hall
49853ea82b Merge commit 'fd3ba87cae' into topic/policy-scripts-new
* commit 'fd3ba87cae':
  Initial drop of updated ssl.bro
2011-03-16 17:02:25 -04:00
Seth Hall
f64bff298c Merge commit '2c975495d3' into topic/policy-scripts-new
* commit '2c975495d3':
  Initial drop of updated ssl.bro
2011-03-16 17:02:18 -04:00
Seth Hall
1dee9403a5 Merge commit 'd19da7a60a' into topic/policy-scripts-new
* commit 'd19da7a60a':
  More script updates.
2011-03-16 17:02:13 -04:00
Seth Hall
9474929d60 Merge commit '523b078f0e' into topic/policy-scripts-new
* commit '523b078f0e':
  Small issues fixed with new ssh analysis script.
2011-03-16 17:02:06 -04:00
Seth Hall
a361b745fb Merge commit '9ef42a64c0' into topic/policy-scripts-new
* commit '9ef42a64c0':
  Moved some files into the new policy directory.
2011-03-16 17:02:00 -04:00
Seth Hall
fcba9a5c02 Merge commit '68d4e612f1' into topic/policy-scripts-new
* commit '68d4e612f1':
  Rework of conn.bro.

Conflicts:
	policy.old/conn.bro
2011-03-16 17:01:20 -04:00
Seth Hall
70811844e5 Merge commit 'ac99ec23aa' into topic/policy-scripts-new
* commit 'ac99ec23aa':
  Modernized known-services.bro
2011-03-16 17:00:52 -04:00
Seth Hall
a876c4c7cf Merge commit '1a327cd355' into topic/policy-scripts-new
* commit '1a327cd355':
  Moved events for filling in connection service field to dpd.bro
2011-03-16 17:00:46 -04:00
Seth Hall
4c4ab80e84 Merge commit 'd2e3328b91' into topic/policy-scripts-new
* commit 'd2e3328b91':
  Moved "@load logging" to the functions files.
  Adapted for API similarity with Robin's logging framework code.

Conflicts:
	policy/logging.bro
	policy/test-logging.bro
	src/bro.bif
2011-03-16 17:00:28 -04:00
Seth Hall
b1192560c6 Merge commit '04c5c21705' into topic/policy-scripts-new
* commit '04c5c21705':
  Adapted known-hosts for the logging framework.
2011-03-16 16:58:24 -04:00
Seth Hall
b8649b4fe7 Merge commit 'e7079aefab' into topic/policy-scripts-new
* commit 'e7079aefab':
  Added site as a dependency in the functions file.
2011-03-16 16:58:18 -04:00
Seth Hall
fc66d0b140 Merge commit '60e66f3227' into topic/policy-scripts-new
* commit '60e66f3227':
  Added site.bro as another dependency to policy directory.
2011-03-16 16:58:12 -04:00
Seth Hall
a2afd8d25d Merge commit '600c5bedea' into topic/policy-scripts-new
* commit '600c5bedea':
  Moved some base script dependencies to the new policy directory.
2011-03-16 16:58:04 -04:00
Seth Hall
54b92d0981 Merge commit '517456a2df' into topic/policy-scripts-new
* commit '517456a2df':
  Added and rewrote known-hosts.bro
2011-03-16 16:56:01 -04:00
Seth Hall
dc20f95eca Merge commit '62613ec1a0' into topic/policy-scripts-new 2011-03-16 16:54:57 -04:00
Seth Hall
59acb8bb3e Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new 2011-03-16 16:49:57 -04:00
Robin Sommer
c92154994a Updating submodule(s). 2011-03-14 17:42:32 -07:00
Robin Sommer
88b41b6320 Merge remote branch 'origin/topic/jsiwek/cmake-compiler-check'
* origin/topic/jsiwek/cmake-compiler-check:
  Add explicit CMake check for compiler

Conflicts:
	aux/broccoli
	aux/broctl
2011-03-14 17:42:25 -07:00
Robin Sommer
b68d50d717 Updating submodule(s). 2011-03-11 18:41:45 -08:00
Robin Sommer
e1052b93b0 Test commit. 2011-03-11 18:39:14 -08:00
Robin Sommer
7d3ff49607 New submodule location. 2011-03-11 18:33:44 -08:00
Robin Sommer
0f854315e9 New test. 2011-03-10 18:18:58 -08:00
Robin Sommer
45ebfbb2b8 Bug fixes.
- Fixing a crash with an invalid pointer.

- Fixing a namespacing problem with is_ftp_data_conn() and check_relay_3().

- Fixing the do-we-have-an-event-handler-defined check.

Standard test-suite passes.

Seth, I think you can give it a try now ...
2011-03-10 18:18:01 -08:00
Seth Hall
0bae127b3e Started rewrite of software.bro
* Not working at the moment.
2011-03-10 13:11:34 -05:00
Seth Hall
8fff1d70fd ftp.bro is done except for a few points
* Documentation needs fleshed out.
* TODOs are noted throughout the source.
2011-03-10 09:04:48 -05:00
Robin Sommer
871561939b Updating baselines. 2011-03-09 19:42:24 -08:00
Robin Sommer
170a8bd403 Setting random number generator seed in btest.cfg. 2011-03-09 19:42:24 -08:00
Robin Sommer
d54c705898 Adding new environment variable BRO_SEED_FILE to set the seed file for
the random number generator.

This works like the corresponding command line option but is more
convinient when writing tests as it can be set in btest.cfg.
2011-03-09 19:42:24 -08:00
Robin Sommer
de227b8d88 When creating a new stream, we check now that all log field have
supported types.

Also not reporting a run-time error anymore when logging to a stream
that hasn't been created; just fail silently as this may happen due to
other earlier errors.
2011-03-09 19:42:24 -08:00
Robin Sommer
5beee9e45e Updating TODO.
Just one to go. :)
2011-03-09 18:08:17 -08:00
Robin Sommer
89e8ea7353 Enums are now logged with their ID names, not anymore with their
numerical values.
2011-03-09 18:06:50 -08:00
Robin Sommer
c6e3174bc8 The logging systems now supports fields of type set[<atomic_type>]. 2011-03-09 18:01:41 -08:00
Robin Sommer
52c54859b6 Bugfix: the header line was ending with a separator.
Test baselines needed adaption as well.
2011-03-09 16:55:29 -08:00
Robin Sommer
b69ecff3ee More options for the ASCII writer.
# The prefix for the header line if included.
	const header_prefix = "# " &redef;

	# The string to use for empty string fields.
	const empty_field = "" &redef;

	# The string to use for an unset optional field.
	const unset_field = "-" &redef;
2011-03-09 16:52:46 -08:00
Robin Sommer
cb9e0a5d5a If a field value contains the separator, that is now escape with hex
characters.
2011-03-09 16:26:11 -08:00
Don Appleman
670ceb94d3 Switched to using SSL::Log as the type for the state table; moved state table into export section; added &default=F for weak ciphers booleans; combined two handlers for event bro_init(); reduced number of dependencies; updated to use Notice:: namespace as needed; deleted obsolete code; added documentation 2011-03-09 15:23:33 -06:00
Jon Siwek
9282e0adff Add explicit CMake check for compiler 2011-03-09 11:48:00 -06:00
Robin Sommer
c6d20dbfdf Adding a few options to the ASCII writer.
module LogAscii;

export {
	# Output everything to stdout rather than into files. This is primarily
	# for testing purposes.
	const output_to_stdout = F &redef;

	# The separator between fields.
	const separator = "\t" &redef;

	# True to include a header line with column names.
	const include_header = T &redef;
}
2011-03-08 21:44:46 -08:00
Robin Sommer
26eab74ecc The ASCII writer can now deal with /dev/* paths.
It will not longer try to add a ".log" extension.
2011-03-08 17:59:05 -08:00
Robin Sommer
4b7c5905f1 New functions Log::disable_stream() and Log::enable_stream().
When disabled, all outout to a stream will be ignored (but no error
raised).
2011-03-08 17:54:11 -08:00
Robin Sommer
88d114053c Removing unnessary namespace qualifiers in logging.bro. 2011-03-08 17:32:21 -08:00
Robin Sommer
5d8b9f2e74 New function Log::get_filter() that allows to retrieve previously
installed filter by name.

This filter can then be modified and reinstalled via add_filter(),
which will replace the old one with the same name.
2011-03-08 17:31:46 -08:00
Robin Sommer
b8ee425e0d Adding test for per-file rotation. 2011-03-08 16:33:06 -08:00
Robin Sommer
df54cc6e78 New table Log::rotation_control that enables to control rotation
for individual files, overriding defaults.

The interface isn't the greatest but the best I can come up with right
now.
2011-03-08 16:30:53 -08:00
Robin Sommer
eb736a34b3 '[]' is now a valid record ctor. 2011-03-08 16:28:59 -08:00