ipaldap: properly escape raw binary values in LDAP filters #408
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
tiran
reviewed
Jan 23, 2017
| if six.PY3: | ||
| value = value.decode('raw_unicode_escape') | ||
| value = u''.join( | ||
| u'\\{:02x}'.format(i) for i in six.iterbytes(value)) |
There was a problem hiding this comment.
format() with hex is rather inefficient and slow. An implementation with hexlify() is five to ten times faster.
def enc_hexlify(s):
hexstring = binascii.hexlify(s).decode('ascii')
# [-2:0] is empty string for the initial \
return u'\\'.join(hexstring[i:i+2] for i in six.moves.range(-2, len(s)+2, 2))
There was a problem hiding this comment.
This is not performance critical code, but OK (I like the empty initial string hack 👍).
Manually escape each byte in the value, do not use ldap.filter.escape_filter_chars() as it does not work with bytes in Python 3. https://fedorahosted.org/freeipa/ticket/4985
|
Works for me. |
|
Fixed upstream |
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.
Manually escape each byte in the value, do not use
ldap.filter.escape_filter_chars() as it does not work with bytes in
Python 3.
https://fedorahosted.org/freeipa/ticket/4985