Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 12:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11299 commits 388 branches 197 tags 276 MiB
Commit graph

11299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yacin Nadji
607af85ac1 Add count_to_double and int_to_double bif functions 2020-12-01 16:35:49 -05:00
Jon Siwek
4498c52a8b Update submodule(s) [nomail] 2020-12-01 09:55:50 -08:00
Tim Wojtulewicz
49293c080d Merge remote-tracking branch 'origin/topic/timw/1184-additional-weird-info' 
* origin/topic/timw/1184-additional-weird-info:
  GH-1184: Add 'source' field to weird log denoting where the weird was reported
 2020-12-01 10:18:00 -07:00
Tim Wojtulewicz
e27008ef26 GH-1184: Add 'source' field to weird log denoting where the weird was reported 2020-12-01 09:34:37 -07:00
Robin Sommer
eccbbb4476 Merge remote-tracking branch 'origin/topic/robin/gh-1179-plugin-loading' 
* origin/topic/robin/gh-1179-plugin-loading:
  Retry loading plugins on failure to resolve to dependencies.
  Fix use of deprecated functionality in test.
  When attempting to activate a plugin, load dynamic libraries first.
  Add test creating multiple plugins with load dependencies.
 2020-12-01 14:51:49 +00:00
Johanna Amann
7477b3ea09 Add a test for compiling with static broker/binpac 2020-12-01 09:56:02 +00:00
Tim Wojtulewicz
616d29c08d Merge remote-tracking branch 'origin/topic/bbannier/debug_logger_lookup' 
* origin/topic/bbannier/debug_logger_lookup:
  Find correct zeek namespace in debug logger macros.
 2020-11-30 14:07:56 -07:00
Jon Siwek
2cbd9ff905 Update submodule(s) [nomail] [skip ci] 2020-11-30 10:42:02 -08:00
zeek-bot
d0bfce6ff4 Update doc submodule [nomail] [skip ci] 2020-11-27 00:34:49 +00:00
Johanna Amann
f55bd8ebb4 Merge remote-tracking branch 'origin/topic/jsiwek/python2-eol' 
* origin/topic/jsiwek/python2-eol:
  Update CentOS CI Dockerfiles to fix git/diff dependencies
  Update CI scripts to remove `python` vs `python3` workarounds
  Remove Python 2 compatibility logic in httpd test script
  Update Python invocations to explicit `python3`
  Update CMake logic to enforce Python >= 3.5
  Update documentation for Python >= 3.5 requirement
  Update all submodules that have Python 2 EOL changes
 2020-11-26 18:17:54 +00:00
Johanna Amann
d82d096f2e Merge remote-tracking branch 'origin/topic/jsiwek/fedora-31-eol' 
* origin/topic/jsiwek/fedora-31-eol:
  Remove Fedora 31 (EOL) from CI
 2020-11-26 17:34:18 +00:00
Johanna Amann
b57a725d24 Update submodule 
[nomail]
 2020-11-26 17:34:00 +00:00
Jon Siwek
acc76a816a Remove Fedora 31 (EOL) from CI 2020-11-25 17:36:38 -08:00
Jon Siwek
5ff44989c4 Update CentOS CI Dockerfiles to fix git/diff dependencies 2020-11-25 15:19:56 -08:00
Jon Siwek
2b3d216c97 Update CI scripts to remove python vs python3 workarounds 2020-11-25 14:57:09 -08:00
Jon Siwek
7d68f2ce9d Remove Python 2 compatibility logic in httpd test script 2020-11-25 14:57:09 -08:00
Jon Siwek
9717c623c2 Update Python invocations to explicit python3 2020-11-25 14:57:09 -08:00
Jon Siwek
eeec219a66 Update CMake logic to enforce Python >= 3.5 2020-11-25 14:57:09 -08:00
Jon Siwek
33a55a04c3 Update documentation for Python >= 3.5 requirement 2020-11-25 14:57:09 -08:00
Jon Siwek
459dc91463 Update all submodules that have Python 2 EOL changes 2020-11-25 14:57:09 -08:00
Robin Sommer
fe45f5335a Retry loading plugins on failure to resolve to dependencies. 
Closes #1179.
 2020-11-25 15:07:32 +00:00
Jon Siwek
ea841f32b1 Update submodule(s) [nomail] 2020-11-24 15:43:55 -08:00
Jon Siwek
499cb11dc3 Merge remote-tracking branch 'origin/topic/christian/libdir-improvements' 
* origin/topic/christian/libdir-improvements:
  Update CMakeLists.txt to make portability symlink absolute
  Improve support for custom libdir locations
 2020-11-24 15:24:14 -08:00
Vlad Grigorescu
1220d3695d Fix SMB2 response status parsing. Fixes #1286 2020-11-24 15:45:12 -06:00
Christian Kreibich
e70b308c16
Update CMakeLists.txt to make portability symlink absolute 
Co-authored-by: Jon Siwek <jsiwek@corelight.com>
 2020-11-24 12:05:03 -08:00
Robin Sommer
b780bc146f Fix use of deprecated functionality in test. 2020-11-24 17:00:20 +00:00
Robin Sommer
df40e82fd6 When attempting to activate a plugin, load dynamic libraries first. 
Just moving code. This is so that we can abort if dlopen() fails without
having changed any other state yet.
 2020-11-24 16:59:27 +00:00
