Commit graph

1825 commits

Author SHA1 Message Date
Jon Siwek
2a8de33c63 Merge remote-tracking branch 'origin/topic/jsiwek/gh-1122'
* origin/topic/jsiwek/gh-1122:
  GH-165: Fix global initializations that indirectly use builtin types
  Improve how primary/top-level BIFs get initialized
  GH-1122: Allow initializing globals with calls to subdir BIFs
  GH-1122: Improve error for global record initialization exceptions
2020-09-04 17:24:50 -07:00
Jon Siwek
c7408482b4 Change a script comment to use "code-block" directive 2020-09-03 15:03:12 -07:00
Jon Siwek
48e2445600 Merge remote-tracking branch 'origin/topic/jsiwek/skip-ci-benchmark'
* origin/topic/jsiwek/skip-ci-benchmark:
  Improve CI benchmark script's error handling/messaging
2020-09-02 20:51:35 -07:00
Johanna Amann
425b6104c5 Merge remote-tracking branch 'origin/topic/jsiwek/gh-955-prohibit-typecasting-switch-fallthrough'
* origin/topic/jsiwek/gh-955-prohibit-typecasting-switch-fallthrough:
  GH-955: Prohibit `fallthrough` in typecasting `switch` cases

Closes GH-955
2020-09-02 11:49:28 -07:00
Jon Siwek
efcdacda98 Switch generate-docs action to daily schedule 2020-09-01 22:34:11 -07:00
Jon Siwek
7865e38134 Fix generate-docs action to not fail when there's no changes 2020-09-01 20:34:47 -07:00
Jon Siwek
d51e0f73b7 Update generate-docs action to use access token for submodule update 2020-09-01 19:50:44 -07:00
Jon Siwek
49de7199d7 Update generate-docs action to install Sphinx dependency 2020-09-01 18:38:24 -07:00
Jon Siwek
b064f097ee Add missing configure step for doc-generation action 2020-09-01 17:59:10 -07:00
Jon Siwek
d99c5aaf7d Improve documentation for rfind_str() 2020-09-01 17:54:44 -07:00
Jon Siwek
f6e48c3a18 Reformat strings.bif Zeekygen comments to fix Sphinx warnings 2020-09-01 11:58:52 -07:00
Jon Siwek
5e6bb843ab Merge remote-tracking branch 'origin/topic/timw/174-duplicate-attributes'
- Replaced "tag" with "attribute" in the error message since the former
  is not exactly the same concept/meaning and also not user-facing
  terminology

* origin/topic/timw/174-duplicate-attributes:
  Allow duplicate attributes in full redefs
  Short-circuit checking of whether attr exists
  Expanded check for other tag types, fixed btest to cover more tags
  GH-174: Add warning for duplicate attributes
2020-08-31 17:39:47 -07:00
Jon Siwek
5ab20dfcb9 Simplify a broker btest
The explicit sorting function definition was a temporary stability
workaround with a better fix now being available via
https://github.com/zeek/btest/pull/25
2020-08-31 15:01:23 -07:00
Johanna Amann
b8a47de26c Merge remote-tracking branch 'origin/topic/jsiwek/gh-926-ternary-type-checking'
* origin/topic/jsiwek/gh-926-ternary-type-checking:
  GH-926: Improve type-checking for ternary conditional operator

Fixes GH-926
2020-08-28 16:52:29 -07:00
Jon Siwek
dc9e175a61 Potentially improve intel/remove-item-cluster btest 2020-08-27 18:01:33 -07:00
Jon Siwek
5b25870c83 Merge remote-tracking branch 'origin/topic/timw/158-packet-filter-option'
* origin/topic/timw/158-packet-filter-option:
  GH-158: Ensure packet-filter framework is loaded if -f option is passed
2020-08-27 15:34:31 -07:00
Jon Siwek
cf63da7975 Merge remote-tracking branch 'origin/topic/vlad/gh-1145'
* origin/topic/vlad/gh-1145:
  Fix another umask issue. #1145

Fixes GH-1145
2020-08-27 11:15:00 -07:00
Jon Siwek
ff0aa6b050 Merge remote-tracking branch 'origin/topic/timw/rename-binpac_bro'
* origin/topic/timw/rename-binpac_bro:
  Rename bro-bif.h to zeek-bif.h
  Fix uses of bro.pac to use zeek.pac
  Rename the bro-related binpac files to zeek
