External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 12:41:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix a bug that causes LDAP TLS connection flags to not be set properly

Browse Source 
co-authored-by: Jim Ladd <jladd@redhat.com>
This commit is contained in:
Ryan Petrello 2019-06-28 17:11:50 -04:00
parent d438a93fd2
commit 11b36982cd
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
awx/sso/backends.py
View File

@ -2,6 +2,7 @@
# All Rights Reserved.
# Python
from collections import OrderedDict
import logging
import uuid
@ -54,6 +55,20 @@ class LDAPSettings(BaseLDAPSettings):
options[ldap.OPT_NETWORK_TIMEOUT] = 30
self.CONNECTION_OPTIONS = options
# when specifying `.set_option()` calls for TLS in python-ldap, the
# *order* in which you invoke them *matters*, particularly in Python3,
# where dictionary insertion order is persisted
#
# specifically, it is *critical* that `ldap.OPT_X_TLS_NEWCTX` be set *last*
# this manual sorting puts `OPT_X_TLS_NEWCTX` *after* other TLS-related
# options
#
# see: https://github.com/python-ldap/python-ldap/issues/55
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[ldap.OPT_X_TLS_NEWCTX] = newctx_option
class LDAPBackend(BaseLDAPBackend):
'''