Commit graph

1825 commits

Author SHA1 Message Date
Jon Siwek
39d51ca99c Improve documentation for connection_established event. 2015-01-12 09:38:50 -06:00
Jon Siwek
d8890ea009 Increase minimum required CMake version to 2.8. 2015-01-08 13:11:17 -06:00
Jon Siwek
1ba0527cae Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve documentation of the Intelligence Framework
2015-01-07 10:04:01 -06:00
Jon Siwek
4b6c683679 Merge remote-tracking branch 'origin/topic/jsiwek/file-reassembly-merge'
* origin/topic/jsiwek/file-reassembly-merge:
  Add NEWS items related to file analysis changes.
  Revert "Workaround race condition in unified2 file module."
  Workaround race condition in unified2 file module.
  Fix reference counting bug in refactored file reassembly code.
  Change file extraction to explicitly NUL-fill gaps
  Review/fix/change file reassembly functionality.
  Improve TAR file detection and other small changes.
  Updates for file mime type identification.
  Updates the files event api and brings file reassembly up to master.
  More file reassembly work.
  Initial commit of file reassembly.
2015-01-06 10:11:25 -06:00
Jon Siwek
1971d25a5c Fix race condition in unified2 file analyzer startup.
Retrieval of extended alert information from sid-msg.map, gen-msg.map,
and classification.config files uses Bro's input framework, but since
the unified2 file analyzer also relies on the input framework,
coordination is needed to start analysis only after extended info has
been read at least once.
2015-01-05 15:38:04 -06:00
Robin Sommer
494545f1eb Updating submodule(s).
[nomail]
2014-12-31 09:39:35 -08:00
Robin Sommer
055e5c69f3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Correct a typo in the Notice framework doc
2014-12-31 09:06:24 -08:00
Robin Sommer
6f2b8cbe78 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1298'
* origin/topic/jsiwek/bit-1298:
  Change IP_Hdr copy ctor/assign to explicit method
  Fix PIA packet replay to deliver copy of IP header

BIT-1298 #merged
2014-12-12 12:44:53 -08:00
Robin Sommer
b40b3ef158 Merge remote-tracking branch 'origin/topic/dnthayer/ticket856'
* origin/topic/dnthayer/ticket856:
  Improve man page for Bro
  Add man page for Bro

BIT-856 #merged
2014-12-08 13:56:52 -08:00
Robin Sommer
a4e45dca80 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1295'
* origin/topic/jsiwek/bit-1295:
  Fix compound assignment to require proper L-value.

BIT-1295 #merged
2014-12-03 14:22:36 -08:00
Robin Sommer
bb7d94d9c5 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1296'
* origin/topic/jsiwek/bit-1296:
  Make using local IDs in @if directives an error.

BIT-1296 #merged
2014-12-03 14:14:23 -08:00
Robin Sommer
19d9a8bfa2 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix some "make doc" warnings and update some doc tests
2014-12-03 14:10:49 -08:00
Seth Hall
379593c7fd Merge branch 'patch-1' of https://github.com/mpurzynski/bro
- Adds version detection for Windows 10.
2014-12-02 08:14:29 -05:00
Jon Siwek
fe9e7d015e Update submodules/changes/version. 2014-12-01 12:17:34 -06:00
Robin Sommer
071834b948 Merge remote-tracking branch 'origin/topic/johanna/ssl-fail-earlier'
BIT-1293 #merged

* origin/topic/johanna/ssl-fail-earlier:
  and just to be safe - also require the &if check in binpac
  make the SSL analyzer skip further processing once encountering situations which are very probably non-recoverable.
2014-11-25 17:35:49 -08:00
Robin Sommer
977446e7ee Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  make sslv2 protocol tests more strict - in its current state they triggered on http traffic over port 443 sometimes.
  Fix x509 analyzer to correctly return ecdsa as the key_type for ecdsa certs.
