From c3d740ade00f54a299231456ee07269b98b12f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sat, 1 Apr 2017 21:45:05 +0100
Subject: [PATCH] Handle incomplete values from the LDAP

Sometime `uid` is not set in the objects fetched from the LDAP. This
case has to be handled. Also, the `.uid` and `.cn` attributes of these
objects in the python abstractions have a `.value` method which we
should use.
---
 gestioncof/autocomplete.py | 32 ++++++++++++++++++++------------
 kfet/autocomplete.py       | 32 ++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/gestioncof/autocomplete.py b/gestioncof/autocomplete.py
index 1eae6920..98363377 100644
--- a/gestioncof/autocomplete.py
+++ b/gestioncof/autocomplete.py
@@ -14,6 +14,10 @@ from gestioncof.decorators import buro_required
 
 class Clipper(object):
     def __init__(self, clipper, fullname):
+        if fullname is None:
+            fullname = ""
+        assert isinstance(clipper, str)
+        assert isinstance(fullname, str)
         self.clipper = clipper
         self.fullname = fullname
 
@@ -60,18 +64,22 @@ def autocomplete(request):
             ['(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(**{"bit": bit})
              for bit in bits]
         ))
-        with Connection(settings.LDAP_SERVER_URL) as conn:
-            conn.search(
-                'dc=spi,dc=ens,dc=fr', ldap_query,
-                attributes=['uid', 'cn']
-            )
-            queries['clippers'] = conn.entries
-        # Clearing redundancies
-        queries['clippers'] = [
-            Clipper(clipper.uid, clipper.cn)
-            for clipper in queries['clippers']
-            if str(clipper.uid) not in usernames
-        ]
+        if ldap_query != "(&)":
+            # If none of the bits were legal, we do not perform the query
+            entries = None
+            with Connection(settings.LDAP_SERVER_URL) as conn:
+                conn.search(
+                    'dc=spi,dc=ens,dc=fr', ldap_query,
+                    attributes=['uid', 'cn']
+                )
+                entries = conn.entries
+            # Clearing redundancies
+            queries['clippers'] = [
+                Clipper(entry.uid.value, entry.cn.value)
+                for entry in entries
+                if entry.uid.value is not None
+                and entry.uid.value not in usernames
+            ]
 
     # Resulting data
     data.update(queries)
diff --git a/kfet/autocomplete.py b/kfet/autocomplete.py
index 64fa52cf..acc6ebd8 100644
--- a/kfet/autocomplete.py
+++ b/kfet/autocomplete.py
@@ -14,6 +14,10 @@ from kfet.models import Account
 
 class Clipper(object):
     def __init__(self, clipper, fullname):
+        if fullname is None:
+            fullname = ""
+        assert isinstance(clipper, str)
+        assert isinstance(fullname, str)
         self.clipper = clipper
         self.fullname = fullname
 
@@ -79,18 +83,22 @@ def account_create(request):
             ['(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(bit=word)
              for word in search_words]
         ))
-        with Connection(settings.LDAP_SERVER_URL) as conn:
-            conn.search(
-                'dc=spi,dc=ens,dc=fr', ldap_query,
-                attributes=['uid', 'cn']
-            )
-            queries['clippers'] = conn.entries
-        # Clearing redundancies
-        queries['clippers'] = [
-            Clipper(clipper.uid, clipper.cn)
-            for clipper in queries['clippers']
-            if str(clipper.uid) not in usernames
-        ]
+        if ldap_query != "(&)":
+            # If none of the bits were legal, we do not perform the query
+            entries = None
+            with Connection(settings.LDAP_SERVER_URL) as conn:
+                conn.search(
+                    'dc=spi,dc=ens,dc=fr', ldap_query,
+                    attributes=['uid', 'cn']
+                )
+                entries = conn.entries
+            # Clearing redundancies
+            queries['clippers'] = [
+                Clipper(entry.uid.value, entry.cn.value)
+                for entry in entries
+                if entry.uid.value is not None
+                and entry.uid.value not in usernames
+            ]
 
     # Resulting data
     data.update(queries)