2020-08-26 11:21:17 -07:00
Jon Siwek
b232474fce Merge remote-tracking branch 'origin/topic/vlad/gh-1145'
* origin/topic/vlad/gh-1145:
  Have mkdir in ensure_dir respect umask.
2020-08-26 11:00:38 -07:00
Jon Siwek
427a7de411 Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part5'
- Did a few whitespace re-adjustments during merge

* origin/topic/timw/266-namespaces-part5:
  Update plugin btests for namespace changes
  Plugins: Clean up explicit uses of namespaces in places where they're not necessary.
  Base: Clean up explicit uses of namespaces in places where they're not necessary.
2020-08-25 19:51:42 -07:00
Jon Siwek
99d9a3a48c Fix closing timestamp of rotated log files in supervised-cluster mode 2020-08-25 17:06:10 -07:00
Jon Siwek
8d3c07b62a Improve an Intel framework btest
Relying on non-atomic `cp` operation may not cooperate well with the
Input framework file re-reading logic.
2020-08-25 14:36:52 -07:00
Jon Siwek
80a573d2b2 Merge remote-tracking branch 'origin/topic/timw/smith-waterman-iterators'
* origin/topic/timw/smith-waterman-iterators:
  Mark Continuation.h and PacketDumper.h as deprecated
  Remove vector iterator type aliases from SmithWaterman code, fix uses of them
2020-08-24 19:21:21 -07:00
Tim Wojtulewicz
8012914c16 Merge remote-tracking branch 'origin/topic/robin/gh-574-processing-status'
* origin/topic/robin/gh-574-processing-status:
  Make set_processing_status() signal-safe.
2020-08-24 14:44:06 -07:00
Tim Wojtulewicz
b687730a01 Merge remote-tracking branch 'origin/topic/jsiwek/gh-710-expire-func-type-check'
* origin/topic/jsiwek/gh-710-expire-func-type-check:
  GH-710: Check that &expire_func is a function and not hook/event
2020-08-24 14:30:58 -07:00
Tim Wojtulewicz
fec45a8be2 Merge remote-tracking branch 'origin/topic/jsiwek/extra-pktsrc-process'
* origin/topic/jsiwek/extra-pktsrc-process:
  Fix a case where PktSrc gets processed twice in one runloop iteration
2020-08-24 14:28:38 -07:00
Tim Wojtulewicz
60443e3178 Merge remote-tracking branch 'origin/topic/jsiwek/gh-594-improve-table-init-type-checking'
* origin/topic/jsiwek/gh-594-improve-table-init-type-checking:
  GH-594: Improve table initialization type-check error messages
2020-08-24 14:27:52 -07:00
Jon Siwek
9f802b2a4d Merge remote-tracking branch 'origin/topic/timw/fix-component-canon-name'
* origin/topic/timw/fix-component-canon-name:
  Fix issue with canonical names not printing for file analyzers
2020-08-21 13:47:31 -07:00
Jon Siwek
20dbc001a1 Remove definition-less ThreadVal<->BrokerData conversion functions
Their presence/deprecation may cause "undefined reference" build
failures for some compilers (GCC 9.3.0 in my case).
2020-08-21 13:33:42 -07:00
Tim Wojtulewicz
046eb58b75 Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part4'
* origin/topic/timw/266-namespaces-part4: (34 commits)
  Add missing namespace to usage of get_exe_path in fuzzer
  Rename methods in RunState to remove 'net' from their names
  Move zeek::net namespace to zeek::run_state namespace.
  Move ScannedFile class and associated globals into ScannedFile.h and out of Net.h and scan.l
  Rename types in ZeekList.h to be consistent with the style guide
  Move NetVar from zeek to zeek::detail namespace
  Remove PRI_PTR_COMPAT macros
  Fix indentation of namespaced aliases
  Move zeek-setup code into namespaces
  Move ZeekList types to zeek namespace
  Move __RegisterBif from zeek::detail::plugin to zeek::plugin::detail
  Remove unimplemented zeek_magic_path/bro_magic_path method
  Move all plugin classes into zeek::plugin::detail namespaces
  Rename BroList.h to ZeekList.h
  Move a few smaller files to zeek namespaces
  Tag the end of some namespaces for consistency
  Move a few of the zeek::util methods and variables to zeek::util::detail
  Move zeekygen code to zeek::zeekygen::detail namespace
  Mark zeek::util::pad_size as constexpr, which provides a small performance improvement
  Move everything in util.h to zeek::util namespace.
  ...
