UST memberOf Update (#578)

UST dynamtic group mappings now reads member information from new config
dynamic_group_member_attribute. Implement usecases from
https://jira.corp.adobe.com/browse/DMESVCS-99

Author: bajwa-adobe

user_sync/app.py

@@ -335,7 +335,10 @@ def begin_work(config_loader):
         additional_group_filters = [r['source'] for r in additional_groups]
     if directory_connector is not None:
         directory_connector.state.additional_group_filters = additional_group_filters
-
+        # show error dynamic mappings enabled but 'dynamic_group_member_attribute' is not defined
+        if additional_group_filters and directory_connector.state.options['dynamic_group_member_attribute'] is None:
+            raise AssertionException(
+                "Failed to enable dynamic group mappings. 'dynamic_group_member_attribute' is not defined in config")
     primary_name = '.primary' if secondary_umapi_configs else ''
     umapi_primary_connector = user_sync.connector.umapi.UmapiConnector(primary_name, primary_umapi_config)
     umapi_other_connectors = {}

user_sync/connector/directory_ldap.py

@@ -77,7 +77,6 @@ def __init__(self, caller_options):
         self.user_given_name_formatter = LDAPValueFormatter(options['user_given_name_format'])
         self.user_surname_formatter = LDAPValueFormatter(options['user_surname_format'])
         self.user_country_code_formatter = LDAPValueFormatter(options['user_country_code_format'])
-        self.user_memberof_format_formatter = LDAPValueFormatter(options['user_memberof_format'])
 
         auth_method = options['authentication_method'].lower()
 
@@ -138,7 +137,7 @@ def get_options(caller_config):
         builder.set_string_value('user_given_name_format', six.text_type('{givenName}'))
         builder.set_string_value('user_surname_format', six.text_type('{sn}'))
         builder.set_string_value('user_country_code_format', six.text_type('{c}'))
-        builder.set_string_value('user_memberof_format', six.text_type('{memberOf}'))
+        builder.set_string_value('dynamic_group_member_attribute', None)
         builder.set_string_value('user_identity_type', None)
         builder.set_int_value('search_page_size', 200)
         builder.set_string_value('logger_name', LDAPDirectoryConnector.name)
@@ -304,6 +303,9 @@ def iter_group_member_dns(self, group_dn, member_attribute, searched_dns=None):
             pass
 
     def iter_users(self, base_dn, users_filter, extended_attributes):
+        options = self.options
+        dynamic_group_member_attribute = options['dynamic_group_member_attribute']
+
         user_attribute_names = []
         user_attribute_names.extend(self.user_given_name_formatter.get_attribute_names())
         user_attribute_names.extend(self.user_surname_formatter.get_attribute_names())
@@ -312,7 +314,8 @@ def iter_users(self, base_dn, users_filter, extended_attributes):
         user_attribute_names.extend(self.user_email_formatter.get_attribute_names())
         user_attribute_names.extend(self.user_username_formatter.get_attribute_names())
         user_attribute_names.extend(self.user_domain_formatter.get_attribute_names())
-        user_attribute_names.extend(self.user_memberof_format_formatter.get_attribute_names())
+        if dynamic_group_member_attribute is not None:
+            user_attribute_names.append(six.text_type(dynamic_group_member_attribute))
 
         extended_attributes = [six.text_type(attr) for attr in extended_attributes]
         extended_attributes = list(set(extended_attributes) - set(user_attribute_names))
@@ -391,7 +394,7 @@ def iter_users(self, base_dn, users_filter, extended_attributes):
             if c_value is not None:
                 user['country'] = c_value.upper()
 
-            user['member_groups'] = self.get_member_groups(record) if self.additional_group_filters else []
+            user['member_groups'] = self.get_member_groups(record, dynamic_group_member_attribute) if self.additional_group_filters else []
 
             if extended_attributes is not None:
                 for extended_attribute in extended_attributes:
@@ -405,15 +408,15 @@ def iter_users(self, base_dn, users_filter, extended_attributes):
 
             yield (dn, user)
 
-    def get_member_groups(self, user):
+    def get_member_groups(self, user, dynamic_group_member_attribute):
         """
         Get a list of member group common names for user
         Assumes groups are contained in attribute memberOf
         :param user:
         :return:
         """
         group_names = []
-        groups = LDAPValueFormatter.get_attribute_value(user, 'memberOf')
+        groups = LDAPValueFormatter.get_attribute_value(user, dynamic_group_member_attribute)
 
         if not groups:
             return group_names