Commit graph

2499 commits

Author SHA1 Message Date
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
881071cc99 Extending conn_id with a globally unique identifiers. 2011-03-15 20:42:56 -07:00
Jon Siwek
9e13d15f29 Tabifying BroDoc* sources to make consistent with general style. 2011-03-15 16:48:51 -05:00
Jon Siwek
dbf2b9996e Revising BroDoc*.h internal/api documentation. 2011-03-15 15:38:43 -05:00
Jon Siwek
f67c0892e5 Revise enum documentation autogeneration.
This adds a new subclass of EnumType, CommentedEnumType, and removes
any previous changes to EnumType that were done to support the
autodoc framework.

Dummy CommentedEnumType and ID's are constructed in parallel with the
real EnumType ID's during parsing and passed on to the autodoc framework.

This allows the generated documentation to track enum redefs, with
a special case being the "Notice" enum type.
2011-03-15 14:51:50 -05:00
Robin Sommer
8eb241fde7 Removing the EXPIRE_DFA_STATES code. 2011-03-14 18:55:40 -07:00
Robin Sommer
57fe369c4e Removing active mapping. 2011-03-14 18:31:17 -07: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
Seth Hall
878d263f11 More tests for default software parsing function. 2011-03-14 17:01:45 -04:00
Seth Hall
e8bff4779e Initial and incomplete http.bro
* So far, really only creates state and outputs logs.
2011-03-14 17:01:18 -04:00
Jon Siwek
b1dc5d3a1c Update to auto-generated documentation format.
Comments are now clearly marked.

Enums are now documented in order of their integral value, not
their identifier string.
2011-03-14 14:49:58 -05:00
Seth Hall
febfd4cf04 Better software version parsing.
* $addl field now parsed out in many cases.
* A few new tests for web browser versions.
  * Browers user-agents need preprocessed though.
* All tests pass.
2011-03-14 15:41:45 -04:00
Jon Siwek
f47c8e4d93 Changes to parser to allow enum type documentation comments.
"##" style comments before identifiers and "##<" style after identifiers
in the body of an enum type declaration will now show up in the
auto-generated reST documentation.
2011-03-14 14:13:52 -05:00
Jon Siwek
c4ca6f098c Changes to scanner and parser to allow record field comments.
The scanner can now be told to start/stop producing new token types that
assist in documenting record field types (and eventually enums also).

TOK_DOC:
    Produced on "##" style comments; documents the field that follows.

TOK_POST_DOC:
    Produced on "##<" style comments; documents the previous field.
2011-03-14 13:10:49 -05:00
Jon Siwek
4b0eb8127d Changes to add comments per enum or record type field. 2011-03-14 11:50:46 -05:00
Seth Hall
c212f28130 Fixed ftp.bro so that it's extensible by users. 2011-03-14 12:01:12 -04: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
Don Appleman
277136ecfc Merge branch 'topic/policy-scripts' of git://git.icir.org/bro into topic/policy-scripts 2011-03-11 17:05:06 -06:00
Don Appleman
e7c7929d35 Remove unused code; conform to naming conventions; relocate more state to export section 2011-03-11 17:04:30 -06:00
Seth Hall
e8526a0c05 Tiny cleanup to notice.bro 2011-03-11 15:07:24 -05:00
Seth Hall
50acf152bd More software fixes (and successful tests!).
* SSH now removes the protocol information for detecting the actual software and not protocol used.
* Updates for the default version parsing.
* No longer testing default version parsing for the $addl field.  It doesn't seem to be generically extractable.
2011-03-11 15:07:07 -05:00
Seth Hall
65c3cb6faf Updates for detecting and logging software.
* Tests for the default software version parsing (showing how broken it is!)
* Software::cmp_versions(v1: Version, v2: Version) is now exported
* Many small naming tweaks to adjust to namespaces.
2011-03-11 13:51:31 -05: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
Jon Siwek
15fd5297a3 Fixes for declared type ID tracking & adding DescribeReST()'s
Changed BroType to track a char* instead of an ID* that represents
the declared type's identifier.  It was also necessary to serialize
this information or else it can be lost (e.g. FieldDecl's in RecordType
always seem to get serialized at some point).

DescribeReST() functions added to many classes to get the output
closer to being reST compatible; still needs tweaking for Sphinx
(reST->HTML) compatibility.
2011-03-10 16:22:45 -06:00
Seth Hall
da90961197 Another software documentation nit. 2011-03-10 16:53:18 -05:00
Seth Hall
ad054d0dcf New software.bro API function for constructing an Info record from a raw version string. 2011-03-10 16:51:22 -05:00
Seth Hall
b7e59a717b Documentation nit fixed. 2011-03-10 16:42:24 -05:00
Seth Hall
e105a7f948 software.bro now more complete and documented.
* Currently doesn't cause any errors in Bro.
* Hasn't been tested yet.
* No scripts call the API yet to register software.
2011-03-10 16:41:11 -05:00
Seth Hall
d3432829c9 Fixed some problems with the FTP analysis.
* DPD configuration was lost and is now back.
* The logged timestamp is now the time of the request.
* Added a notice named: FTP_Site_Exec_Success
2011-03-10 13:14:31 -05:00
Seth Hall
4c8650f552 The global NOTICE function is back.
There is a small shim function placed into the
global namespace now that forwards the call to
the appropriate function in the Notice namespace.
2011-03-10 13:12:38 -05:00
Seth Hall
05b689f10f DPD is now enabled by default. 2011-03-10 13:11:54 -05: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
Jon Siwek
287a3a3cb8 Changes to parser to pass along identifiers to doc framework. 2011-03-09 15:47:58 -06:00