Fix edge case when minion ID is a 16-character string #51298
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some code in salt._compat which checks if the value is a packed binary representation of an IPv6 address fails if the value passed is not a bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This fixes that code when the minion ID is a 16-character string (not a bytestring). Note that the minion ID will never be a bytestring as of 2018.3.0, so this affects any 16-character minion ID when the minion ID is checked to see if it is really an IP address.
terminalmage
force-pushed
the
issue51258
branch
from
bad1247 to
3649bb0
Compare
isbm
approved these changes
Jan 23, 2019
|
@terminalmage thanks finding this in my 😞 code. I had problems with the IPv6 addresses length of 16, but seems totally missed this one. |
s0undt3ch
approved these changes
Jan 24, 2019
Ch3LL
added
the
bugfix-bckport
Ch3LL
added
ZZZ[Done]-back-ported-bf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some code in
salt._compatwhich checks if the value is a packed binary representation of an IPv6 address fails if the value passed is not a bytestring (i.e. aunicodetype on PY2 orstrtype on PY3). This fixes that code when the minion ID is a 16-character string (not a bytestring). Note that the minion ID will never be a bytestring as of 2018.3.0, so this affects any 16-character minion ID when the minion ID is checked to see if it is really an IP address.Resolves #51258.