Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/shared/gdp/base.py

@@ -3204,10 +3204,12 @@ def create_project_user(
         mig_user_dict['comment'] = "GDP autocreated user for project: %r" \
             % project_name
         mig_user_dict['openid_names'] = aliases
+        # Blank out the remaining fields not to copy from main user
         mig_user_dict['auth'] = ['']
         mig_user_dict['short_id'] = ''
         mig_user_dict['old_password'] = ''
         mig_user_dict['password'] = ''
+        mig_user_dict['unique_id'] = ''
         mig_user_db_path = default_db_path(configuration)
         try:
             create_user(mig_user_dict, configuration.config_file,

mig/shared/useradm.py

@@ -667,6 +667,8 @@ def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
         openid_names.append(short_id)
     add_names = []
 
+    # TODO: should GDP project users actually get their OWN unique_id, too?
+    #       They inadvertently copied the main user unique_id for a while.
     # NOTE: careful to skip GDP project users in openid and unique_id setup
     if not configuration.site_enable_gdp or \
             not is_gdp_user(configuration, client_id):
@@ -675,9 +677,11 @@ def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
             add_names.append(user[configuration.user_openid_alias])
 
         # Make sure unique_id is really unique in user DB
+        # Explicitly skip GDP users to avoid stale leftovers (see TODO above)
         all_unique = [i['unique_id'] for (_, i) in user_db.items() if
                       i.get('unique_id', None) and
-                      i['distinguished_name'] != client_id]
+                      i['distinguished_name'] != client_id and
+                      not is_gdp_user(configuration, i['distinguished_name'])]
         found_unique = False
         for _ in range(4):
             user['unique_id'] = user.get('unique_id', False)