Skip to content

Commit

Permalink
Merge pull request saltstack#292 from barbaricyawps/docs_3002.8
Browse files Browse the repository at this point in the history
Add 3002.8 changelog and release notes, update man pages
  • Loading branch information
Ch3LL authored Feb 25, 2022
2 parents 18e679e + bf70547 commit 836789a
Show file tree
Hide file tree
Showing 22 changed files with 138 additions and 82 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ Versions are `MAJOR.PATCH`.

# Changelog

Salt 3002.8 (2022-02-25)
========================

Security
--------

- Sign authentication replies to prevent MiTM (cve-2020-22935)
- Sign pillar data to prevent MiTM attacks. (cve-2022-22934)
- Prevent job and fileserver replays (cve-2022-22936)
- Fixed targeting bug, especially visible when using syndic and user auth. (CVE-2022-22941) (#60413)


Salt 3002.7 (2021-08-20)
========================

Expand Down
1 change: 0 additions & 1 deletion changelog/60413.security

This file was deleted.

1 change: 0 additions & 1 deletion changelog/cve-2020-22935.security

This file was deleted.

1 change: 0 additions & 1 deletion changelog/cve-2022-22934.security

This file was deleted.

1 change: 0 additions & 1 deletion changelog/cve-2022-22936.security

This file was deleted.

2 changes: 1 addition & 1 deletion doc/man/salt-api.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-API" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-api \- salt-api Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-call.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-CALL" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cloud.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-CLOUD" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cp.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-CP" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-key.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-KEY" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-master.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-MASTER" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-minion.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-MINION" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-proxy.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-PROXY" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-run.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-RUN" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-ssh.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-SSH" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-syndic.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-SYNDIC" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-unity.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT-UNITY" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SALT" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
salt \- salt
.
Expand Down
138 changes: 76 additions & 62 deletions doc/man/salt.7

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/man/spm.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SPM" "1" "Aug 20, 2021" "3002.7" "Salt"
.TH "SPM" "1" "Feb 25, 2022" "3002.8" "Salt"
.SH NAME
spm \- Salt Package Manager Command
.
Expand Down
4 changes: 2 additions & 2 deletions doc/ref/beacons/all/salt.beacons.aix_account.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
salt.beacons.aix_account module
===============================
salt.beacons.aix_account
========================

.. automodule:: salt.beacons.aix_account
:members:
34 changes: 34 additions & 0 deletions doc/topics/releases/3002.8.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.. _release-3002-8:

========================
Salt 3002.8 (2022-02-25)
========================

Version 3002.8 is a CVE security fix release for :ref:`3002 <release-3002>`.


Important notice about upgrading
--------------------------------

Version 3002.8 is a security release. 3002.8 minions are not able to
communicate with masters older than 3002.8. You must upgrade your masters
before upgrading minions.


Minion authentication security
------------------------------

Authentication between masters and minions rely on public/private key
encryption and message signing. To secure minion authentication before you must
pre-seed the master's public key on minions. To pre-seed the minions' master
key, place a copy of the master's public key in the minion's pki directory as
``minion_master.pub``.


Security
--------

- Sign authentication replies to prevent MiTM (cve-2020-22935)
- Sign pillar data to prevent MiTM attacks. (cve-2022-22934)
- Prevent job and fileserver replays (cve-2022-22936)
- Fixed targeting bug, especially visible when using syndic and user auth. (CVE-2022-22941) (#60413)

0 comments on commit 836789a

Please sign in to comment.