Robin Sommer
3ebfcdf0ae Add test creating multiple plugins with load dependencies. 
If we load plugins purely alphabetically, the 1st Zeek run in the test
will success while the 2nd will fail.
 2020-11-24 16:59:11 +00:00
Jon Siwek
f70a7cb4d3 Merge remote-tracking branch 'origin/topic/timw/internal-type-symbols' 
* origin/topic/timw/internal-type-symbols:
  Move implementation of internal_{type,var,etc} methods back into global namespace.
 2020-11-23 21:50:47 -08:00
Jon Siwek
08c8b741a9 Merge remote-tracking branch 'origin/topic/neverlord/ubuntu-16-image' 
* origin/topic/neverlord/ubuntu-16-image:
  Simplify CI dependencies and setup
 2020-11-23 21:41:55 -08:00
Jon Siwek
3b58b67367 Merge branch 'patch-3' of https://github.com/ottobackwards/zeek 
* 'patch-3' of https://github.com/ottobackwards/zeek:
  Update .gitignore to ignore pyenv .python-version
 2020-11-23 21:35:19 -08:00
Dominik Charousset
b8e4931681 Simplify CI dependencies and setup 2020-11-23 17:10:15 +01:00
Benjamin Bannier
b42396340e Find correct zeek namespace in debug logger macros. 
These macros forward to functionality in `zeek::detail::debug_logger`
and are not intended for customization. This patch fixes the macros to
always use `::zeek::detail::debug_logger` as without the leading `::`
lookup could happen in any potentially local namespace `zeek` which does
not need to provide this symbol.

This closes zeek/spicy#597.
 2020-11-23 10:58:23 +01:00
Otto Fowler
81362de064
Update .gitignore to ignore pyenv .python-version 
You may have this file if you have multiple versions of python installed, and zeek doesn't build with all of them
 2020-11-21 22:50:44 -05:00
zeek-bot
aac003223f Update doc submodule [nomail] [skip ci] 2020-11-21 00:33:51 +00:00
Christian Kreibich
ec76b2510a Improve support for custom libdir locations 
- Remove hardwiring of $ZEEK_ROOT/lib throughout the three and
  defaults the name of Zeek's library directory to the default on the
  given platform (e.g. lib64), via GNUInstallDirs.

- Consistently use that lib directory, instead of two lib folders
  resulting when using a custom libdir.

- Remove the old lib directory in the installation prefix, if one exists

- Add --lib_dir to zeek-config (and sort its options a bit).

- Bump submodules for corresponding changes
 2020-11-19 23:27:10 -08:00
Jon Siwek
8d0f2f9ab7 Merge remote-tracking branch 'origin/topic/timw/fix-email-regex' 
* origin/topic/timw/fix-email-regex:
  Reverts the regex change in dead3226a5.
 2020-11-19 18:09:47 -08:00
Vern Paxson
147eee5b17 merge glitch 2020-11-19 17:15:30 -08:00
Vern Paxson
22a913d8f5 Merge branch 'topic/vern/script-inlining' of github.com:zeek/zeek into topic/vern/script-inlining 2020-11-19 17:14:12 -08:00
Vern Paxson
6894e4c5e1 updates from test suite 2020-11-19 17:13:36 -08:00
Vern Paxson
c42586af2c inlining of Zeek script functions 2020-11-19 16:16:59 -08:00
Vern Paxson
30b29ef7ba inlining of Zeek script functions 2020-11-19 16:05:42 -08:00
zeek-bot
3c39f11726 Update doc submodule [nomail] [skip ci] 2020-11-19 00:34:23 +00:00
Tim Wojtulewicz
01ec5ebdcd Reverts the regex change in dead3226a5. 
The regex change broke some of the external tests. I added some more cases
to the regular email btest to hopefully cover all of the cases better.
 2020-11-18 15:35:17 -07:00
Tim Wojtulewicz
a56fbe408f Merge remote-tracking branch 'christina23/master' 
* christina23/master:
  Added unit tests for regex fix
  Improved regex for SMTP parsing
 2020-11-17 15:01:21 -07:00
Jon Siwek
824ff81bf6 Merge remote-tracking branch 'origin/topic/johanna/1033' 
- Fixed signed/unsigned comparison compiler warning
- Did other minor changes to address efficiency nitpicks

* origin/topic/johanna/1033:
  BrokerStore <-> Zeek Tables: support complex indices
 2020-11-17 13:34:26 -08:00
Tim Wojtulewicz
c8cf1988e5 Move implementation of internal_{type,var,etc} methods back into global namespace. 
This fixes an unknown symbol error if using those methods. They're defined as extern
in the global namespace in Var.h, but Var.cc had their implementations defined in
the zeek::detail namespace.
 2020-11-17 15:17:23 +00:00
Johanna Amann
44ae8f9e8f BrokerStore <-> Zeek Tables: support complex indices 
This change adds support for complex indexes for sets and tables. With
this change, sets with indexes like:

set[string, count, count]

will function. Before this change, Zeek raised an error message in these
cases.

Addresses GH-1033
 2020-11-17 14:48:10 +00:00
Johanna Amann
995d889789 Merge remote-tracking branch 'origin/topic/jsiwek/fix-ConnectionEvent-leak' 
* origin/topic/jsiwek/fix-ConnectionEvent-leak:
  Fix memory leak in deprecated Analyzer::ConnectionEvent()
 2020-11-17 11:51:27 +00:00
Jon Siwek
6503068922 Fix memory leak in deprecated Analyzer::ConnectionEvent() 2020-11-16 16:38:59 -08:00