Fix LDAP and Python 3.7 issues (#18)

Fix LDAP and Python 3.7 issues

phovea_security_store_ldap/ldap.py

@@ -240,6 +240,7 @@ def _authenticate_direct_bind_and_search(self, username, password):
         AuthenticationResponse
     """
     import re
+    import json
 
     connection = self._make_connection(username, password)
 
@@ -281,14 +282,14 @@ def _authenticate_direct_bind_and_search(self, username, password):
                         attributes=self._config.get('user.attributes') or ldap3.ALL_ATTRIBUTES)
 
       if len(connection.response) > 0:
-        user_info = connection.response[0]['attributes']
+        user_info = json.loads(connection.response_to_json())["entries"][0]["attributes"]
         user_info['dn'] = connection.response[0]['dn']
         bind_user = user_info['dn']
       else:
         raise Exception
 
-      if len(connection.response) > 0 and 'memberOf' in connection.response[0]['attributes']:
-        user_groups = connection.response[0]['attributes'].get('memberOf', [])
+      if len(connection.response) > 0 and 'memberOf' in json.loads(connection.response_to_json())["entries"][0]["attributes"]:
+        user_groups = json.loads(connection.response_to_json())["entries"][0]["attributes"].get('memberOf', [])
       else:
         user_groups = self._get_user_groups(dn=bind_user, _connection=self._choose(connection))
 
@@ -325,7 +326,7 @@ def _authenticate_search_bind(self, username, password):
     try:
       connection.bind()
       log.debug('Successfully bound to LDAP as "{0}"'
-                ' for search_bind method'.format(self._config.get('bind_user_nd') or 'Anonymous'))
+                ' for search_bind method'.format(self._config.get('bind_user_dn') or 'Anonymous'))
     except Exception:
       connection.unbind()
       log.exception('unknown')
@@ -383,7 +384,7 @@ def _refind_user(self, dn):
     try:
       connection.bind()
       log.debug('Successfully bound to LDAP as "{0}" '
-                'for search_bind method'.format(self._config.get('bind_user_nd') or 'Anonymous'))
+                'for search_bind method'.format(self._config.get('bind_user_dn') or 'Anonymous'))
       infos = self._get_user_info(dn, _connection=self._choose(connection))
       groups = self._get_user_groups(dn, _connection=self._choose(connection))
       return LDAPUser(infos.get('name', infos.get('cn', dn)), dn=dn, info=infos, groups=groups, group_prop=self._config.get('group.prop', default='dn'))
@@ -414,7 +415,7 @@ def _get_user_groups(self, dn, group_search_dn=None, _connection=None):
 
     connection = _connection
     if not connection:
-      connection = self._make_connection(bind_user=self._config.get('bind_user_dn'),
+      connection = self._make_connection(bind_user=dn,
                                          bind_password=self._config.get('bind_user_password'))
       connection.bind()
 
@@ -455,7 +456,7 @@ def _get_user_groups(self, dn, group_search_dn=None, _connection=None):
     if match is not None:
       import re
       match = re.compile(match)
-      results = [r for r in results if match.match(r['dn'])]
+      results = [r for r in list(results) if match.match(r['dn'])]
 
     return results
 
@@ -532,10 +533,11 @@ def _get_object(self, dn, filter, attributes, _connection=None):
     Returns:
         dict: A dictionary of the object info from LDAP
     """
+    import json
 
     connection = _connection
     if not connection:
-      connection = self._make_connection(bind_user=self._config.get('bind_user_nd'),
+      connection = self._make_connection(bind_user=self._config.get('bind_user_dn'),
                                          bind_password=self._config.get('bind_user_password')
                                          )
       connection.bind()
@@ -544,7 +546,7 @@ def _get_object(self, dn, filter, attributes, _connection=None):
 
     data = None
     if len(connection.response) > 0:
-      data = connection.response[0]['attributes']
+      data = json.loads(connection.response_to_json())["entries"][0]['attributes']
       data['dn'] = connection.response[0]['dn']
 
     if not _connection:

setup.py

@@ -3,7 +3,6 @@
 # Copyright (c) The Caleydo Team. All rights reserved.
 # Licensed under the new BSD license, available at http://caleydo.org/license
 ###############################################################################
-from __future__ import with_statement, print_function
 from setuptools import setup, find_packages
 from codecs import open
 from os import path