Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
6849 commits 385 branches 195 tags 262 MiB
Commit graph

6849 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Sommer
5ef6dd0e3c Adding call to new binpac::init() function. 2014-10-31 17:44:58 -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
Robin Sommer
2e7b732c4b Merge remote-tracking branch 'origin/topic/jsiwek/bit-1280' 
* origin/topic/jsiwek/bit-1280:
  BIT-1280: Fix checking vector indices via "in".

BIT-1280 #merged.
 2014-10-31 16:28:08 -07:00
Vlad Grigorescu
743d388be8 Merge remote-tracking branch 'origin/master' into topic/vladg/mysql 2014-10-31 16:46:07 -04:00
Vlad Grigorescu
b484da1539 Update baselines. 2014-10-31 16:45:48 -04:00
Vlad Grigorescu
c601ebccb8 Fix a logic bug with handling quits after the cleanup. 2014-10-31 16:24:48 -04:00
Jon Siwek
3b4e5eda55 BIT-1283: Fix crash when using &encrypt. 2014-10-31 12:13:27 -05:00
Vlad Grigorescu
119ad59b70 Integrate MySQL with the software framework 2014-10-31 12:17:47 -04:00
Vlad Grigorescu
e2ad93c543 A bit of MySQL cleanup - removed unused events, consolidated similar events, fixed up main.bro a bit 2014-10-31 12:08:13 -04: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
Christian Struck
c705375537 [ADD] made code event based, changed code style 
the openflow framework does now use events to signal
the success or failure of openflow commands, further
the reporter framework is used to log errors.

added bro unique cookie, so the framework can recognize
which flows it installed and which not.

documented all of the code.

the code style should now me more like the rest of the
bro code.
 2014-10-30 18:12:55 -07: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
bcdeef6012 Move Kerberos analyzer to the new plugin architecture. 2014-10-27 14:03:40 -04:00
Vlad Grigorescu
e6d6ba6ec6 Merge remote-tracking branch 'origin/master' into topic/vladg/kerberos 
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:56:07 -04: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
Christian Struck
bf6dc12be4 [ADD] the possibility to remove flows and refactored the flow_mod function to fit the new capabilities. Also started to comment more of the code 2014-10-23 18:20:40 -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
6c2a8cdff4 Seth's *any type* to JSON converter, slightly changed 2014-10-20 17:13:01 -07:00
Christian Struck
676207e968 Small implementation of the RYU restAPI functionality to add flows. 2014-10-20 17:10:49 -07:00
Christian Struck
d426f36ebe Small openflow api, that provides functionality to add flows. 2014-10-20 17:09:44 -07:00
Christian Struck
5555757b2d Simple test sciprt that uses a RYU controller with its restAPI and shunts a flow after a specified amount of traffic 2014-10-20 17:05:13 -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