2014-11-25 14:28:10 -08:00
Jon Siwek
5436faed69 Disable verbose bison output.
These logs aren't generally useful to build everytime, just when working
on and debugging one of the various grammars and at least I haven't
needed to look at them in years.  Also, Ninja builds don't seem to work
because of them (can probably improve the related CMake macros so the
verbose logs do play nice with Ninja, but doesn't seem worth effort
right now, see previous comment).
2014-11-19 10:57:58 -06:00
Robin Sommer
9d3cfaddaa Merge branch 'master' of https://github.com/anthonykasza/bro
- I've changed/extended the URI record fields a bit:
        - path is always the full path including the full file name
        - if there's no path, the field still still be set set "/".
        - file_name is the full name including extenstion, and
          file_base and file_ext split it out.

    - Adding a test exercising a bunch of URLs.
2014-11-18 12:21:06 -08:00
Robin Sommer
bf35ed699c Merge remote-tracking branch 'origin/topic/jsiwek/bit-1288'
* origin/topic/jsiwek/bit-1288:
  BIT-1288: Improve coercion of &default expressions.

BIT-1288 #merged
2014-11-18 11:09:33 -08:00
Robin Sommer
3868cbd88e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  for dh key exchanges, use p as the parameter for weak key exchanges. Y can be a few bytes smaller due to the modulo operation - this is ok.
2014-11-18 10:53:38 -08:00
Robin Sommer
08d843c258 Updating submodule(s).
[nomail]
2014-11-11 13:47:37 -08:00
Robin Sommer
7b58293dbb Updating submodule(s).
[nomail]
2014-11-11 13:23:02 -08:00
Robin Sommer
557218895e Removing method from SSL analyzer that's no longer used. 2014-11-11 11:51:04 -08:00
Robin Sommer
e8e81043a1 Merge remote-tracking branch 'origin/topic/vladg/mysql'
* origin/topic/vladg/mysql:
  Update baselines.
  Fix a logic bug with handling quits after the cleanup.
  Integrate MySQL with the software framework
  A bit of MySQL cleanup - removed unused events, consolidated similar events, fixed up main.bro a bit
  Move MySQL analyzer to the new plugin architecture.
  Add a btest for the Wireshark sample MySQL PCAP
  Add support for more commands, and support quit
  Redo the response handling..
  Whitespace/readability fixes.
  Add memleak and auth btests.
  Update baselines.
  Get MySQL to compile and add basic v9 support.
  MySQL analyzer
2014-11-11 11:49:26 -08:00
Robin Sommer
9045288ad3 Merge remote-tracking branch 'origin/fastpath' 2014-11-03 18:55:42 -08:00
Robin Sommer
395f06d93c Updating submodule(s).
[nomail]
2014-10-31 17:45:37 -07:00
Robin Sommer
78de5c17ef Merge remote-tracking branch 'origin/topic/jsiwek/bit-1176'
* origin/topic/jsiwek/bit-1176:
  Fix segfault if when statement's RHS is unitialized.

BIT-1176 #merged
2014-10-31 16:30:49 -07:00
Jon Siwek
3b4e5eda55 BIT-1283: Fix crash when using &encrypt. 2014-10-31 12:13:27 -05:00
Jon Siwek
2a181a88c5 Allow arbitrary when statement timeout expressions
BIT-1284 #close
2014-10-31 10:38:23 -05:00
Jon Siwek
285f93b689 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1166'
* origin/topic/jsiwek/bit-1166:
  Add configure options to fine tune local state dirs used by BroControl.

BIT-1166 #close
2014-10-31 09:22:37 -05:00
Jon Siwek
dec96234e3 Fix some minor Coverity Scan complaints. 2014-10-30 13:26:34 -05:00
Jon Siwek
432744fde4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix checking of fwrite return values

Some didn't look quite right so fixed while merging: the return value of
fwrite is in terms of number of objects written, not number of bytes
written and some calls still mixed those up.
2014-10-28 15:10:32 -05:00
Jon Siwek
832a2b7bab Updating CHANGES and VERSION. 2014-10-27 13:03:46 -05:00
Jon Siwek
a26c674dfd Updating submodule(s).
[nomail]
2014-10-27 10:05:36 -05:00
Robin Sommer
087a9f975d Adding missing baseline. 2014-10-24 15:34:06 -07:00
Robin Sommer
fb56d3f0bb Fixing unstable test. 2014-10-24 13:40:00 -07:00
Robin Sommer
4216a5eb1c Merge remote-tracking branch 'origin/topic/struck/BIT-1277'
* origin/topic/struck/BIT-1277:
  [ADD] Added the feature to return 0 content to the python http test server and added functionality for post requests
  [ADD] added baseline for the new active-http test and added a test to check for the content-length 0 fix.
  [ADD] added baseline for the new exec test and added a test to check for the empty files fix.
  [FIX] exec should write an empty string when file is empty instead of the filename
  [FIX] Add files to result table even if the files are empty

