Merge pull request #244 from garethgreenaway/docs_3002.7

garethgreenaway · web-flow · commit c773ff005611 · 2021-08-23T19:48:11.000-07:00
docs_3002.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3002.7 (2021-08-20)
+========================
+
+Fixed
+-----
+
+- Verify the owner of an existing config before trusting it during install. If the owner cannot be verified, back it up and use defaults. (CVE-2021-22004)
+
+
+Security
+--------
+
+- Fix the CVE-2021-31607 vulnerability
+  Additionally, an audit and a tool was put in place, ``bandit``, to address similar issues througout the code base, and prevent them. (CVE-2021-31607)
+- Ensure that sourced file is cached using its hash name (cve-2021-21996)
+
+
 Salt 3002.6 (2021-03-10)
 ========================
 
@@ -337,6 +354,22 @@ Added
   This flag will be deprecated in the Phosphorus release when this functionality
   becomes the default. (#58652)
 
+Salt 3001.8 (2021-08-20)
+========================
+
+Fixed
+-----
+
+- Verify the owner of an existing config before trusting it during install. If the owner cannot be verified, back it up and use defaults. (CVE-2021-22004)
+
+
+Security
+--------
+
+- Fix the CVE-2021-31607 vulnerability
+  Additionally, an audit and a tool was put in place, ``bandit``, to address similar issues througout the code base, and prevent them. (CVE-2021-31607)
+- Ensure that sourced file is cached using its hash name (cve-2021-21996)
+
 Salt 3001.7 (2021-03-10)
 ========================
 
diff --git a/changelog/CVE-2021-22004.fixed b/changelog/CVE-2021-22004.fixed
diff --git a/changelog/CVE-2021-31607.security b/changelog/CVE-2021-31607.security
diff --git a/changelog/cve-2021-21996.security b/changelog/cve-2021-21996.security
diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-API" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .
diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-CALL" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .
diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-CLOUD" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-CP" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-KEY" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .
diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-MASTER" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .
diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-MINION" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .
diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-PROXY" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .
diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-RUN" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .
diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-SSH" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .
diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-SYNDIC" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .
diff --git a/doc/man/salt-unity.1 b/doc/man/salt-unity.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-UNITY" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT-UNITY" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt-unity \- salt-unity Command
 .
diff --git a/doc/man/salt.1 b/doc/man/salt.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT" "1" "Mar 10, 2021" "3002.6" "Salt"
+.TH "SALT" "1" "Aug 20, 2021" "3002.7" "Salt"
 .SH NAME
 salt \- salt
 .
diff --git a/doc/man/salt.7 b/doc/man/salt.7
diff --git a/doc/man/spm.1 b/doc/man/spm.1
diff --git a/doc/topics/releases/3001.8.rst b/doc/topics/releases/3001.8.rst
diff --git a/doc/topics/releases/3002.7.rst b/doc/topics/releases/3002.7.rst

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-API" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-API" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-api \- salt-api Command`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CALL" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-CALL" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-call \- salt-call Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CLOUD" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-CLOUD" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-cloud \- Salt Cloud Command`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CP" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-CP" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-cp \- salt-cp Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-KEY" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-KEY" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-key \- salt-key Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-MASTER" "1" "Mar 10, 2021" "3002.6" "Salt"`
	`3`	`+.TH "SALT-MASTER" "1" "Aug 20, 2021" "3002.7" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-master \- salt-master Documentation`
`6`	`6`	`.`