Commit graph

542 commits

Author SHA1 Message Date
Robin Sommer
c2524b995b Checkpoint. 2011-06-25 21:06:19 -07:00
Robin Sommer
ff331763ef Starting a small framework for doing regression testing with larger
traces and more complex Bro configurations.

That's "Type 2" in the terminology of
http://www-new.bro-ids.org/devel/projects/testing.html

This leverages btest as well and will replace the set of scripts that
the old private test-suite is using. It can accomodate tests with both
public and private traces.

This is a checkpoint commmit, not much there yet in terms of actual
testing. Also still need to figure out a mechanmism to allow for
different baselines based on which branch we're testing.
2011-06-07 22:05:14 -07:00
Robin Sommer
46ea649e00 Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-06-07 17:58:24 -07:00
Robin Sommer
8266709e20 A new bif unique_id(prefix) that returns a string that's unique across
Bro instaces with high probablity.

"prefix" is a string that will be prepended to the returned ID.
2011-06-07 17:57:22 -07:00
Robin Sommer
e8e2d109a5 A new bif unique_id(prefix) that returns a string that's unique across
Bro instaces with high probablity.

"prefix" is a string that will be prepended to the returned ID.
2011-06-07 17:53:05 -07:00
Robin Sommer
fb9f2ed38d Merge remote branch 'origin/topic/gregor/rpc'
Note, I haven't gone through the script-level code as that will change
soon anyway.

Conflicts:
	src/Analyzer.cc
	src/AnalyzerTags.h
	src/SSLProxy.h
	src/bro.bif
2011-06-07 17:53:00 -07:00
Robin Sommer
4bdb94955d Merge remote branch 'origin/topic/seth/ssl-binpac'
* origin/topic/seth/ssl-binpac:
  Fixed bug due to vectors now initially indexed on 0.
  Finished core support for new SSL analyzer.
  SSL analyzer changes with accompanying BiF.
  A table_s_of_s type to get around bifcl type limitation.
  Regenerated the Mozilla CA bundle without the untrusted server authentication certs.
  Complete rewrite to SSL analyzer.

Conflicts:
	src/AnalyzerTags.h
	src/CMakeLists.txt

Notes:

    - Haven't looked at the script-level, postponed to
      policy-scripts-new.

    - I renamed X509Extension to X509_extension for consistency.
2011-06-07 10:12:25 -07:00
Robin Sommer
6e6af4c541 Merge remote branch 'origin/topic/seth/syslog-analyzer'
Note: I didn't merge anything in policy/*. Seems there was some
unrelated stuff in there, and the ticket says that the policy script
was a dummy for now anyway.

* origin/topic/seth/syslog-analyzer:
  Updates for syslog analyzer to prepare it for merging.
  Added the initial syslog analyzer and policy script.
  Adding some of the initial scripts that are going to be merged from my script repository.
2011-06-05 18:37:48 -07:00
Seth Hall
6322130c37 Updates for syslog analyzer to prepare it for merging.
- Integrated with CMake.
- Analyzer only support syslog over UDP right now.
- Fixed small bug in the analyzer to make it generate events correctly.
2011-06-03 10:28:10 -04:00
Seth Hall
b621b8eccc Merge remote branch 'origin/master' into topic/seth/syslog-analyzer
Conflicts:
	src/Analyzer.cc
	src/Makefile.am
2011-06-03 09:38:23 -04:00
Robin Sommer
a236dd0d3d Fixing typo in test. 2011-06-02 22:07:36 -07:00
Robin Sommer
fac328685b @load now supports loading a directory.
With a directory "foo" somewhere in BROPATH, "@load foo" now checks if
there's a file "foo/__load__.bro". If so, it reads that file in. (If
not, Bro reports the same error as before, complaining that it can't
read a directory).
2011-06-02 21:57:24 -07:00
Robin Sommer
5c0704eec8 ASCII logger now escapes non-printable characters.
Closes #450.
2011-06-01 22:33:44 -07:00
Robin Sommer
09083b8992 Updating submodule(s). 2011-06-01 11:35:37 -07:00
Robin Sommer
a3b527be4b Updating submodule(s). 2011-06-01 11:30:59 -07:00
Robin Sommer
909c5daf6c Revert "Setting the snaplen to 0 to capture the full packet regardless of size."
This reverts commit fe274c3e64.
2011-06-01 11:27:53 -07:00
Seth Hall
fe274c3e64 Setting the snaplen to 0 to capture the full packet regardless of size.
In my limited testing this seemed to work fine but we should
make an actual test for this eventually.
2011-05-25 13:37:21 -04:00
Seth Hall
19c9aaebb9 Fixed bug due to vectors now initially indexed on 0. 2011-05-24 10:08:17 -04:00
Seth Hall
15bfa23ce1 Merge remote branch 'origin/master' into topic/seth/ssl-binpac
Conflicts:
	src/bro.bif
2011-05-23 17:09:41 -04:00
Seth Hall
6918c225db Finished core support for new SSL analyzer.
- Certificate and certificate chain validation is now done
  fully in policy script land.  The script to do this will
  be written in the new policy scripts branch once this is
  merged.

- Removed hand written SSL analyzer.

- Rewrote and reworked much of the BinPAC SSL analyzer.
2011-05-23 17:04:27 -04:00
Seth Hall
a57e50da35 SSL analyzer changes with accompanying BiF.
- Full DER certificates are extracted as strings to be used with
  corresponding BiFs.
