Commit graph

1825 commits

Author SHA1 Message Date
Robin Sommer
3abf626908 Merge remote-tracking branch 'origin/topic/jsiwek/broxygen'
BIT-1098

* origin/topic/jsiwek/broxygen:
  Fix Broxygen-related compile errors.
  Add a Broxygen coverage test.
  Internal Broxygen organization/documentation/polish.
  Add unit tests for Broxygen config file targets.
  Change Broxygen config file format.
  Broxygen doc-related test updates.  Fix two regressions.
  A couple documentation fixes.
  Integrate new Broxygen functionality into Sphinx.
  Implement majority of Broxygen features delegated to Bro.
  Broxygen can now read a config file specifying particular targets.
  Remove unneeded Broxygen comments in scan.bro.
  Replace safe_basename/safe_dirname w/ SafeBasename/SafeDirname.
  Add BIF interface for retrieving comments/docs.
  Quick optimization to Broxygen doc gathering.
  Flesh out Broxygen doc-gathering skeleton.
  Refactor search_for_file() util function.
  Initial skeleton of new Broxygen infrastructure.
2013-12-04 11:14:19 -08:00
Robin Sommer
c0b8384660 Merge remote-tracking branch 'origin/topic/jsiwek/broccoli-vectors'
* origin/topic/jsiwek/broccoli-vectors:
  Unit test for broccoli vector support.
2013-12-03 10:57:03 -08:00
Robin Sommer
dc52846b6f Updating submodule(s).
[nomail]
2013-11-18 14:04:02 -08:00
Robin Sommer
f18f9511ac Updating submodule(s).
[nomail]
2013-11-15 07:06:00 -08:00
Robin Sommer
3d1fd6ca5e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix the irc_reply event for certain server message types.
2013-11-11 13:48:50 -08:00
Robin Sommer
ba258ab865 Updating CHANGES and VERSION. 2013-11-07 01:21:20 -08:00
Robin Sommer
da9c31db55 Fixing warnings during doc build.
Includes adding a stub file that has been missing for a while already.
2013-11-07 00:46:48 -08:00
Robin Sommer
f46e4a5578 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix typos in sumstats doc and update doc test
  Update docs and tests for a recent change to detect-MHR.bro
  Update tests and baselines for sumstats docs
2013-11-06 22:55:01 -08:00
Seth Hall
0a1ee9af1b Merge remote-tracking branch 'origin/topic/vladg/ssh-log-fix'
* origin/topic/vladg/ssh-log-fix:
  Remove resp_size from the log. Refactor when we write out to the log a bit. Geodata now works reliably.
  Fix resp_size in ssh.log, require a minimum resp_size for the heuristic. Some work on geodata, but still a WIP.
2013-11-06 14:42:02 -05:00
Robin Sommer
886266e8af Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove swig-ruby from required packages section of install doc
2013-11-03 22:53:54 -08:00
Robin Sommer
a9d8748614 Updating submodule(s).
[nomail]
2013-11-01 05:26:32 -07:00
Robin Sommer
101fbdeff7 Adding source and original copyright statement to Mozilla cert list. 2013-11-01 05:24:43 -07:00
Robin Sommer
5f863df91f Canonfying an intel test to not depend on output order. 2013-11-01 05:03:54 -07:00
Robin Sommer
49f31acebe Merge remote-tracking branch 'origin/topic/jsiwek/thread-termination'
* origin/topic/jsiwek/thread-termination:
  Fix thread processing/termination conditions.

BIT-1093 #merged
2013-10-30 05:05:06 -07:00
Robin Sommer
601b1b9fd0 Merge branch 'master' of git.bro.org:bro 2013-10-29 09:31:59 -07:00
Robin Sommer
943f44314a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Don't build broccoli ruby bindings by default, use --enable-ruby to do so.
  Revert "Fix race condition in unit test."
  Fix race condition in unit test.
  Change percent_lost in capture-loss from a string to a double.
2013-10-29 09:28:13 -07:00
Vlad Grigorescu
e1d2f6d82f Change percent_lost in capture-loss from a string to a double. 2013-10-29 06:03:34 -07:00
Robin Sommer
fbdbe6d35b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add curl to list of optional dependencies
  Update test and baseline for a recent doc test fix
2013-10-25 15:48:45 -07:00
Robin Sommer
be5b0105b0 Updating README with download/git information.
The git instructions were hard to find and this way they will show up
on github.
2013-10-25 15:06:13 -07:00
Robin Sommer
2818bb3dbc Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  make the documentation of the SQLite reader/writer a bit nicer.
  Wrong example file was included - reported by Michael Auger @LM4K