2020-08-21 08:37:38 -07:00
Jon Siwek
038fb1c08e Improve stability of config/cluster_resend btest 2020-08-20 16:26:46 -07:00
Jon Siwek
903191e568 Merge remote-tracking branch 'origin/topic/timw/coverity'
* origin/topic/timw/coverity:
  Mark FileAssembler destructor as default, remove implementation
  Remove a few protected or private no-op constructors
  Properly initialize Timer::type. Fixes Coverity 1431144.
  Properly initialize members of Reassembler. Fixes Coverity 1413348.
  Fix a number of Coverity issues in Dict
2020-08-20 14:57:06 -07:00
Tim Wojtulewicz
8411adf9e1 Merge remote-tracking branch 'FlyingWithJerome/master'
* FlyingWithJerome/master:
  remove variables in netvar, use tabs in DNS.h and polish comments in dns events.
  add new line at the end of the test baseline
  add data+=option_len to skip unknown bytes
  better explanation to server cookie
  better explanation to server cookie
  add edns-cookie testcase
  remove data+=option_len error in cookie and keepalive
  add EDNS cookie parsing
  lazy commit
  lazy commit
  lazy commit
  add testcases
  add units (100ms) to comments
  initial adding EDNS TCP keepalive
2020-08-20 10:41:51 -07:00
Tim Wojtulewicz
f7bec7d7ef Merge remote-tracking branch 'origin/topic/jsiwek/strings-bif-warnings'
* origin/topic/jsiwek/strings-bif-warnings:
  Misc strings.bif adjustments
2020-08-19 14:36:12 -07:00
Tim Wojtulewicz
589dcf5697 Merge remote-tracking branch 'origin/topic/jsiwek/coverity-1431151'
* origin/topic/jsiwek/coverity-1431151:
  Use constexpr for IPAddr::v4_mapped_prefix declaration
2020-08-19 14:12:26 -07:00
Jon Siwek
69cbeb7a1b Update docs for configuring CI email notifications
Secrets are now stored organization-wide rather than per-repository.
2020-08-19 11:51:27 -07:00
Jon Siwek
3fc86a39b8 Merge remote-tracking branch 'origin/topic/robin/gh-467-addto'
- In this merge commit: fixed parentheses/typo that breaks compilation

* origin/topic/robin/gh-467-addto:
  Catch if &add_func/&delete_func is applied to IDs that don't have values.
2020-08-18 12:15:29 -07:00
Tim Wojtulewicz
b89935107d Merge remote-tracking branch 'origin/topic/timw/178-string-functions'
* origin/topic/timw/178-string-functions:
  GH-178: Add new string bif methods based on python string utilities
2020-08-14 10:00:29 -07:00
Johanna Amann
7f267d3e87 Merge remote-tracking branch 'origin/topic/jazoff/gh-1105'
* origin/topic/jazoff/gh-1105:
  Accept bracketed ipv6 addresses
2020-08-12 20:04:37 +00:00
Tim Wojtulewicz
c6e7d14757 Merge remote-tracking branch 'origin/topic/timw/open-dict'
* origin/topic/timw/open-dict: (40 commits)
  Move Dict constants to detail namespace
  Add a few missing deprecation fixes
  Adjust Dict whitespace/style
  Adjust more btest timings
  Improve termination reliability/speed for brokerstore btests
  General btest cleanup
  Update NEWS about change in Dictionary implementation
  Improve Intel expire-item btest to be less time-sensitive
  Improve btests with unstable table/set output ordering
  Update doc submodule
  Adjust a few btests that were unstable due to time-sensitivity
  Fix DNS script deleting a table element while iterating
  Improve a brokerstore btest to filter out Broker connection messages
  Sort output of a few SumStats cluster tests
  Fix extract_first_email_addr() to really return the first email
  Add find_all_ordered() BIF
  Extend external test suite canonifier with set-sorting logic
  Update btests/baselines for OpenDict compat
  Fix new/malloc/delete/free mismatches in Dictionary code
  Add explanation for a Dict TODO item
  ...
