Commit graph

3787 commits

Author SHA1 Message Date
Robin Sommer
32590177a0 Merge remote-tracking branch 'origin/fastpath'
Also reenabling the logs-to-elasticsearch.bro script in
test-all-policy.bro, that seems to work now.

* origin/fastpath:
  Reworked how the logs-to-elasticsearch scripts works to stop abusing the logging framework.
2012-07-27 12:55:10 -07:00
Robin Sommer
c66c6d7c46 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Small (potential performance) improvement for logging framework.
  Script-level rotation postprocessor fix.
  update input framework documentation to reflect want_record change.
  Fix crash when encountering an InterpreterException in a predicate in logging or input Framework.
  make want_record=T the default for events
2012-07-27 12:26:18 -07:00
Robin Sommer
f5862fb014 Preventing writers/readers from receiving further messages after a
failure.

Once a writer/reader Do* method has returned false, no further ones
will be executed anymore. This is primarily a safety mechanism to make
it easier for writer/reader authors as otherwise they would often need
to track the failure state themselves (because with the now delayed
termination from the earlier commit, furhter messages can now still
arrive for a little bit).
2012-07-26 17:27:56 -07:00
Robin Sommer
951444ee73 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  and remove superflous print.
  add testcase for subrecords and events add missing binary testcase (Baseline is in master, testcase is missing for some reason) make error output for nonmatching event types much more verbose
  Add more error handling for close() calls.
  add testcase for subrecords to input framework tests
2012-07-26 14:34:58 -07:00
Robin Sommer
d872b1d9f6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix double close() in FilerSerializer class.
  Fix build warnings
  Fixes to elasticsearch plugin to make libcurl handle http responses correctly.
2012-07-25 17:21:09 -07:00
Robin Sommer
626c6d6d5b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix complaint from valgrind about uninitialized memory usage.
  Fix differing log filters of streams from writing to same writer/path.
  Fix tests and error message for to_double BIF
2012-07-25 13:10:14 -07:00
Robin Sommer
28c5723775 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Correct a typo
  Fix file permissions of log files
2012-07-24 16:02:41 -07:00
Robin Sommer
c36a449c76 New built-in function to_double(s: string).
Closes #859.
2012-07-24 15:05:13 -07:00
Robin Sommer
0d748c117d Adding missing include needed on some systems. 2012-07-24 11:06:34 -07:00
Robin Sommer
c2e0949484 Merge remote-tracking branch 'remotes/origin/topic/jsiwek/ascii-timestamp-fix'
* remotes/origin/topic/jsiwek/ascii-timestamp-fix:
  Fix WriterBackend::WriterInfo serialization, reenable ascii start/end tags.
2012-07-23 16:36:55 -07:00
Robin Sommer
5d33e22b4d Updating NEWS. 2012-07-23 16:27:34 -07:00
Robin Sommer
86f6f36f70 Merge remote-tracking branch 'vlad/info_record_fixes'
* vlad/info_record_fixes:
  Fix some Info:Record field documentation.

Closes #851. Many thanks!
2012-07-13 16:20:49 -07:00
Robin Sommer
5d13e4f949 Merge remote-tracking branch 'origin/topic/seth/socks-fixes'
* origin/topic/seth/socks-fixes:
  Some small fixes to further reduce SOCKS false positive logs.