2013-10-25 11:12:51 -07:00
Robin Sommer
c980d1055e Fix for input readers occasionally dead-locking.
Bernhard and I tracked it down we believe: the thread queue could
deadlock in certain cases. As a fix we tuned the heuristic for telling
if a queue might have input to occasionaly err on the safe side by
flagging "yes", so that processing will proceed.

It's a bit unfortunate to apply this fix last minute before the
release as it could potentially impact performance if the heuristic
fails to often. We believe the chosen parmaterization should be fine ...
2013-10-24 18:21:24 -07:00
Robin Sommer
42c4a51da3 Updating submodule(s).
[nomail]
2013-10-24 16:59:31 -07:00
Robin Sommer
5c80fd169f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  change temporary workaround to permanent fix.

Conflicts:
	src/input/readers/Ascii.cc
2013-10-24 16:33:11 -07:00
Robin Sommer
a7cebff99d Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
* origin/topic/dnthayer/doc-changes-for-2.2:
  Add gawk to list of optional packages
  Add more script package README files
  Add NEWS about new features of broctl and upgrade info
2013-10-24 14:35:21 -07:00
Robin Sommer
1f91b2936e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  rework libc++ patch to use AvailabilityMacros.h instead of Availability.h

Conflicts:
	src/input/readers/Ascii.cc
2013-10-24 14:01:44 -07:00
Robin Sommer
26c01468f5 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  temporary osx mavericks libc++ issue workaround.
  Change test of identify_data BIF to ignore charset.
2013-10-24 13:07:49 -07:00
Robin Sommer
08e6b6b4b4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix record coercion tolerance of optional fields.
  Add NEWS about incompatible local.bro changes, addresses BIT-1047.
  Fix minor formatting problem in NEWS.
2013-10-23 09:50:47 -07:00
Robin Sommer
02a414d1ba Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
* origin/topic/dnthayer/doc-changes-for-2.2:
  Document which Bro script vars are set by BroControl
  Add more script package README files
  Fix doc comment so the text gets included in the HTML
  Do not include documentation of commented-out items
  Make RFC links in the docs more consistent
  Fix typos and formatting in the signature framework docs
  Fix typos and formatting in the notice framework docs
  Fix typos and formatting in the events docs
  Fix typos and formatting in the other policy docs
  Fix typos and formatting in the policy/protocols docs
  Fix typos and formatting in the policy/frameworks docs
  Correct more typos in init-bare.bro
  Fix typos and formatting in init-bare.bro and init-default.bro
  Fix formatting in the protocol BiFs docs
2013-10-23 09:48:22 -07:00
Robin Sommer
8bfb81ca6f Moving the SQLite examples into separate Bro files to turn them into
sphinx-btest tests.

It's hard to make sure these are actually working as expected, but the
tests now at least make sure things parse correctly.
2013-10-18 14:18:33 -07:00
Robin Sommer
615cca8baa Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
Snapshotting the work in this branch. I'll merge it again later as we
get closer to the release.

* origin/topic/dnthayer/doc-changes-for-2.2: (29 commits)
  Add README files for base/protocols
  Fix incorrect uses of reST directives
  Fix typos and formatting in the BiFs docs
  Fix typos and formatting in the base/utils docs
  Fix typos and formatting in the other protocol docs
  Fix typos and formatting in the ssl protocol docs
  Fix typos and formatting in the http protocol docs
  Fix typos and formatting in the ftp protocol docs
  Fix typos and formatting in the dns protocol docs
  Fix typos and formatting in the dhcp protocol docs
  Adjust line numbers to match changes in conn/main.bro
  Fix typos and formatting in the conn protocol docs
  Update FreeBSD install instructions
  Improvements to file analysis docs
  Add README files for most Bro frameworks
  Fix typos and formatting in various other framework docs
  Fix typos and formatting in the software framework docs
  Fix typos and formatting in the sumstats docs
  Fix typos and formatting in the packet filter docs
  Fix typos and formatting in the logging framework docs
  ...
2013-10-18 13:49:49 -07:00
Robin Sommer
27a8c5e568 Merge remote-tracking branch 'origin/topic/bernhard/input-documentation'
* origin/topic/bernhard/input-documentation:
  and provide a bit of motivation to try the last example.
  and restructure it a bit
  First try at sqlite reader/writer documentation
  add check that the SQLite reader is only used in MANUAL reading mode
  rename the dbname configuration option to tablename.