- x509_verify function to verify single certs and/or full certificate chains.
2011-05-23 14:54:52 -04:00
Seth Hall
297a2cb9c5 A table_s_of_s type to get around bifcl type limitation. 2011-05-23 14:52:18 -04:00
Jon Siwek
bf84801249 Packaging tweaks and rewrite of 'dist' target.
- Move binary packaging scripts out of source root into pkg/ subdir
- A consistent CMake version (2.8.4) is now enforced for binary packaging
- Added a 'bindist' target to top Makefile as a convenience
- The 'dist' target has been rewritten to depend on standard system
  command/utils rather than CMake and the full dependency chain of Bro,
  addressing #398 (but the CMake 'package_source' target is still available
  in the generated build/Makefile and can be used if desired)
2011-05-20 17:08:59 -05:00
Robin Sommer
e0c05868e3 Updating submodule(s). 2011-05-18 09:08:59 -07:00
Robin Sommer
0913ef3abe Merge remote branch 'origin/topic/jsiwek/deb-packaging'
* origin/topic/jsiwek/deb-packaging:
  Changes to allow DEB packaging via CPack, addresses #458
2011-05-18 09:08:18 -07:00
Robin Sommer
b829c269ff Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix reST markup generated for record redefs.
  Fixes for more doc mode corner cases caused by type cloning.

Jon, I added the line below, please double-check.

diff --git a/src/Var.cc b/src/Var.cc
index 7880325..00ac734 100644
--- a/src/Var.cc
+++ b/src/Var.cc
@@ -260,6 +260,7 @@ void add_type(ID* id, BroType* t, attr_list* attr, int /* is_event */)
 			tnew = new FuncType(t->AsFuncType()->Args(),
 			                    t->AsFuncType()->YieldType(),
 			                    t->AsFuncType()->IsEvent());
+			break;
 		default:
 			SerializationFormat* form = new BinarySerializationFormat();
 			form->StartWrite();
2011-05-18 09:06:41 -07:00
Jon Siwek
73a18714b3 Fix reST markup generated for record redefs.
They should have been using reST roles to xref the original record type
instead of a reST directive to declare a new type.
2011-05-17 15:27:45 -05:00
Jon Siwek
d69c3edf21 Fixes for more doc mode corner cases caused by type cloning.
"shallow" copying has to be done for any type that can contain
record types in order to accommodate record redefs that add fields.
2011-05-17 15:03:40 -05:00
Jon Siwek
f18951a77e Changes to allow DEB packaging via CPack, addresses #458 2011-05-16 13:51:32 -05:00
Robin Sommer
1199085b27 An extension to the ICMP analyzer to handle redirects.
The analyzer now raises icmp_redirect() events that come with the
redirection address.

By Julien Sentier.
2011-05-13 18:47:50 -07:00
Robin Sommer
437ac29ca9 Updating submodule(s). 2011-05-13 17:40:12 -07:00
Gregor Maier
cbf3390762 Merge branch 'fastpath' of ssh://git.bro-ids.org/bro into fastpath 2011-05-13 08:07:23 -07:00
Jon Siwek
70e14cb7d5 Fix CommentedTypeDecl to track whether it's in a record like TypeDecl does. 2011-05-12 19:55:26 -05:00
Robin Sommer
da5618b9ba Portability fixes for tests on MacOS. 2011-05-10 21:27:44 -07:00
Robin Sommer
a8f15616f2 Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-05-10 20:58:02 -07:00
Robin Sommer
33f1e00264 Updating submodule(s). 2011-05-10 20:57:45 -07:00
Robin Sommer
4ed9969f83 Fixing bug with uninitialized counter. 2011-05-10 20:54:24 -07:00
Robin Sommer
4bf6d6092b Sorting was still not consistent. 2011-05-10 19:48:40 -07:00
Robin Sommer
b16bb7fff4 Test updates.
Includes splitting up one test which's output now depends on wether
we've compiled with IPv6 support or not.
2011-05-10 19:33:37 -07:00
Robin Sommer
1b76b76bb0 Removing old istate test-suite. 2011-05-10 18:58:19 -07:00
Robin Sommer
42a1efa77f Updating submodule(s). 2011-05-10 18:30:05 -07:00
Robin Sommer
69391afc42 A hack to report missing GeoIP support only once.
This closes #357, but #455 captures the need for a more general
solution.
2011-05-10 18:29:05 -07:00
Robin Sommer
63f7359e1e Bugfix: vectors in records were not initalized.
Closes #421.
2011-05-10 18:19:27 -07:00
Robin Sommer
0815ea9188 If IPv6 default is not compiled in, the default BPF filters now
excludes IPv6 packets.
2011-05-10 18:10:32 -07:00
Robin Sommer
ee872c12c8 New bif bro_has_ipv6() to check whether IPv6 support is compiled in. 2011-05-10 18:02:10 -07:00
Robin Sommer
e6208c8950 Bringing connection state history back, which was accidentally deleted
from conn.bro.

However, this is primarily for the record, conn.bro will be replaced
with a new version soon.
2011-05-10 17:56:53 -07:00
Robin Sommer
61c929bc16 Updating btests and a Makefile.
"make" now runs all the tests.
2011-05-10 17:56:45 -07:00
Robin Sommer
03cd7a47ac Moving the test-scripts from the old test-suite over to btest. 2011-05-10 17:28:09 -07:00
Robin Sommer
d1db768624 Fix for major bug in POP3 analyzer, which didn't recognize '.'
terminators in multi-line replies if the terminator was bare (no
newline). This caused it to ignore the rest of the session that it's
analyzing.

Patch from #444 by Vern.
2011-05-10 17:11:01 -07:00
Gregor Maier
c24f3391a3 Fix compiler warning with gcc-4.4.4 2011-05-10 12:31:53 -07:00