fix a bug that causes LDAP TLS connection flags to not be set properly #4190
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
jladdjr
approved these changes
Jun 28, 2019
|
Build succeeded.
|
jladdjr
reviewed
Jun 28, 2019
awx/sso/backends.py
Outdated
| # | ||
| # see: https://github.com/python-ldap/python-ldap/issues/55 | ||
| self.CONNECTION_OPTIONS = OrderedDict( | ||
| (k, v) for k, v in sorted(self.CONNECTION_OPTIONS.items()) |
There was a problem hiding this comment.
It looks like there are at least a couple of OPT_X_TLS.. options that come after OPT_X_TLS_NEWCTX (here's the list I get when looking at python-ldap). These would get put after OPT_X_TLS_NEWCTX if we apply the above sort.
Should we form an OrderedDict then explicitly append OPT_X_TLS_NEWCTX to the end? Something like this maybe:
Suggested change
| (k, v) for k, v in sorted(self.CONNECTION_OPTIONS.items()) | |
| newctx_option = self.CONNECTION_OPTIONS.pop(ldap.OPT_X_TLS_NEWCTX, None) | |
| self.CONNECTION_OPTIONS = OrderedDict(self.CONNECTION_OPTIONS) | |
| if newctx_option: | |
| self.CONNECTION_OPTIONS[dap.OPT_X_TLS_NEWCTX] = newctx_option |
ryanpetrello
force-pushed
the
ldap-dict-order
branch
from
d2f98bd
to
caf1f3e
Compare
co-authored-by: Jim Ladd <jladd@redhat.com>
ryanpetrello
force-pushed
the
ldap-dict-order
branch
from
caf1f3e
to
11b3698
Compare
|
Build succeeded.
|
jladdjr
approved these changes
Jun 29, 2019
|
Build succeeded (gate pipeline).
|
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.
co-authored-by: Jim Ladd jladd@redhat.com