IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipadiscovery: Decode to unicode in ipacheckldap(), get_ipa_basedn()

Browse Source 
ipacheckldap uses a schema-less connection with decode_attrs=False,
so bytes need to be decoded manually.
This was not a problem in Python2 where bytes and unicode could
be mixed freely.

Part of the work for https://fedorahosted.org/freeipa/ticket/5638

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin 2016-02-19 17:26:57 +01:00 committed by Jan Cholasta
parent 8df86d5bff
commit cec7df5c54
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipaclient/ipadiscovery.py
View File

@ -19,6 +19,8 @@
import socket import socket
import six
from ipapython.ipa_log_manager import root_logger from ipapython.ipa_log_manager import root_logger
from dns import resolver, rdatatype from dns import resolver, rdatatype
from dns.exception import DNSException from dns.exception import DNSException
@ -62,13 +64,11 @@ def get_ipa_basedn(conn):
entry = conn.get_entry( entry = conn.get_entry(
DN(), attrs_list=['defaultnamingcontext', 'namingcontexts']) DN(), attrs_list=['defaultnamingcontext', 'namingcontexts'])
# FIXME: import ipalib here to prevent import loops contexts = [c.decode('utf-8') for c in entry.raw['namingcontexts']]
from ipalib import errors
contexts = entry['namingcontexts']
if 'defaultnamingcontext' in entry: if 'defaultnamingcontext' in entry:
# If there is a defaultNamingContext examine that one first # If there is a defaultNamingContext examine that one first
default = entry.single_value['defaultnamingcontext'] [default] = entry.raw['defaultnamingcontext']
default = default.decode('utf-8')
if default in contexts: if default in contexts:
contexts.remove(default) contexts.remove(default)
contexts.insert(0, default) contexts.insert(0, default)
@ -81,7 +81,8 @@ def get_ipa_basedn(conn):
root_logger.debug("LDAP server did not return info attribute to " root_logger.debug("LDAP server did not return info attribute to "
"check for IPA version") "check for IPA version")
continue continue
info = entry.single_value['info'].lower() [info] = entry.raw['info']
info = info.decode('utf-8').lower()
if info != IPA_BASEDN_INFO: if info != IPA_BASEDN_INFO:
root_logger.debug("Detected IPA server version (%s) did not match the client (%s)" \ root_logger.debug("Detected IPA server version (%s) did not match the client (%s)" \
% (info, IPA_BASEDN_INFO)) % (info, IPA_BASEDN_INFO))
@ -424,7 +425,10 @@ class IPADiscovery(object):
for lres in lret: for lres in lret:
root_logger.debug("Found: %s", lres.dn) root_logger.debug("Found: %s", lres.dn)
lrealms.append(lres.single_value['cn']) [cn] = lres.raw['cn']
if six.PY3:
cn = cn.decode('utf-8')
lrealms.append(cn)
if trealm: if trealm:
for r in lrealms: for r in lrealms: