Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 07:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
13262 commits 386 branches 195 tags 257 MiB
Commit graph

13262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Wojtulewicz
b77ede4bed Merge PQ_Timer into base TimerMgr class 2022-06-14 12:59:14 -07:00
Tim Wojtulewicz
0edc331ca1 Merge remote-tracking branch 'turrisxyz/Pinned-Dependencies-GitHub' 
* turrisxyz/Pinned-Dependencies-GitHub:
  chore: Set permissions for GitHub actions
 2022-06-14 11:30:46 -07:00
Tim Wojtulewicz
910e3b3024 Merge remote-tracking branch 'turrisxyz/Dependabot-GitHub-Actions' 
* turrisxyz/Dependabot-GitHub-Actions:
  chore: Included githubactions in the dependabot config
 2022-06-14 10:07:56 -07:00
Johanna Amann
6419865520 Merge remote-tracking branch 'origin/topic/timw/cleanup-dockerfiles' 
* origin/topic/timw/cleanup-dockerfiles:
  Sort package names in Dockerfiles
  Dockerfile changes for consistency with Broker files
  Make some of the CI Dockerfiles more consistent
 2022-06-14 09:32:11 +01:00
Johanna Amann
58588e7955 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to the latest development version.
 2022-06-11 07:09:46 +01:00
Benjamin Bannier
d796b3dd57 Bump Spicy to the latest development version. 2022-06-09 15:48:10 +02:00
naveen
4de3cd6b5c chore: Included githubactions in the dependabot config 
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
 2022-06-09 01:32:01 +00:00
zeek-bot
d139868e16 Update doc submodule [nomail] [skip ci] 2022-06-09 00:39:09 +00:00
Christian Kreibich
763b0c8d10 Merge branch 'topic/christian/management-auto-assign-ports' 
* topic/christian/management-auto-assign-ports:
  Management framework: bump zeek-client to pull in relaxed port handling
  Management framework: bump external cluster testsuite
  Management framework: also use send_set_configuration_response_error elsewhere
  Management framework: minor log formatting tweak, for consistency
  Management framework: support auto-assignment of ports in cluster nodes
 2022-06-08 13:44:29 -07:00