2020-08-11 11:38:14 -07:00
Jon Siwek
747c681ecf Merge remote-tracking branch 'origin/topic/jsiwek/gh-1100-multipart-body-length'
* origin/topic/jsiwek/gh-1100-multipart-body-length:
  GH-1100: Fix reported body-length of HTTP messages w/ sub-entities
2020-08-10 09:58:01 -07:00
Jon Siwek
8f4138262f Merge remote-tracking branch 'origin/topic/jsiwek/fix-fuzz-target-warnings'
* origin/topic/jsiwek/fix-fuzz-target-warnings:
  Fix deprecation warnings in fuzz targets
  Remove dbg_read_internal_state()
2020-08-05 12:36:33 -07:00
Johanna Amann
8e99d4b170 Merge remote-tracking branch 'origin/topic/jsiwek/gh-1080-error-on-enum-redefinition-conflict'
* origin/topic/jsiwek/gh-1080-error-on-enum-redefinition-conflict:
  Fix incorrect conflict detection of namespaced-enum-names
  Improve error message for an enum name conflicting with non-enum ID
  GH-1080: Treat enum name re-use across different enum types as an error
  GH-1080: Rename conflicting NetControl::DROP enum definitions

Fixes GH-1080
2020-08-04 20:25:40 +00:00
Tim Wojtulewicz
dbd8a4fc9f Merge remote-tracking branch 'origin/topic/jsiwek/silence-type-counter-warnings'
* origin/topic/jsiwek/silence-type-counter-warnings:
  Silence compiler warnings related to deprecated TYPE_COUNTER
2020-08-04 08:47:26 -07:00
Johanna Amann
22b401f52f Merge remote-tracking branch 'origin/topic/johanna/1095-just-get-rid-of-it'
* origin/topic/johanna/1095-just-get-rid-of-it:
  Re-add TYPE_COUNTER without function and deprecation marker.
  Completely remove all traces of the COUNTER type.
2020-08-03 10:44:43 -07:00
Tim Wojtulewicz
94e0298f2e Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part3'
* origin/topic/timw/266-namespaces-part3: (24 commits)
  Properly forward-declare zeek::plugin::plugin in DebugLogger
  Rename Brofiler to ScriptCoverageManager
  Move Conn and related types to zeek namespace
  Move reassembler code to namespaces
  Move Session code to namespaces
  Move ODesc to zeek namespace
  Move Stats and related classes to zeek::detail
  Move a few low-use classes to namespaces
  Move DebugLogger to zeek namespaces
  Move all of the hashing classes/functions to zeek::detail namespace
  Move all of the Packet-related classes to namespaces
  Move EventMgr, EventHandler, and EventRegistry code to zeek namespace. Rename mgr to event_mgr.
  Move Timer and PriorityQueue classes to namespaces
  Move BroFile to zeek namespace, rename to File
  Move Reporter to zeek namespace
  Move DNS_Mgr to zeek::detail namespace
  Move BroSubstring to zeek::detail, rename to Substring
  Move regex matching code to zeek namespaces
  Move all of the rule matching code to zeek::detail
  Move IP Addr/Prefix/Header classes into namespaces
  ...
2020-08-01 09:22:03 -07:00
Johanna Amann
01fa5611ef Merge remote-tracking branch 'origin/topic/timw/clang-tidy'
* origin/topic/timw/clang-tidy:
  Don't specify 0u for initial value of loops changed to size_t
  Use .empty() instead of checking size against zero
  Use properly-sized loop variables or convert to ranged-for (bugprone-too-small-loop-variable)

Merge changes one type over to ptrdiff_t
2020-07-30 17:54:38 +00:00
Johanna Amann
aa3d94a3cd Merge remote-tracking branch 'origin/topic/jsiwek/gh-1083-fix-input-set-events'
* origin/topic/jsiwek/gh-1083-fix-input-set-events:
  GH-1083: Fix Input Framework 'change' events for 'set' destinations

Fixes GH-1083
2020-07-28 19:59:48 +00:00
Jon Siwek
8a5490405d Update site/local.zeek compatibility test 2020-07-27 12:05:10 -07:00
Jon Siwek
20c9e54f9b Reserve spot in NEWS for 4.0.0 2020-07-27 11:53:01 -07:00