Improved unit test coverage of mig lib janitor

mig/lib/janitor.py

@@ -287,6 +287,8 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
         else:
             _logger.info("rejected invalid %r account request" % client_id)
     elif reset_token:
+        # TODO: handle loaded user_dict == None here (e.g. recently removed)
+        #       to avoid verify_reset_token failing on DN access.
         valid_reset = verify_reset_token(
             configuration, user_dict, reset_token, req_auth, req_timestamp
         )

mig/shared/useradm.py

@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # --- END_HEADER ---
 #
@@ -130,7 +130,7 @@
         return True
     try:
         os.remove(link_path)
     except:
         raise Exception('could not remove symlink: %s' % link_path)
     return True
 
@@ -352,7 +352,7 @@
         regex_patterns = ['distinguished_name']
     else:
         regex_patterns = []
     (_, hits) = search_users(search_filter, configuration, db_path, force, verbose,
                              regex_match=regex_patterns)
     peer_notes = []
     if not hits:
@@ -588,16 +588,16 @@
                                                      reset_auth_type,
                                                      req_timestamp)
                     if valid_reset:
                         _logger.info("%r requested and authorized password reset"
                                      % client_id)
                         if verbose:
                             print("User requested and authorized password reset")
                         authorized = True
                     else:
                         _logger.warning("%r requested password reset with bad token"
                                         % client_id)
                         if verbose:
                             print("User requested password reset with bad token")
 
                 if authorized:
                     _logger.info("%r authorized password update" % client_id)
@@ -628,7 +628,7 @@
                         if verbose:
                             print("""Renewal request supplied a different
 password and you didn't accept change anyway - nothing more to do""")
                         err = """Cannot renew account using a new password!
 Please tell user to use the original password, request password reset or go
 through renewal using Xgi-bin with proper authentication to authorize the
 change."""
@@ -645,7 +645,7 @@
                         not isinstance(val, basestring) and \
                         isinstance(val, list):
                     val_list = updated_user.get(key, [])
                     val_list += [i for i in val if not i in val_list]
                     updated_user[key] = val_list
                 elif val:
                     updated_user[key] = val
@@ -666,7 +666,7 @@
     short_id = user.get('short_id', '')
     # For cert users short_id is the full DN so we should ignore then
     if short_id and short_id != client_id and short_id.find(' ') == -1 and \
             not short_id in openid_names:
         openid_names.append(short_id)
     add_names = []
 
@@ -741,7 +741,7 @@
     return user
 
 
 def create_user_in_fs(configuration, client_id, user, now, renew, force, verbose):
     """Handle all the parts of user creation or renewal relating to making
     directories and writing default files.
     """
@@ -1154,7 +1154,7 @@
         for (share_id, share_dict) in sharelinks.items():
             # Update owner and use generic update helper to replace symlink
             share_dict['owner'] = client_id
             (mod_status, err) = update_share_link(share_dict, client_id,
                                                   configuration, sharelinks)
             if verbose:
                 if mod_status:
@@ -1425,14 +1425,14 @@
         res_map = get_resource_map(configuration)
         for (res_id, res) in res_map.items():
             if client_id in res[OWNERS]:
                 (add_status, err) = resource_add_owners(configuration, res_id,
                                                         [new_id])
                 if not add_status:
                     if verbose:
                         print('Could not add new %s owner of %s: %s'
                               % (new_id, res_id, err))
                     continue
                 (del_status, err) = resource_remove_owners(configuration, res_id,
                                                            [client_id])
                 if not del_status:
                     if verbose:
@@ -1453,14 +1453,14 @@
     for (vgrid_name, vgrid) in vgrid_map[VGRIDS].items():
         if client_id in vgrid[OWNERS]:
 
             (add_status, err) = vgrid_add_owners(configuration, vgrid_name,
                                                  [new_id])
             if not add_status:
                 if verbose:
                     print('Could not add new %s owner of %s: %s'
                           % (new_id, vgrid_name, err))
                 continue
             (del_status, err) = vgrid_remove_owners(configuration, vgrid_name,
                                                     [client_id])
             if not del_status:
                 if verbose:
@@ -1472,14 +1472,14 @@
                                                           client_id,
                                                           new_id))
         elif client_id in vgrid[MEMBERS]:
             (add_status, err) = vgrid_add_members(configuration, vgrid_name,
                                                   [new_id])
             if not add_status:
                 if verbose:
                     print('Could not add new %s member of %s: %s'
                           % (new_id, vgrid_name, err))
                 continue
             (del_status, err) = vgrid_remove_members(configuration, vgrid_name,
                                                      [client_id])
             if not del_status:
                 if verbose:
@@ -1496,7 +1496,7 @@
     (re_status, re_list) = list_runtime_environments(configuration)
     if re_status:
         for re_name in re_list:
             (re_status, err) = update_runtimeenv_owner(re_name, client_id,
                                                        new_id, configuration)
             if verbose:
                 if re_status:
@@ -1518,7 +1518,7 @@
         for (share_id, share_dict) in sharelinks.items():
             # Update owner and use generic update helper to replace symlink
             share_dict['owner'] = new_id
             (mod_status, err) = update_share_link(share_dict, new_id,
                                                   configuration, sharelinks)
             if verbose:
                 if mod_status:
@@ -2400,6 +2400,9 @@
     else:
         configuration = get_configuration_object()
     _logger = configuration.logger
+    addresses = dict(zip(configuration.notify_protocols,
+                         [[] for _ in configuration.notify_protocols]))
+    addresses['email'] = []
     if db_path == keyword_auto:
         db_path = default_db_path(configuration)
     try:
@@ -2414,7 +2417,8 @@
         if verbose:
             print(err_msg)
         _logger.error(err_msg)
-        return []
+        errors.append("notify %r preparation failed: %s" % (user_id, err_msg))
+        return (configuration, None, addresses, errors)
 
     user_fields = {}
     if user_id in user_db:
@@ -2439,9 +2443,6 @@
         for field in get_fields:
             user_fields[field] = user_dict.get(field, None)
 
-    addresses = dict(zip(configuration.notify_protocols,
-                         [[] for _ in configuration.notify_protocols]))
-    addresses['email'] = []
     for (proto, address_list) in targets.items():
         if not proto in configuration.notify_protocols + ['email']:
             errors.append('unsupported protocol: %s' % proto)