corrections

Author: alainabbas

src/lib/ad_utils.py

@@ -52,9 +52,12 @@ def compose_dn(entity):
     if branchAttr != '':
         branchValue=u.find_key(entity,branchAttr)
         key_branch='branchFor' + branchValue
-        branch=u.config(key_branch,'')
-        data['branch']=branch
-        template_string = 'cn={{ rdnValue}},{{ branch }},{{ config.base }}'
+        if branchValue != '':
+            branch=u.config(key_branch,'')
+            data['branch']=branch
+            template_string = 'cn={{ rdnValue}},{{ branch }},{{ config.base }}'
+        else:
+            template_string = 'cn={{ rdnValue}},{{ config.base }}'
     else:
         template_string= 'cn={{ rdnValue}},{{ config.base }}'
     template = jinja2.Environment(loader=jinja2.BaseLoader()).from_string(u.config('dnTemplate',template_string))

src/lib/backend_utils.py

@@ -59,18 +59,23 @@ def _finditem(obj, key):
             item = _finditem(v, key)
             if item is not None:
                 return item
-
+    return ""
 def make_entry_array(entity):
     data={}
     if "identity" in entity['payload']:
         objectclasses = entity['payload']['identity']['identity']['additionalFields']['objectClasses']
         inetOrgPerson=entity['payload']['identity']['identity']['inetOrgPerson']
-        additionalFields=entity['payload']['identity']['identity']['additionalFields']['attributes']
-
+        if 'attributes' in entity['payload']['identity']['identity']['additionalFields']:
+            additionalFields=entity['payload']['identity']['identity']['additionalFields']['attributes']
+        else:
+            additionalFields = {}
     else:
         objectclasses=entity['payload']['additionalFields']['objectClasses']
         inetOrgPerson = entity['payload']['inetOrgPerson']
-        additionalFields = entity['payload']['additionalFields']['attributes']
+        if 'attributes' in entity['payload']['additionalFields']:
+            additionalFields = entity['payload']['additionalFields']['attributes']
+        else:
+            additionalFields = {}
     #inetOrgPerson
     for k,v in inetOrgPerson.items():
         data[k]=str(v)