Fix control packets being encoded when none exist on bind #142
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
During the code reshuffle in go-ldap#126 at bind time a call to encodeControls was added. Unfortunately, the safety check around calling it when there are no controls to encode were omitted from this call (unlike in del.go and search.go). As a result the packet was always getting control characters added even if there were none to encode. I also modified the checks in del.go and search.go to be a little safer; rather than check for a nil slice, it also will do the right thing when the slice is not nil but there are no entries.
|
Any ETA on when the merge button will be hit? :-) |
|
Thanks! |
|
I need to check in with @liggitt about the versioning on this, I think we can just tag it v2.5.2, but I'm a little hazy on the versioning process. |
|
Sounds good. In the meantime I'm happy to vendor master. |
The referenced PR is in the master after the v2 branch was cut. If we want this in the v2 branch, we should cherry pick it |
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.
During the code reshuffle in #126 at bind time a call to encodeControls
was added. Unfortunately, the safety check around calling it when there
are no controls to encode were omitted from this call (unlike in del.go
and search.go). As a result the packet was always getting control
characters added even if there were none to encode.
I also modified the checks in del.go and search.go to be a little safer;
rather than check for a nil slice, it also will do the right thing when
the slice is not nil but there are no entries.