Commit graph

15378 commits

Author SHA1 Message Date
Christian Kreibich
c887bcb517 Merge remote-tracking branch 'origin/topic/awelzel/simple-scan-over-scan-zeek'
* origin/topic/awelzel/simple-scan-over-scan-zeek:
  Deprecate misc/scan.zeek
2022-08-23 10:19:47 -07:00
Christian Kreibich
4ed15857b8 Merge remote-tracking branch 'origin/topic/awelzel/vector-value-iteration'
* origin/topic/awelzel/vector-value-iteration:
  stmt: Support iterating over vector values
2022-08-23 09:40:12 -07:00
Benjamin Bannier
13d011da66 Use correct variable to pass existing Spicy root to spicy-plugin.
spicy-plugin can find Spicy in paths given by `SPICY_ROOT_DIR` while
`./configure` instead set `SPICY_ROOT`. With this patch we now set the
correct variable.

We also adjust variations of the previous variable name with different
capitalization which caused us to not properly configure spicy-plugin
(which triggers finding Spicy in its given prefix).

Closes #2363.
2022-08-23 09:10:57 +02:00
Arne Welzel
6dc585bd8c Deprecate misc/scan.zeek
Update bare-mode-errors test to ignore that specific message.
2022-08-23 09:10:53 +02:00
Christian Kreibich
f5df2a132a Merge branch 'topic/christian/docker-artifact-truncation'
* topic/christian/docker-artifact-truncation:
  Truncate Docker image artifact at end of Docker CI workflow
2022-08-22 17:34:30 -07:00
Tim Wojtulewicz
e308712534 Merge remote-tracking branch 'origin/topic/timw/2354-bytestring-len-warnings'
* origin/topic/timw/2354-bytestring-len-warnings:
  Fix signed comparison warnings in bytestring_to_count
2022-08-22 16:12:38 -07:00
Tim Wojtulewicz
e9f8fdab8f Fix signed comparison warnings in bytestring_to_count 2022-08-22 22:42:22 +00:00
Christian Kreibich
1e52f173ba Merge branch 'topic/christian/zeekygen-add-plugin-labels'
* topic/christian/zeekygen-add-plugin-labels:
  Bump doc to pull in Sphinx exclusion for autogenerated files
  Remove long-unused BRO_DISABLE_BROXYGEN env var from btests
  Add Sphinx label to Zeekygen-generated plugin docs
2022-08-22 14:30:39 -07:00
Tim Wojtulewicz
6e0e1f71db Merge branch 'topic/timw/parse-packet-results'
* topic/timw/parse-packet-results:
  Make result of IP::ParsePacket easier to understand
  Remove reporter warning for bad IP protocols
2022-08-22 10:57:10 -07:00
Tim Wojtulewicz
aa79356963 Make result of IP::ParsePacket easier to understand 2022-08-22 10:56:20 -07:00
Tim Wojtulewicz
40b1452905 Remove reporter warning for bad IP protocols
It turns out that this can be *very* spammy on networks where we're receiving
lots of these packets, and can fill up the reporter log very quickly. Weirds are
already reported in all of these cases anyways, so it doesn't make sense to log
a reporter warning too.
2022-08-22 10:56:20 -07:00
Dominik Charousset
6565b4862d Add missing bits for Broker::metrics_import_topics 2022-08-22 17:10:07 +02:00
Arne Welzel
f334df3b79 stmt: Support iterating over vector values
I ran into wanting to iterate over just the values of a vector and wondering
whether that could just work.

This adds support for the following, where v will be value of vec[i].

    local vec = vector("zero", "one", "two");

    for ( i, v in vec )
        print i, v;
2022-08-22 16:57:37 +02:00
Christian Kreibich
17a140b67a Bump doc to pull in Sphinx exclusion for autogenerated files 2022-08-19 17:19:30 -07:00
Christian Kreibich
f1a9108199 Remove long-unused BRO_DISABLE_BROXYGEN env var from btests 2022-08-19 15:31:55 -07:00
Christian Kreibich
0efdee0715 Add Sphinx label to Zeekygen-generated plugin docs
Plugin documentation generated by Zeekygen is currently difficult to reference
from elsewhere in the docs because references prefer labels for unique
identification. This expands the plugin section headings with a unique label,
based on the plugin name.

