Commit graph

10798 commits

Author SHA1 Message Date
Jon Siwek
384fa03c26 Revising notice, port analysis, packet filter, auto-generated documentation.
They're now all optional sections -- if a given bro script doesn't use the
functionality, then the documentation doesn't mention anything about it.
2011-03-21 15:08:39 -05:00
Jon Siwek
e0a77cb794 Auto-doc framework now handles multiple script authors more conveniently. 2011-03-21 14:03:11 -05:00
Seth Hall
b485bd05ad Revert "Merge commit '7526058071' into topic/policy-scripts-new"
This reverts commit 99c1c25e26, reversing
changes made to 04ea1a2f50.
2011-03-21 14:50:22 -04:00
Jon Siwek
5fbcde7344 Teach Desc class how to (optionally) use spaces for indentation.
And (to be consistent with current conventions for reST documentation)
update places in the auto-documentation-generation framework
where tabs were used in the generated reST.
2011-03-21 13:49:53 -05:00
Jon Siwek
e491caeeb7 Add note to auto-generated reST about not editing it directly 2011-03-21 12:49:54 -05:00
Seth Hall
99c1c25e26 Merge commit '7526058071' into topic/policy-scripts-new
Conflicts:
	src/Expr.cc
2011-03-21 11:01:45 -04:00
Seth Hall
04ea1a2f50 More conn.bro changes to improve the logging 2011-03-18 00:57:24 -04:00
Seth Hall
42df07a889 More updates to conn.bro to adjust to new logging framework. 2011-03-18 00:51:48 -04:00
Seth Hall
b47058ef78 Revert "Merge remote branch 'origin/topic/robin/record-coercion' into topic/policy-scripts-new"
This reverts commit b9a63c835f.
2011-03-18 00:27:11 -04:00
Seth Hall
b9a63c835f Merge remote branch 'origin/topic/robin/record-coercion' into topic/policy-scripts-new
Conflicts:
	src/Expr.cc
2011-03-18 00:07:29 -04:00
Robin Sommer
7526058071 Fixing a bug with nested record ctors.
If a record field was initialized with another record ctor, there was
no record type coercion in place in case of a type mismatch.
2011-03-17 17:19:46 -07:00
Seth Hall
3961c6b2c3 Known service logging is now extensible. 2011-03-17 14:58:21 -04:00
Seth Hall
fdd8ce4e57 Another software test and fixes to version parsing. 2011-03-17 14:55:58 -04:00
Seth Hall
8faca52add Software parsing test updates. 2011-03-17 14:29:25 -04:00
Seth Hall
f5668e41a2 Updates to make scripts work with logging-internals code. 2011-03-17 14:29:07 -04:00
Robin Sommer
d84d4b8a57 Moving uid from conn_id to connection, and making output determistic
if a hash seed is given.
2011-03-16 14:25:49 -07:00
Seth Hall
f4b27016cf Merge commit '878d263f11' into topic/policy-scripts-new
* commit '878d263f11':
  More tests for default software parsing function.
2011-03-16 17:04:26 -04:00
Seth Hall
e259da6f8b Merge commit 'e8bff4779e' into topic/policy-scripts-new
* commit 'e8bff4779e':
  Initial and incomplete http.bro
2011-03-16 17:04:21 -04:00
Seth Hall
86a127de44 Merge commit 'febfd4cf04' into topic/policy-scripts-new
* commit 'febfd4cf04':
  Better software version parsing.
2011-03-16 17:04:16 -04:00
Seth Hall
656084bd02 Merge commit 'c212f28130' into topic/policy-scripts-new
* commit 'c212f28130':
  Fixed ftp.bro so that it's extensible by users.
2011-03-16 17:04:12 -04:00
Seth Hall
9931fa529f Merge commit 'e7c7929d35' into topic/policy-scripts-new
* commit 'e7c7929d35':
  Remove unused code; conform to naming conventions; relocate more state to export section
2011-03-16 17:03:56 -04:00
Seth Hall
876463033e Merge commit 'e8526a0c05' into topic/policy-scripts-new
* commit 'e8526a0c05':
  Tiny cleanup to notice.bro
2011-03-16 17:03:51 -04:00
Seth Hall
9384fbd968 Merge commit '50acf152bd' into topic/policy-scripts-new
* commit '50acf152bd':
  More software fixes (and successful tests!).
2011-03-16 17:03:45 -04:00
Seth Hall
25318de82d Merge commit '65c3cb6faf' into topic/policy-scripts-new
* commit '65c3cb6faf':
  Updates for detecting and logging software.
2011-03-16 17:03:40 -04:00
Seth Hall
553f70e4f8 Merge commit 'da90961197' into topic/policy-scripts-new
* commit 'da90961197':
  Another software documentation nit.
2011-03-16 17:03:35 -04:00
Seth Hall
da244f83b2 Merge commit 'ad054d0dcf' into topic/policy-scripts-new
* commit 'ad054d0dcf':
  New software.bro API function for constructing an Info record from a raw version string.
2011-03-16 17:03:29 -04:00
Seth Hall
c4cf5fe905 Merge commit 'b7e59a717b' into topic/policy-scripts-new
* commit 'b7e59a717b':
  Documentation nit fixed.
2011-03-16 17:03:24 -04:00
Seth Hall
8044b730d6 Merge commit 'e105a7f948' into topic/policy-scripts-new
* commit 'e105a7f948':
  software.bro now more complete and documented.
2011-03-16 17:03:19 -04:00
Seth Hall
b6f6606398 Merge commit 'd3432829c9' into topic/policy-scripts-new
* commit 'd3432829c9':
  Fixed some problems with the FTP analysis.
2011-03-16 17:03:15 -04:00
Seth Hall
7e67d7b5ce Merge commit '4c8650f552' into topic/policy-scripts-new
* commit '4c8650f552':
  The global NOTICE function is back.
2011-03-16 17:03:10 -04:00
Seth Hall
a01095423a Merge commit '05b689f10f' into topic/policy-scripts-new
* commit '05b689f10f':
  DPD is now enabled by default.
2011-03-16 17:03:04 -04:00
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