Christian Kreibich
d8605884ff Management framework: bump zeek-client to pull in relaxed port handling 2022-06-08 13:29:25 -07:00
Christian Kreibich
c0a4bc3ade Management framework: bump external cluster testsuite 2022-06-08 13:29:25 -07:00
Tim Wojtulewicz
7bb5e196d7 Sort package names in Dockerfiles 2022-06-08 11:16:12 -07:00
Christian Kreibich
9b4841912c Management framework: also use send_set_configuration_response_error elsewhere 2022-06-07 13:42:07 -07:00
Christian Kreibich
ccf3c24e23 Management framework: minor log formatting tweak, for consistency 2022-06-07 13:41:47 -07:00
Christian Kreibich
7a471df1a1 Management framework: support auto-assignment of ports in cluster nodes 
This enables the controller to assign listening ports to managers, loggers, and
proxies. (We don't currently make the workers listen.) The feature is controlled
by the Management::Controller::auto_assign_ports flag. When enabled (the
default), enumeration starts from Management::Controller::auto_assign_start_port,
beginning with the manager, then the logger(s), then proxy(s). When the feature
is disabled and nodes that require a port lack it, the controller rejects the
configuration.
 2022-06-07 13:38:04 -07:00
Tim Wojtulewicz
31fa43b3df Merge remote-tracking branch 'origin/topic/timw/make-dist-deleting-build-files' 
* origin/topic/timw/make-dist-deleting-build-files:
  Keep make dist from deleting all paths containing 'build' [skip ci]
 2022-06-07 10:02:47 -07:00
Tim Wojtulewicz
5668a6a6de Remove duplicate entry about websockets from 5.0 NEWS 2022-06-06 09:39:07 -07:00
Tim Wojtulewicz
8d97d5f56a Merge remote-tracking branch 'origin/topic/vern/zam-tests-and-NEWS.Jun22' 
* origin/topic/vern/zam-tests-and-NEWS.Jun22:
  NEWS updates for 5.0
  NEWS updates for 5.0
  ZAM test suite updates due to recent changes
 2022-06-06 09:36:47 -07:00
Tim Wojtulewicz
733b8c4e0f Updating CHANGES and VERSION. 2022-06-06 09:36:16 -07:00
naveen
8c2e23ecf6 chore: Set permissions for GitHub actions 
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
 2022-06-04 00:31:28 +00:00
Tim Wojtulewicz
d2cecbecb2 Keep make dist from deleting all paths containing 'build' [skip ci] 2022-06-03 22:36:19 +00:00
Vern Paxson
24bc6c1f51 Merge branch 'topic/vern/zam-tests-and-NEWS.Jun22' of github.com:zeek/zeek into topic/vern/zam-tests-and-NEWS.Jun22 2022-06-03 15:18:14 -07:00
Vern Paxson
786d06ff7e NEWS updates for 5.0 2022-06-03 15:17:58 -07:00
Vern Paxson
f3dc740036 NEWS updates for 5.0 2022-06-03 15:15:33 -07:00
Vern Paxson
1724ddfebf ZAM test suite updates due to recent changes 2022-06-03 14:58:22 -07:00
Tim Wojtulewicz
d8df7e9b42 Dockerfile changes for consistency with Broker files 2022-06-03 14:57:21 -07:00
Tim Wojtulewicz
2977af93b5 Make some of the CI Dockerfiles more consistent 2022-06-03 14:28:48 -07:00
Tim Wojtulewicz
48a858f5db Update local-compat test for 5.1 2022-06-03 12:38:20 -07:00
Tim Wojtulewicz
811caec77a Start of 5.1.0 development 2022-06-03 12:36:24 -07:00
Tim Wojtulewicz
4a569b6c68 Update submodules [nomail] 2022-06-03 12:09:34 -07:00
Tim Wojtulewicz
0952340447 Updating submodule(s) [nomail] 2022-06-03 11:22:05 -07:00
Christian Kreibich
a9c10e20a2 Merge branch 'topic/christian/management-update-refs' 
* topic/christian/management-update-refs:
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client to bring back to master
 2022-06-03 10:56:05 -07:00
Christian Kreibich
ec4015e28c Management framework: bump external cluster testsuite 2022-06-03 10:38:31 -07:00
Christian Kreibich
43f9c27b75 Management framework: bump zeek-client to bring back to master 2022-06-03 10:37:54 -07:00
Tim Wojtulewicz
9964a46402 Fix hang in DNS analyzer with malformed packet 
(cherry picked from commit dfc9f77b68f6d02d059ade322b9c132e32c26872)
 2022-06-03 10:32:03 -07:00
Tim Wojtulewicz
41aa8b2349 Merge remote-tracking branch 'origin/topic/christian/is_used_in_netcontrol_sumstats' 
* origin/topic/christian/is_used_in_netcontrol_sumstats:
  Additional &is_used tags in the Netcontrol and Sumstats frameworks
 2022-06-03 09:50:54 -07:00
Tim Wojtulewicz
febdc97f09 Merge remote-tracking branch 'origin/topic/christian/management-instance-handling' 
* origin/topic/christian/management-instance-handling:
  Management framework: bump zeek-client to pull in rendering tweaks
  Management framework: bump external cluster testsuite
  Management framework: improve address and port handling
  Management framework: broaden get_instances response data to connected instances
  Management framework: expand notify_agent_hello event arguments
  Management framework: comment-only tweaks and typo fixes
 2022-06-03 09:50:21 -07:00
Christian Kreibich
47f4342821 Management framework: bump zeek-client to pull in rendering tweaks 2022-06-03 02:18:35 -07:00
Christian Kreibich
08d1f93292 Management framework: bump external cluster testsuite 2022-06-03 02:18:35 -07:00
Christian Kreibich
c53044981a Management framework: improve address and port handling 
The get-nodes command also benefits from showing the state on connected agents
more broadly (as opposed to just the one for the current configuration).

Also a bugfix: ensure we use an agent's IP address as seen by the
controller. This avoids reporting "0.0.0.0" in some cases.
 2022-06-03 02:14:07 -07:00
Christian Kreibich
0c47d45bb9 Management framework: broaden get_instances response data to connected instances 
This response so far contained only the connected instances that are relevant to
the current configuration, but this isn't very helpful when troubleshooting
instance connectivity. It now reports all currently connected instances, with
network addresses & ports as known to Broker.
 2022-06-03 02:13:30 -07:00
Christian Kreibich
72acf24f52 Management framework: expand notify_agent_hello event arguments 
This swaps the host event argument for the Broker ID. The latter is more useful,
since the sending agent doesn't necessarily know its IP address as visible to
the controller, and the controller can pull up the full Broker context via the
ID.

It also adds an explicit argument to the event to indicate whether the agent
connected to the controller or vice versa. This simplifies the controller's
internal logic.

Also minor tweaks to logging to show Broker IDs.
 2022-06-03 02:12:19 -07:00
Christian Kreibich
aa689807fa Management framework: comment-only tweaks and typo fixes 2022-06-03 02:12:12 -07:00
Christian Kreibich
edef3736fb Additional &is_used tags in the Netcontrol and Sumstats frameworks 
When running a cluster, these functions only get called in select node types and
could trigger no-caller warnings on stderr.
 2022-06-02 22:57:07 -07:00
Tim Wojtulewicz
3ce1db1b5f Fix doc issue in zeek.bif, update docs submodule 2022-06-02 17:54:17 -07:00
Tim Wojtulewicz
facdf0b0d3 Merge remote-tracking branch 'origin/topic/timw/update-submodules' 
* origin/topic/timw/update-submodules:
  Updating submodule(s) [nomail]
 2022-06-02 17:01:34 -07:00
Tim Wojtulewicz
535a6013aa Merge remote-tracking branch 'zeek-as-org/as-org' 
* zeek-as-org/as-org:
  Mark lookup_asn() BIF as deprecated in v6.1
  Define geo_autonomous_system record type
  Add lookup_autonomous_system() BIF that returns AS number and org
 2022-06-02 16:59:29 -07:00
Phil Rzewski
320fbf49fd Mark lookup_asn() BIF as deprecated in v6.1 2022-06-02 15:27:39 -07:00
Tim Wojtulewicz
8b14539c5a Add NEWS entries for broker changes for 5.0.0 2022-06-02 13:27:32 -07:00
Tim Wojtulewicz
6196a959f1 Reformat NEWS file for proper line lengths in the 5.0.0 notes 2022-06-02 13:25:26 -07:00