For example, the documentation for a plugin called Zeek::Foobar becomes linkable
from anywhere via :ref:`plugin-zeek-foobar`.
2022-08-19 15:31:54 -07:00
Christian Kreibich
0f8e675a49 Merge branch 'topic/awelzel/unified2-drop'
* topic/awelzel/unified2-drop:
  Remove unified2 file analyzer
2022-08-19 15:23:34 -07:00
Christian Kreibich
c3d75e4f1b Merge remote-tracking branch 'origin/topic/awelzel/barnyard2-drop'
* origin/topic/awelzel/barnyard2-drop:
  Remove barnyard2 integration scripts
2022-08-19 14:59:55 -07:00
Arne Welzel
8d19fa23ef Remove unified2 file analyzer 2022-08-19 14:05:00 +02:00
Arne Welzel
78beecf37d Remove barnyard2 integration scripts 2022-08-19 14:04:27 +02:00
Christian Kreibich
b20f2b5b98 Merge branch 'topic/christian/news-log-preds-coverage'
* topic/christian/news-log-preds-coverage:
  Retroactively cover log filter predicate deprecation/removal in NEWS
2022-08-18 15:57:11 -07:00
Christian Kreibich
a2e05a17e2 Retroactively cover log filter predicate deprecation/removal in NEWS 2022-08-18 14:51:38 -07:00
Christian Kreibich
c150f7805b Truncate Docker image artifact at end of Docker CI workflow
In the (private) zeek-security repo we currently hit the 2GB storage limit
whenever CI runs happen multiple times in one day, because our Docker Github
workflow preserves the output of the first job (the image build) for the second
job (the cluster tests).

For successful runs, there's no need for the Docker image to survive the CI
run. (For failures, it might help to grab the image for local testing.)

There's no Github-official way to delete an attachment within a workflow, so
this simply truncates the artifact if the workflow succeeds.
2022-08-18 14:36:20 -07:00
zeek-bot
bd1190bfeb Update doc submodule [nomail] [skip ci] 2022-08-18 00:42:35 +00:00
Tim Wojtulewicz
20fe96c706 Merge remote-tracking branch 'origin/topic/timw/695-bytestring-to-count'
* origin/topic/timw/695-bytestring-to-count:
  Support other byte lengths in bytestring_to_count
2022-08-17 15:46:17 -07:00
Tim Wojtulewicz
90f0e7a6ea Support other byte lengths in bytestring_to_count 2022-08-17 15:45:30 -07:00
Christian Kreibich
73f20ba761 Merge branch 'topic/christian/help-tweak'
* topic/christian/help-tweak:
  Alignment tweak in help output
2022-08-17 13:31:23 -07:00
Tim Wojtulewicz
60d840c231 Merge remote-tracking branch 'origin/topic/timw/163-event-lookup'
* origin/topic/timw/163-event-lookup:
  GH-163: Use ID name (including module name) to create EventExpr when possible
2022-08-17 13:29:10 -07:00
Tim Wojtulewicz
687dd05ddb GH-163: Use ID name (including module name) to create EventExpr when possible
The change to the capture-loss test is actually a fix for a bug exposed by the
code change. Previously it wasn't firing the scheduled event because of a failed
name lookup. Now that the lookup has been fixed, the event happens twice.
2022-08-17 13:15:01 -07:00
Christian Kreibich
b0001613f5 Alignment tweak in help output 2022-08-17 12:35:43 -07:00
Tim Wojtulewicz
a0a2a18337 Merge remote-tracking branch 'origin/topic/timw/fuzzer-forward-stream'
* origin/topic/timw/fuzzer-forward-stream:
  Use ForwardStream in fuzzers instead of DeliverStream
2022-08-17 09:01:03 -07:00
Tim Wojtulewicz
90e721807a Use ForwardStream in fuzzers instead of DeliverStream 2022-08-17 08:56:37 -07:00
Arne Welzel
c6ca89a590 parse.y/anonymous_function: Allow conditionals between begin_lambda and lambda_body
This is to allow conditional statements following a lambda header
(begin_lambda) just as is done with func_hdr conditional_list func_body.
2022-08-17 13:40:25 +02:00
Robin Sommer
fad18cb352
Fix code formatting. 2022-08-17 10:38:33 +02:00
Robin Sommer
598cef21bd
Merge ssh://github.com/fatemabw/zeek
* ssh://github.com/fatemabw/zeek:
  Update options.zeek
  Create out-27
  Add files via upload
  Update src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc
  Updating the weird names to use all lower case
  Fixing whitespaces..
  Fixing clang pre-commit error
  Add check for option 27
  Add the parsed fields for TCP option 27
  Add TCP options bad length check
