8000 Merge pull request #68074 from dwoz/merge/master/3007.x-2025-06-12 · saltstack/salt@314d9bf · GitHub
[go: up one dir, main page]

Skip to content

Commit 314d9bf

Browse files
authored
Merge pull request #68074 from dwoz/merge/master/3007.x-2025-06-12
Merge forward from 3007.x into master
2 parents 6fec97a + bc2b096 commit 314d9bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2148
-1986
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ jobs:
433433
with:
434434
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
435435
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
436-
relenv-version: "0.19.2"
436+
relenv-version: "0.19.3"
437437
python-version: "3.10.17"
438438
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
439439
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -448,7 +448,7 @@ jobs:
448448
with:
449449
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
450450
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
451-
relenv-version: "0.19.2"
451+
relenv-version: "0.19.3"
452452
python-version: "3.10.17"
453453
source: "onedir"
454454
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428
with:
429429
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
430430
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
431-
relenv-version: "0.19.2"
431+
relenv-version: "0.19.3"
432432
python-version: "3.10.17"
433433
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
434434
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -443,7 +443,7 @@ jobs:
443443
with:
444444
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
445445
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
446-
relenv-version: "0.19.2"
446+
relenv-version: "0.19.3"
447447
python-version: "3.10.17"
448448
source: "onedir"
449449
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -463,7 +463,7 @@ jobs:
463463
with:
464464
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
465465
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
466-
relenv-version: "0.19.2"
466+
relenv-version: "0.19.3"
467467
python-version: "3.10.17"
468468
source: "src"
469469
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

.github/workflows/scheduled.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ jobs:
476476
with:
477477
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
478478
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
479-
relenv-version: "0.19.2"
479+
relenv-version: "0.19.3"
480480
python-version: "3.10.17"
481481
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
482482
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['li 1CF5 nux_arm_runner'] }}
@@ -491,7 +491,7 @@ jobs:
491491
with:
492492
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
493493
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
494-
relenv-version: "0.19.2"
494+
relenv-version: "0.19.3"
495495
python-version: "3.10.17"
496496
source: "onedir"
497497
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

.github/workflows/staging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ jobs:
464464
with:
465465
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
466466
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
467-
relenv-version: "0.19.2"
467+
relenv-version: "0.19.3"
468468
python-version: "3.10.17"
469469
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
470470
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -480,7 +480,7 @@ jobs:
480480
with:
481481
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
482482
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
483-
relenv-version: "0.19.2"
483+
relenv-version: "0.19.3"
484484
python-version: "3.10.17"
485485
source: "onedir"
486486
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -501,7 +501,7 @@ jobs:
501501
with:
502502
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
503503
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
504-
relenv-version: "0.19.2"
504+
relenv-version: "0.19.3"
505505
python-version: "3.10.17"
506506
source: "src"
507507
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

CHANGELOG.md

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,70 @@ Versions are `MAJOR.PATCH`.
77

88
# Changelog
99

