Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge/3000.2 #56987

Merged
merged 9 commits into from
Apr 29, 2020
Merged

Merge/3000.2 #56987

merged 9 commits into from
Apr 29, 2020

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Apr 29, 2020

What does this PR do?

Merge changes form security release 3000.3

What issues does this PR fix or reference?

CVE-2020-11652
CVE-2020-11651

Merge requirements satisfied?

  • [ x] Docs
  • [ x] Changelog
  • [ x] Tests written/updated

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from a team as a code owner April 29, 2020 18:48
@ghost ghost requested review from Ch3LL and removed request for a team April 29, 2020 18:48
Frode Gundersen and others added 8 commits April 29, 2020 19:02
Resolve issue which allows access to un-intended methods in the
ClearFuncs class of the salt-master process
Sanitize paths in ClearFuncs methods provided by salt-master. This
ensures we do not allow access to un-intended files and directories.
waynew
waynew previously approved these changes Apr 29, 2020
tests/unit/test_module_names.py Outdated Show resolved Hide resolved
@dwoz dwoz dismissed stale reviews from waynew and garethgreenaway via 101c914 April 29, 2020 19:46
@dwoz dwoz merged commit dcde50d into saltstack:master Apr 29, 2020
@sagetherage sagetherage added the v3000.2 vulnerable version label May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.2 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants