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

[2018.3] Merge forward from 2017.7 to 2018.8 #50945

Merged
merged 23 commits into from Dec 30, 2018

Conversation

Projects
None yet
8 participants
@garethgreenaway
Copy link
Member

commented Dec 20, 2018

Merge branch '2017.7' into merge-2017.7

Conflicts:

  • salt/utils/minions.py

@terminalmage Can you double check the changes to salt/utils/minions.py valididate_tgt.

garethgreenaway and others added some commits Dec 14, 2018

Catch UnicodeDecodeErrors in id verification
Do not crash if the id cannot be decoded. An invalid id provided by an untrusted client can DOS the master.
Fix compound matching in eauth
The auth validation functions were using flawed logic to validate the
expressions configured for a given eauth plugin. To "expand" the
expression, it would use `salt.utils.minions.parse_target()` to analyze
the expression. However, this function was intended to be used on
individual words in a compound expression, not on a compound expression
as a whole. This means that any multi-word compound expression would
fail to validate. By assuming that the euth expression is compound and
using `check_minions()` to get the list of minions that match the
expression, we ensure that it is properly validated.
Merge pull request #50869 from garethgreenaway/50848_mysql_exception_…
…test

[2017.7] Adding a test to ensure exception handling is correct
Merge pull request #50909 from damon-atkins/jenkins_pylint
Update .ci/lint fix CHANGE_BRANCH name
Merge pull request #50876 from terminalmage/issue50153
Fix compound matching in eauth
Merge branch '2017.7' into merge-2017.7
 Conflicts:
	salt/utils/minions.py

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Dec 20, 2018

@Ch3LL

Ch3LL approved these changes Dec 20, 2018

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Dec 20, 2018

@garethgreenaway Looks like there is a consistent test failure unit.utils.test_minions.CkMinionsTestCase.test_auth_check and the linter is unhappy. :)

garethgreenaway added some commits Dec 21, 2018

@damon-atkins

This comment has been minimized.

Copy link
Member

commented Dec 21, 2018

Looks like the full lint is of value with merge forwards.

garethgreenaway added some commits Dec 21, 2018

@dwoz dwoz merged commit fd9711b into saltstack:2018.3 Dec 30, 2018

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.