10+
## 3007.4 (2025-06-12)
11+
12+
13+
### Fixed
14+
15+
- CVE-2024-38822
16+
Multiple methods in the salt master skip minion token validation. Therefore a misbehaving minion can impersonate another minion.
17+
18+
CVSS 2.7 V:N/AC:L/PR:H/UI:N/S:U/C:N/I:L/A:N
19+
20+
CVE-2024-38823
21+
Salt's request server is vulnerable to replay attacks when not using a TLS encrypted transport.
22+
23+
CVSS Score 2.7 AV:N/AC:L/PR:H/UI:N/S:U/C:N/I:L/A:N
24+
25+
CVE-2024-38824
26+
Directory traversal vulnerability in recv_file method allows arbitrary files to be written to the master cache directory.
27+
28+
CVSS Score 9.6 AV:N/AC:L/PR:L/UI:N/S:C/C:H/I:H/A:N
29+
30+
CVE-2024-38825
31+
The salt.auth.pki module does not properly authenticate callers. The "password" field contains a public certificate which is validated against a CA certificate by the module. This is not pki authentication, as the caller does not need access to the corresponding private key for the authentication attempt to be accepted.
32+
33+
CVSS Score 6.4 AV:N/AC:L/PR:L/UI:N/S:C/C:L/I:L/A:N
34+
35+
CVE-2025-22236
36+
Minion event bus authorization bypass. An attacker with access to a minion key can craft a message which may be able to execute a job on other minions (>= 3007.0).
37+
38+
CVSS 8.1 AV:L/AC:L/PR:H/UI:N/S:C/C:H/I:H/A:L
39+
40+
CVE-2025-22237
41+
An attacker with access to a minion key can exploit the 'on demand' pillar functionality with a specially crafted git url which could cause and arbitrary command to be run on the master with the same privileges as the master process.
42+
43+
CVSS 6.7 AV:L/AC:L/PR:H/UI:N/S:U/C:H/I:H/A:H
44+
45+
CVE-2025-22238
46+
Directory traversal attack in minion file cache creation. The master's default cache is vulnerable to a directory traversal attack. Which could be leveraged to write or overwrite 'cache' files outside of the cache directory.
47+
48+
CVSS 4.2 AV:L/AC:L/PR:H/UI:R/S:U/C:N/I:H/A:N
49+
50+
CVE-2025-22239
51+
Arbitrary event injection on Salt Master. The master's "_minion_event" method can be used by and authorized minion to send arbitrary events onto the master's event bus.
52+
53+
CVSS 8.1 AV:L/AC:L/PR:H/UI:N/S:C/C:H/I:H/A:L
54+
55+
CVE-2025-22240
56+
Arbitrary directory creation or file deletion. In the find_file method of the GitFS class, a path is created using os.path.join using unvalidated input from the “tgt_env” variable. This can be exploited by an attacker to delete any file on the Master's process has permissions to
57+
58+
CVSS 6.3 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:H/A:H
59+
60+
CVE-2025-22241
61+
File contents overwrite the VirtKey class is called when “on-demand pillar” data is requested and uses un-validated input to create paths to the “pki directory”. The functionality is used to auto-accept Minion authentication keys based on a pre-placed “authorization file” at a specific location and is present in the default configuration.
62+
63+
CVSS 5.6 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:H/A:N
64+
65+
CVE-2025-22242
66+
Worker process denial of service through file read operation. .A vulnerability exists in the Master's “pub_ret” method which is exposed to all minions. The un-sanitized input value “jid” is used to construct a path which is then opened for reading. An attacker could exploit this vulnerabilities by attempting to read from a filename that will not return any data, e.g. by targeting a pipe node on the proc file system.
67+
68+
CVSS 5.6 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:N/A:H
69+
70+
This release also includes sqlite 3.50.1 to address CVE-2025-29087 [#68033](https://github.com/saltstack/salt/issues/68033)
71+
72+
73+
1074
## 3007.3 (2025-06-04)
1175

1276

@@ -16,6 +80,69 @@ Versions are `MAJOR.PATCH`.
1680

1781

1882
## 3007.2 (2025-05-13)
83+
## 3006.12 (2025-06-12)
84+
85+
86+
### Fixed
87+
88+
- CVE-2024-38822
89+
Multiple methods in the salt master skip minion token validation. Therefore a misbehaving minion can impersonate another minion.
90+
91+
CVSS 2.7 V:N/AC:L/PR:H/UI:N/S:U/C:N/I:L/A:N
92+
93+
CVE-2024-38823
94+
Salt's request server is vulnerable to replay attacks when not using a TLS encrypted transport.
95+
96+
CVSS Score 2.7 AV:N/AC:L/PR:H/UI:N/S:U/C:N/I:L/A:N
97+
98+
CVE-2024-38824
99+
Directory traversal vulnerability in recv_file method allows arbitrary files to be written to the master cache directory.
100+
101+
CVSS Score 9.6 AV:N/AC:L/PR:L/UI:N/S:C/C:H/I:H/A:N
102+
103+
CVE-2024-38825
104+
The salt.auth.pki module does not properly authenticate callers. The "password" field contains a public certificate which is validated against a CA certificate by the module. This is not pki authentication, as the caller does not need access to the corresponding private key for the authentication attempt to be accepted.
105+
106+
CVSS Score 6.4 AV:N/AC:L/PR:L/UI:N/S:C/C:L/I:L/A:N
107+
108+
CVE-2025-22236
109+
Minion event bus authorization bypass. An attacker with access to a minion key can craft a message which may be able to execute a job on other minions (>= 3007.0).
110+
111+
CVSS 8.1 AV:L/AC:L/PR:H/UI:N/S:C/C:H/I:H/A:L
112+
113+
CVE-2025-22237
114+
An attacker with access to a minion key can exploit the 'on demand' pillar functionality with a specially crafted git url which could cause and arbitrary command to be run on the master with the same privileges as the master process.
115+
116+
CVSS 6.7 AV:L/AC:L/PR:H/UI:N/S:U/C:H/I:H/A:H
117+
118+
CVE-2025-22238
119+
Directory traversal attack in minion file cache creation. The master's default cache is vulnerable to a directory traversal attack. Which could be leveraged to write or overwrite 'cache' files outside of the cache directory.
120+
121+
CVSS 4.2 AV:L/AC:L/PR:H/UI:R/S:U/C:N/I:H/A:N
122+
123+
CVE-2025-22239
124+
Arbitrary event injection on Salt Master. The master's "_minion_event" method can be used by and authorized minion to send arbitrary events onto the master's event bus.
125+
126+
CVSS 8.1 AV:L/AC:L/PR:H/UI:N/S:C/C:H/I:H/A:L
127+
128+
CVE-2025-22240
129+
Arbitrary directory creation or file deletion. In the find_file method of the GitFS class, a path is created using os.path.join using unvalidated input from the “tgt_env” variable. This can be exploited by an attacker to delete any file on the Master's process has permissions to
130+
131+
CVSS 6.3 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:H/A:H
132+
133+
CVE-2025-22241
134+
File contents overwrite the VirtKey class is called when “on-demand pillar” data is requested and uses un-validated input to create paths to the “pki directory”. The functionality is used to auto-accept Minion authentication keys based on a pre-placed “authorization file” at a specific location and is present in the default configuration.
135+
136+
CVSS 5.6 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:H/A:N
137+
138+
CVE-2025-22242
139+
Worker process denial of service through file read operation. .A vulnerability exists in the Master's “pub_ret” method which is exposed to all minions. The un-sanitized input value “jid” is used to construct a path which is then opened for reading. An attacker could exploit this vulnerabilities by attempting to read from a filename that will not return any data, e.g. by targeting a pipe node on the proc file system.
140+
141+
CVSS 5.6 AV:L/AC:H/PR:H/UI:R/S:U/C:H/I:N/A:H
142+
143+
This release also includes sqlite 3.50.1 to address CVE-2025-29087 [#68033](https://github.com/saltstack/salt/issues/68033)
144+
145+
19146
## 3006.11 (2025-06-02)
20147

21148

cicd/shared-gh-workflows-context.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
nox_version: "2022.8.7"
22
python_version: "3.10.17"
3-
relenv_version: "0.19.2"
3+
relenv_version: "0.19.3"
44
release_branches:
55
- "3006.x"
66
- "3007.x"

doc/man/salt-api.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2727
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2828
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2929
..
30-
.TH "SALT-API" "1" "Generated on June 04, 2025 at 10:17:55 UTC." "3007.3" "Salt"
30+
.TH "SALT-API" "1" "Generated on June 12, 2025 at 18:04:52 UTC." "3007.4" "Salt"
3131
.SH NAME
3232
salt-api \- salt-api Command
3333
.sp

doc/man/salt-call.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2727
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2828
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2929
..
30-
.TH "SALT-CALL" "1" "Generated on June 04, 2025 at 10:17:55 UTC." "3007.3" "Salt"
30+
.TH "SALT-CALL" "1" "Generated on June 12, 2025 at 18:04:52 UTC." "3007.4" "Salt"
< E381 /td>
3131
.SH NAME
3232
salt-call \- salt-call Documentation
3333
.SH SYNOPSIS

doc/man/salt-cloud.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2727
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2828
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2929
..
30-
.TH "SALT-CLOUD" "1" "Generated on June 04, 2025 at 10:17:55 UTC." "3007.3" "Salt"
30+
.TH "SALT-CLOUD" "1" "Generated on June 12, 2025 at 18:04:52 UTC." "3007.4" "Salt"
3131
.SH NAME
3232
salt-cloud \- Salt Cloud Command
3333
.sp

doc/man/salt-cp.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2727
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2828
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2929
..
30-
.TH "SALT-CP" "1" "Generated on June 04, 2025 at 10:17:55 UTC." "3007.3" "Salt"
30+
.TH "SALT-CP" "1" "Generated on June 12, 2025 at 18:04:52 UTC." "3007.4" "Salt"
3131
.SH NAME
3232
salt-cp \- salt-cp Documentation
3333
.sp

0 commit comments

Comments
 (0)
0