Closes #847.
2012-07-12 08:16:28 -07:00
Robin Sommer
f92e47c220 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fixing memory leak.
2012-07-11 08:32:02 -07:00
Robin Sommer
e3f6a467a4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add sorting canonifier to rotate-custom unit test. (addresses #846)
  Fix compiler warnings
  Fix segfault when there's an error/timeout resolving DNS requests.
2012-07-10 16:26:34 -07:00
Robin Sommer
658d1d0804 Updating submodule(s).
[nomail]
2012-07-05 12:58:19 -07:00
Robin Sommer
533d01590a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix minor typos in input framework doc
  Fix minor typos in dataseries documentation
2012-07-05 12:30:08 -07:00
Robin Sommer
06d2fd52bd Merge remote-tracking branch 'origin/topic/bernhard/reader-info'
* origin/topic/bernhard/reader-info:
  fix small bug - now configuration actually is passed.
  add mode to readerinfo - no need to have it separately everywhere anymore.
  introduce reader-info struct analogous to writer-info.
  Introduce support for a table of key/value pairs with further configuration options, with the same userinterface as in the logging interface.
  make writer-info work when debugging is enabled

Conflicts:
	testing/btest/Baseline/scripts.base.frameworks.input.event/out
	testing/btest/Baseline/scripts.base.frameworks.input.executeraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.raw/out
	testing/btest/Baseline/scripts.base.frameworks.input.rereadraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.tableevent/out

Closes #841.
2012-07-02 15:33:08 -07:00
Robin Sommer
90763bb2f2 Merge branch 'robin/topic/writer-info'
* robin/topic/writer-info:
  Extending the log writer DoInit() API.
  Reworking log writer API to make it easier to pass additional information to a writer's initialization method.

Conflicts:
	src/logging/WriterBackend.cc
	src/logging/WriterBackend.h
	src/logging/WriterFrontend.cc
2012-07-02 15:20:37 -07:00
Robin Sommer
9183309482 Merge remote-tracking branch 'origin/topic/bernhard/input-crash-search'
* origin/topic/bernhard/input-crash-search:
  for bug-searching:

Closes #840
2012-07-02 15:10:27 -07:00
Robin Sommer
9f6cf1ad90 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix inconsistencies in random number generation.
  Updating input framework unit tests.
  Add front-end name to InitMessage from WriterFrontend to Backend.
  Small tweak to make test complete quicker.
  Drain events before terminating log/thread managers.
  Fix strict-aliasing warning in RemoteSerializer.cc (fixes #834).
  Fix typos in event documentation
  Fix typos in NEWS for Bro 2.1 beta
2012-07-02 14:51:31 -07:00
Robin Sommer
0ca0119f2a Merge remote-tracking branch 'origin/topic/jsiwek/interpreter-exception-fix'
* origin/topic/jsiwek/interpreter-exception-fix:
  Fix exceptions thrown in event handlers preventing others from running.
2012-06-21 10:15:12 -07:00
Robin Sommer
6cda00c75e Merge remote-tracking branch 'origin/topic/seth/tunnels-merge'
* origin/topic/seth/tunnels-merge:
  SOCKS DPD fixes.
  Fix a bug in the SOCKS analyzer.
  SOCKS and tunnel test updates.
  Updates for the SOCKS analyzer.
  Very small updates to the tunnels framework.
2012-06-20 14:33:18 -07:00
Robin Sommer
b096168318 Merge branch 'topic/robin/tunnels-merge'
* topic/robin/tunnels-merge: (51 commits)
  Updating baselines and NEWS.
  Remove &synchronized from Tunnel::active table.
  Refactor of interal tunnel analysis code.
  Add state management of NetSessions's IP tunnel map.
  Add "encap_hdr_size" option back in.
  Script-layer tunnel interface cleanup.
  Fix performance problem checking packet encapsulation. (addresses #830)
  Adding a SOCKS test case.
  Updating DataSeries baselines.
  Moving my todos over to the tracker ticket.
  Extend weird names that occur in core packet processing during decapsulation.
  Add Teredo analysis option to reduce false positive decapsulation.
  Just some cleanup/documentation of new tunnel-handling code.
  Memory leak fixes
  Add a config.h definition for IPPROTO_IPV4.
  Add AYIYA tunnel decapsulation unit test.
  Add Teredo-specific events.
  Refactor some of the NetSessions routines that recurse on IP packets.
  Add independent options to toggle the different decapsulation methods
  Add more sanity checks before recursing on encapsulated IP packets.
  ...

Conflicts:
	src/event.bif
2012-06-19 13:21:31 -07:00
Robin Sommer
41ef1072ec Changing an error in the input framework to a warning. 2012-06-15 16:25:31 -07:00
Robin Sommer
464732bfce Merge remote-tracking branch 'origin/topic/bernhard/input-threads-merge'
* origin/topic/bernhard/input-threads-merge:
  disable streaming reads from executed commands.
  automatically delete disabled input streams
  small documentation fixes
  Documentation
2012-06-15 15:39:58 -07:00
Robin Sommer
82df709c4d Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove an old, unused diff canonifier.
  Improve an error message in ICMP analyzer.
  Fix a warning message
  Fix many errors in the event documentation
2012-06-15 15:20:23 -07:00
Robin Sommer
d1512ef462 Merge remote-tracking branch 'origin/topic/jsiwek/enum-log-error-handling'
* origin/topic/jsiwek/enum-log-error-handling:
  Add more error handling code to logging of enum vals. (addresses #829)
2012-06-11 15:59:20 -07:00
Robin Sommer
14fa3fc799 Updating CHANGES and VERSION. 2012-06-11 15:56:35 -07:00
Robin Sommer
f863214cb1 Merge commit 'd1e4e6e812'
* commit 'd1e4e6e812':
  Include header for usleep(), caused compile failure on Archlinux.
2012-06-07 15:07:46 -07:00
Robin Sommer
45f5900547 Merge remote-tracking branch 'origin/topic/jsiwek/load-sigs'
* origin/topic/jsiwek/load-sigs:
  Add @load-sigs directive for loading signature files (addresses #551).

Closes #551.
2012-06-06 11:49:39 -07:00
Robin Sommer
73cefcc11c Merge remote-tracking branch 'origin/topic/dnthayer/bif-tests'
* origin/topic/dnthayer/bif-tests:
  Improve "fmt" BIF documentation comment
  Improve tests of the type_name BIF
  Improve test cases for "order" BIF
  Fix documentation of sort BIF and add more tests
  Fix documentation for system_env BIF
  Deprecate the parse_dotted_addr BIF (use to_addr instead)
  Improve tests for to_port and type_name BIFs
  Improve tests for sort, order, and system_env BIFs
  Fix the join_string_vec BIF and add more tests
  Add more tests for previously-untested BIFs
  Add more tests for previously-untested BIFs
  Add more tests for previously-untested BIFs
  Add more tests for previously-untested BIFs
  Add tests for previously-untested strings BIFs
2012-06-06 11:42:16 -07:00
Robin Sommer
8ae765ef68 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Memory leak fixes for bad usages of VectorVal ctor.
  Fixed a bug with the MIME analyzer not removing whitespace on wrapped headers.
2012-06-06 11:06:03 -07:00
Robin Sommer
f34ebb7b60 Updating submodule(s).
[nomail]
2012-05-30 19:12:54 -07:00
Robin Sommer
c0e0481af2 Merge branch 'topic/robin/input-threads-merge'
* topic/robin/input-threads-merge: (130 commits)
  And now it even compiles after my earlier changes.
  A set of input framework refactoring, cleanup, and polishing.
  another small memory leak in ascii reader:
  and another small memory leak when using streaming reads.
  fix another memory lead (when updating tables).
  Input framework merge in progress.
  filters have been called streams for eternity. And I always was too lazy to change it everywhere...
  reactivate network_time check in threading manager. previously this line made all input framework tests fail - it works now. Some of the other recent changes of the threading manager must have fixed that problem.
  fix up the executeraw test - now it works for the first time and does not always fail
  baselines for the autostart removal.
  remove last remnants of autostart, which has been removed for quite a while.
  make input framework source (hopefully) adhere to the usual indentation style. No functional changes.
  fix two memory leaks which occured when one used filters.
  update description to current interface.
  rename a couple of structures and make the names in manager fit the api more.
  fix memory leak in tables and vectors that are read into tables
  fix missing get call for heart beat in benchmark reader.
  fix heart_beat_interval -- initialization in constructor does not work anymore (probably due to change in init ordering?)
  fix memory leak for tables... nearly completely.
  fix a couple more leaks. But - still leaking quite a lot with tables.
  ...
2012-05-30 19:12:18 -07:00
Robin Sommer
e9354284eb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove unnecessary assert in ICMP analyzer (addresses #822).
  Improve script debugger backtrace and print commands.
2012-05-30 17:06:36 -07:00
Robin Sommer
d92da36b9b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Documentation fixes.
  Replace ip6_hdr_chain with ip6_ext_hdr in comments
  Correct various errors in the BIF documentation
2012-05-24 16:46:44 -07:00
Robin Sommer
60df9582d3 Merge remote-tracking branch 'origin/fastpath'
Thanks!

* origin/fastpath:
  Fix compile errors.
  Fix mobility checksums unit test.
2012-05-17 14:00:09 -07:00
Robin Sommer
1824808dcc Updating submodule(s).
[nomail]
2012-05-17 12:44:56 -07:00
Robin Sommer
e34f27b928 Updating submodule(s).
[nomail]
2012-05-17 09:58:29 -07:00
Robin Sommer
99f59dc5c0 Quieting external test output somehwat. 2012-05-14 18:18:30 -07:00
Robin Sommer
87c68e8ce7 Merge remote-tracking branch 'origin/topic/dnthayer/bug805'
* origin/topic/dnthayer/bug805:
  Update tests (use weird.log instead of stderr)
  Don't print the various "weird" events to stderr

Closes #805.
2012-05-14 17:16:45 -07:00
Robin Sommer
cb1e9a7c6f Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-output-format'
* origin/topic/jsiwek/ipv6-output-format:
  Change IPv6 output format to no longer automatically be bracketed.
  Change IPv6 address/prefix output format to be bracketed.

Closes #818.
2012-05-14 17:07:02 -07:00
Robin Sommer
ed9801db98 Merge remote-tracking branch 'origin/topic/jsiwek/digests'
* origin/topic/jsiwek/digests:
  Add SHA1 and SHA256 hashing BIFs. (addresses #542)

Closes #542.
2012-05-04 21:29:29 -07:00
Robin Sommer
c327a0613a Merge remote-tracking branch 'origin/topic/seth/ssl-fixes'
* origin/topic/seth/ssl-fixes:
  More bugfixs, cleanup, and test for SSL analyzer
  Fixed parsing of TLS server extensions.

Closes #817.
2012-05-03 13:32:49 -07:00
Robin Sommer
232b7688b2 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add two more TLS extension values that we see in live traffic.
  Fixed IPv6 link local unicast CIDR and added	IPv6 loopback to private address space.
  Fixed a problem where cluster workers were still processing notices in some cases.
  Added Carrier Grade NAT CIDR and link local IPv6 to "private_address_space"
2012-05-03 11:45:00 -07:00
Robin Sommer
0ae38ce2b8 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add some extra TLS extension values.
  Fix problem with extracting FTP passwords.
2012-04-24 14:39:27 -07:00
Robin Sommer
3f1811afd2 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes related to ICMPv6 Neighbor Discovery messages.
2012-04-19 10:02:07 -07:00
Robin Sommer
5350cab371 Merge remote-tracking branch 'origin/topic/icmp6'
* origin/topic/icmp6:
  Fixes for IPv6 truncation and ICMP/ICMP6 analysis.
  Change ICMPv6 checksum calculation to use IP_Hdr wrapper.
  Update IPv6 atomic fragment unit test to filter output of ICMPv6.
  Add more data to icmp events
  More code cleanup
  Add more icmpv6 events, and general code cleanup
  Fix compile failure after merge from master
  Significant edit pass over ICMPv6 code.
  Porting Matti's branch to git.

Closes #808.
2012-04-17 19:02:59 -07:00
Robin Sommer
b3596f28d7 Updating submodule(s).
[nomail]
2012-04-17 17:41:37 -07:00