2022-08-17 09:09:58 +02:00
Robin Sommer
39148ef706
Merge remote-tracking branch 'origin/topic/awelzel/files-log-unrolling'
I removed `deprecated-txhosts-rxhosts-connuids.zeek` from
`local.zeek`, seems preferable not to have a script-to-go-away in the
standard configuration for new users. Also tweaked `NEWS` just a tiny
bit.

* origin/topic/awelzel/files-log-unrolling:
  files.log: Unroll and introduce uid and id fields
2022-08-17 09:01:43 +02:00
Tim Wojtulewicz
963ba61b8e Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
* origin/topic/timw/coverity-fixes:
  Fix a swath of AUTO_CAUSES_COPY issues reported by Coverity
2022-08-16 09:17:22 -07:00
Arne Welzel
d2314d2666 files.log: Unroll and introduce uid and id fields
This is a script-only change that unrolls File::Info records into
multiple files.log entries if the same file was seen over different
connections by single worker. Consequently, the File::Info record
gets the commonly used uid and id fields added. These fields are
optional for File::Info - a file may be analyzed without relation
to a network connection (e.g by using Input::add_analysis()).

The existing tx_hosts, rx_hosts and conn_uids fields of Files::Info
are not meaningful after this change and removed by default. Therefore,
files.log will have them removed, too.

The tx_hosts, rx_hosts and conn_uids fields can be revived by using the
policy script frameworks/files/deprecated-txhosts-rxhosts-connuids.zeek
included in the distribution. However, with v6.1 this script will be
removed.
2022-08-16 17:22:20 +02:00
Tim Wojtulewicz
2abc82722f Fix a swath of AUTO_CAUSES_COPY issues reported by Coverity 2022-08-15 09:45:46 -07:00
Tim Wojtulewicz
f631551ffb Merge remote-tracking branch 'origin/topic/timw/update-private-tests'
* origin/topic/timw/update-private-tests:
  Update zeek-testing-private commit hash after email regex changes
2022-08-15 09:22:44 -07:00
Tim Wojtulewicz
b5b022449e Update zeek-testing-private commit hash after email regex changes
Related to https://github.com/zeek/zeek/pull/2221
2022-08-12 16:44:25 -07:00
Fatema BW
61244738c8
Update options.zeek 2022-08-11 18:29:12 -07:00
Fatema BW
e92c252b3d
Create out-27 2022-08-11 18:27:28 -07:00
Fatema BW
4609429aa4
Add files via upload 2022-08-11 18:23:02 -07:00
Fatema BW
d9632631ce
Merge branch 'zeek:master' into master 2022-08-11 18:20:31 -07:00
zeek-bot
148f5c1403 Update doc submodule [nomail] [skip ci] 2022-08-12 00:42:29 +00:00
Tim Wojtulewicz
7fe6290974 Merge remote-tracking branch 'micrictor/master'
* micrictor/master:
  Add a field to Modbus/TCP log to indicate the Modbus PDU type
  Add modbus transaction and unit ids to logs
  Enable modbus logging for requests
2022-08-11 11:57:10 -07:00
Tim Wojtulewicz
e618be094a Merge remote-tracking branch 'theavgjojo/master'
* theavgjojo/master:
  UPDATED: improving email address splitting for common comma case
2022-08-11 10:41:18 -07:00
Tim Wojtulewicz
957dc1d6dd Merge remote-tracking branch 'origin/topic/timw/2142-more-fuzzers'
* origin/topic/timw/2142-more-fuzzers:
  Fix a crash related to a broken IPv6 chain
  Add a couple of ICMP files to corpus for packet-fuzzer
  Trick event handlers into returning that they exist during fuzzing
  Add http, ftp, imap, and smtp fuzzers and corpora
  Add section to fuzzer README about generating corpus from pcaps
  Rename fuzzers/README to README.rst so github renders it
2022-08-11 10:30:42 -07:00
Tim Wojtulewicz
95029bd471 Fix a crash related to a broken IPv6 chain 2022-08-11 09:08:07 -07:00