BIT-1277 #merged
2014-10-24 11:43:09 -07:00
Robin Sommer
3e508d316a Plugins: Change order in which plugins' scripts are loaded at startup.
We now load the top-level  __init__.bro before the internal bif.bro so
that the former can define types used by the latter.
2014-10-23 14:22:26 -07:00
Robin Sommer
2002fd7f90 Merge remote-tracking branch 'origin/topic/johanna/ssl-resumption'
* origin/topic/johanna/ssl-resumption:
  Update baseline of new SSL policy script for changes
  update test baselines
  Mark everything below 2048 bit as a weak key (Browsers will stop accepting 1024 bits soon, so we can be of that opinion too).
  add information about server chosen protocol to ssl.log, if provided by alpn.
  change SSL log to contain a boolean flag signaling if a session was resumed instead of the (usually not really that useful) session ID the client sent.

BIT-1279 #merged
2014-10-21 13:44:46 -07:00
Robin Sommer
e3cd7b1615 Merge remote-tracking branch 'origin/topic/seth/dnp3-wrong-sizeof-argument'
* origin/topic/seth/dnp3-wrong-sizeof-argument:
  Fix some Coverity warnings about the DNP3 analyzer.

The for loop seemed wrong, fixed. (Looks like we don't have a test
making sure the times there are (still) correct ...)

BIT-1278 #merged
2014-10-21 13:37:48 -07:00
Robin Sommer
53eb197b94 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1235'
* origin/topic/jsiwek/bit-1235:
  Improve multipart HTTP/MIME entity file analysis.

BIT-1235 #merged
2014-10-16 06:59:50 -07:00
Jon Siwek
ccc88beeee Add error message for bad enum declaration syntax.
BIT-1273 #close
2014-10-15 10:23:19 -05:00
Jon Siwek
191e5da74d Documentation fixes.
BIT-1272 #close
2014-10-14 14:43:08 -05:00
Jon Siwek
7ef1409b40 Change find-bro-logs unit test to follow symlinks. 2014-10-09 16:02:13 -05:00
Robin Sommer
f4f5cfd321 Further baseline normalization for plugin test portability. 2014-10-08 08:16:31 -07:00
Robin Sommer
81933d25a8 Fix for test portability. 2014-10-07 20:18:31 -07:00
Robin Sommer
91c218d44a Include plugin unit tests into the top-level btest configuration.
Turns out they weren't part of it yet. Comes with some baseline updates.
2014-10-07 15:33:18 -07:00
Robin Sommer
446578ea97 Updating plugin documentation.
Extending debugging section a bit, and claryyhing why some content is
missing. Also linking into new development section at top-level.
2014-10-07 15:14:39 -07:00
Robin Sommer
21a0e12d82 Merge remote-tracking branch 'origin/topic/jdopheid/BIT-1242'
* origin/topic/jdopheid/BIT-1242:
  Improved the log file reference documentation
  Added missing log files prof, stderr, stdout
  Add a test that detects changes in the list of all Bro log files
  Broke down logs into grouped sections based on use & origin
  Adding deatils for modbus_register_change.log
  More updates to log files page: descriptions
  Changing name of file
  New page for List of Log files, linked to script-reference

Very nice. I've reorganized slightly more, mostly to shrink down the
"other" category: moved some of that into "Detection" and "Files" (the
latter is small, but will hopefully grow).

BIT-1242 #merged
2014-10-07 14:35:19 -07:00
Jon Siwek
b3ff415120 Fix uninitialized router_list argument in dhcp_offer/dhcp_ack.
BIT-1268 #close
2014-10-03 09:43:44 -05:00