Commit graph

5342 commits

Author SHA1 Message Date
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
28770937b5 Add configure options to fine tune local state dirs used by BroControl.
--logdir: logs produced at run time
--spooldir: other data produced at run time
--localstatedir: contains spool or log dirs if those options aren't set

Addresses BIT-1166.
2014-10-30 17:11:46 -05:00
Jon Siwek
dec96234e3 Fix some minor Coverity Scan complaints. 2014-10-30 13:26:34 -05:00
Jon Siwek
1f7facda5b Fix segfault if when statement's RHS is unitialized.
If it is ever assigned a value, the body of the when can be triggered as
usual.

Addresses BIT-1176.
2014-10-30 12:19:25 -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
e5f75cde93 BIT-1280: Fix checking vector indices via "in".
$ cat test.bro
local vec: vector of string = { "zero" };
vec[2] = "two";
print 0 in vec, 1 in vec, 2 in vec;

$ bro -b test.bro
T, F, T
2014-10-28 14:21:16 -05:00
Johanna Amann
ed73c83b61 Fix checking of fwrite return values 2014-10-28 07:20:26 -07:00
Jon Siwek
832a2b7bab Updating CHANGES and VERSION. 2014-10-27 13:03:46 -05:00
Vlad Grigorescu
45d5080870 Move MySQL analyzer to the new plugin architecture. 2014-10-27 13:55:10 -04:00
Jon Siwek
e60ceea87c Fix errors/warnings when compiling with -std=c++11
These are compatibility changes only.
2014-10-27 12:54:17 -05:00
Vlad Grigorescu
b259a41ef2 Merge remote-tracking branch 'origin/master' into topic/vladg/mysql
Conflicts:
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log
2014-10-27 13:24:31 -04:00
Jon Siwek
a26c674dfd Updating submodule(s).
[nomail]
2014-10-27 10:05:36 -05:00
Jon Siwek
b67646cf19 Merge branch 'patch-1' of https://github.com/vice/bro
* 'patch-1' of https://github.com/vice/bro:
  Wrong port in scripting documentation
2014-10-27 10:03:29 -05:00
Vicente Jimenez Aguilar
65ab987eb6 Wrong port in scripting documentation
HTTP is port 80 not 53
2014-10-25 11:52:17 +02: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
Christian Struck
de33490586 [ADD] Added the feature to return 0 content to the python http test server and added functionality for post requests 2014-10-22 16:05:06 -07:00
Christian Struck
d17b3746cf [ADD] added baseline for the new active-http test and added a test to check for the content-length 0 fix. 2014-10-22 16:04:04 -07:00
Christian Struck
0a59772043 [ADD] added baseline for the new exec test and added a test to check for the empty files fix. 2014-10-22 16:02:19 -07:00
Christian Struck
04746c7ffc [FIX] exec should write an empty string when file is empty instead of the filename 2014-10-22 11:57:03 -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
Johanna Amann
624aa3cac1 Update baseline of new SSL policy script for changes 2014-10-21 11:38:02 -07:00
Johanna Amann
ba3b35a612 Merge remote-tracking branch 'origin/master' into topic/johanna/ssl-resumption 2014-10-21 11:32:46 -07:00
Christian Struck
4c305d6b92 [FIX] Add files to result table even if the files are empty 2014-10-20 15:59:58 -07:00
Seth Hall
ab62a375ac Fix some Coverity warnings about the DNP3 analyzer. 2014-10-20 10:10:21 -04: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
02c86b2304 Merge branch 'master' into topic/jsiwek/bit-1235 2014-10-14 14:45:58 -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
Jon Siwek
0632352f2a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add error checks and messages to a test script
2014-10-09 15:59:12 -05:00
Daniel Thayer
072dad6508 Add error checks and messages to a test script 2014-10-08 10:42:35 -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
38beb6632e Switching the prefix separator for packet source/dumper plugins once
more, now to "::".

Addresses BIT-1267.
2014-10-07 15:27:16 -07:00
Robin Sommer
56a2a1a1e5 Fix for allowing a packet source plugin to provide multiple prefixes
with a colon.
2014-10-07 15:26:30 -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
Robin Sommer
175ff9cf2d Merge remote-tracking branch 'origin/topic/dnthayer/langref'
* origin/topic/dnthayer/langref:
  Minor improvements to script language reference docs
  Add more script language reference documentation
  Split the types and attributes reference doc into two docs

Wow, this is great!

BIT-1269 #merged
2014-10-07 14:18:08 -07:00
Daniel Thayer
0ab36bca26 Merge remote-tracking branch 'origin/master' into topic/dnthayer/langref 2014-10-06 13:34:22 -05:00
Daniel Thayer
f24adc1a95 Minor improvements to script language reference docs 2014-10-06 13:27:21 -05:00
Seth Hall
80656d5294 Improves shockwave flash file signatures.
- This moves the signatures out of the libmagic imported signatures
   and into our own general.sig.

 - Expand the detection to LZMA compressed flash files.
2014-10-06 11:13:13 -04: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
Robin Sommer
1555eb65d4 Updating plugin docs.
The remaining components are now supported as well.
2014-10-02 16:39:51 -07:00
Robin Sommer
bd87d7d3c6 Merge remote-tracking branch 'origin/topic/jsiwek/pktsrc-idle'
* origin/topic/jsiwek/pktsrc-idle:
  Fix packet sources being treated as idle when a packet is available.

BIT-1266 #closed

Thanks, Jon!
2014-10-02 12:36:11 -07:00