2013-10-18 13:19:37 -07:00
Robin Sommer
2562b517b6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix more Coverity-reported issues (introduced by internal error audit).
  Add check for sqlite3 command to tests that require it
  Fix misc. issues reported by Coverity.
2013-10-14 14:30:57 -07:00
Robin Sommer
2e05978210 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add check for curl command to active-http.test

I've moved the check from TEST-EXEC to TEST-REQUIRES. I think it's
fine to just skip the test if curl is not available.
2013-10-14 09:27:14 -07:00
Robin Sommer
e5ad3c38c9 Merge branch 'topic/robin/internal-errors-merge'
* topic/robin/internal-errors-merge:
  Reverting one of the my internal errors tweaks.
  Renaming InternalAnalyzerError to AnalyzerError.
  Pass over the InternalError() changes.
  Review usage of Reporter::InternalError, addresses BIT-1045.
2013-10-14 09:21:05 -07:00
Robin Sommer
1a9835a00a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve Broxygen end-of-sentence detection.
2013-10-11 17:23:41 -07:00
Robin Sommer
3d010f3bb6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  IANA assigned a couple of new tls extension numbers
  add 3 more really new ciphers.
2013-10-10 13:37:19 -07:00
Robin Sommer
8c68161bea Merge remote-tracking branch 'origin/master' 2013-10-07 17:34:45 -07:00
Robin Sommer
d127d8d01d Merge remote-tracking branch 'origin/topic/jsiwek/coverity'
* origin/topic/jsiwek/coverity:
  Fix uninitialized (or unused) fields.
  Remove logically dead code.
  Remove dead/unfinished code in unary not expr.
  Fix logic for failed DNS TXT lookups.
  A couple null ptr checks.
  Improve return value checking and error handling.
  Remove unused variable assignments, dead code.
  Prevent division/modulo by zero in scripts.
  Fix unintentional always-false condition.
  Fix invalidated iterator usage.
  Fix DNS_Mgr iterator mismatch.
  Set safe umask when creating script profiler tmp files.
  Fix nesting/indent level whitespace mismatch.
  Add checks to avoid improper negative values use.

BIT-1085 #merged
2013-10-02 11:05:49 -07:00
Robin Sommer
ecd30a3d85 Merge remote-tracking branch 'origin/topic/bernhard/new-ciphers'
BIT-1086 #merged

* origin/topic/bernhard/new-ciphers:
  add ciphers to cipher_desc table that were already present but apparently forgotten.
  ...and a few more ciphers.
  add new tls cipher suites
2013-10-02 10:29:34 -07:00
Robin Sommer
6c8cbef997 Updating bifcl usage message. 2013-10-01 11:32:37 -07:00
Robin Sommer
5ddbe9e75f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a "make doc" warning
2013-09-28 11:17:10 -07:00
Robin Sommer
bb4b262813 Updating submodule(s).
[nomail]
2013-09-24 13:24:06 -07:00
Robin Sommer
abba39c261 Updating submodule(s).
[nomail]
2013-09-23 20:31:57 -07:00
Robin Sommer
00a3ad03dd Updating submodule(s).
[nomail]
2013-09-23 11:55:12 -07:00
Robin Sommer
d070b01828 Updating baselines for doc changes. 2013-09-20 14:38:45 -07:00
Robin Sommer
589a0239be Merge remote-tracking branch 'origin/topic/srunnels/documentation'
* origin/topic/srunnels/documentation:
  Spelling corrections.
  Include a better description for detect-MHR.bro
  Rewrite the MHR detection description.
  Spelling corrections.
  Update the lines included from events.bif.bro.
2013-09-20 14:36:55 -07:00
Robin Sommer
97cb04aae2 Merge remote-tracking branch 'origin/topic/jsiwek/raw-exec-pgrp'
* origin/topic/jsiwek/raw-exec-pgrp:
  Kill raw input reader's child by process group.

BIT-1081 #merged
2013-09-20 14:12:59 -07:00
Robin Sommer
0316bd77f5 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add more links in the GeoLocation document
2013-09-19 20:08:22 -07:00
Robin Sommer
d123d95b46 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add links to Intelligence Framework documentation
  update mozilla root ca list
  Update Mozilla root CA certs.
  Update documentation of required packages
2013-09-19 15:12:46 -07:00
Robin Sommer
3738b4136b Merge remote-tracking branch 'origin/topic/bernhard/ticket950'
* origin/topic/bernhard/ticket950:
  make client and server random available on script-level.

BIT-950 #merged
2013-09-18 15:02:55 -07:00