From fd5ccb3ad0bc2a7f646cbe96a9086df30ae1efa7 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Thu, 4 Apr 2013 22:32:21 -0500
Subject: [PATCH] Update refs to user.info

In 266b86a, user.info was changed in all the user providers to return an
empty dict if the user passed to it was not present. This commit updates
the refs in salt.modules.ssh so that they use dict.get (or check if the
return data from user.info resolves to False) where appropriate.

There are a few remaining refs in salt.states.user.present, but in all
of those remaining cases the user.info function is only run in instances
where the user already exists.
---
 salt/modules/ssh.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/salt/modules/ssh.py b/salt/modules/ssh.py
index 6ff80943f5..8a9712f824 100644
--- a/salt/modules/ssh.py
+++ b/salt/modules/ssh.py
@@ -78,6 +78,9 @@ def _replace_auth_key(
 
     lines = []
     uinfo = __salt__['user.info'](user)
+    if not uinfo:
+        msg = 'User {0} does not exist'.format(user)
+        raise CommandExecutionError(msg)
     full = os.path.join(uinfo['home'], config)
     try:
         # open the file for both reading AND writing
@@ -219,8 +222,8 @@ def auth_keys(user, config='.ssh/authorized_keys'):
         salt '*' ssh.auth_keys root
     '''
     uinfo = __salt__['user.info'](user)
-    full = os.path.join(uinfo['home'], config)
-    if not os.path.isfile(full):
+    full = os.path.join(uinfo.get('home', ''), config)
+    if not uinfo or not os.path.isfile(full):
         return {}
 
     return _validate_keys(full)
@@ -286,7 +289,9 @@ def rm_auth_key(user, key, config='.ssh/authorized_keys'):
     if key in current:
         # Remove the key
         uinfo = __salt__['user.info'](user)
-        full = os.path.join(uinfo['home'], config)
+        if not uinfo:
+            return 'User {0} does not exist'.format(user)
+        full = os.path.join(uinfo.get('home', ''), config)
 
         # Return something sensible if the file doesn't exist
         if not os.path.isfile(full):
@@ -403,6 +408,8 @@ def set_auth_key(
 
     enc = _refine_enc(enc)
     uinfo = __salt__['user.info'](user)
+    if not uinfo:
+        return 'fail'
     status = check_key(user, key, enc, comment, options, config)
     if status == 'update':
         _replace_auth_key(user, key, enc, comment, options or [], config)
@@ -411,7 +418,7 @@ def set_auth_key(
         return 'no change'
     else:
         auth_line = _format_auth_line(key, enc, comment, options)
-        if not os.path.isdir(uinfo['home']):
+        if not os.path.isdir(uinfo.get('home', '')):
             return 'fail'
         fconfig = os.path.join(uinfo['home'], config)
         if not os.path.isdir(os.path.dirname(fconfig)):
@@ -469,8 +476,8 @@ def get_known_host(user, hostname, config='.ssh/known_hosts'):
         salt '*' ssh.get_known_host <user> <hostname>
     '''
     uinfo = __salt__['user.info'](user)
-    full = os.path.join(uinfo['home'], config)
-    if not os.path.isfile(full):
+    full = os.path.join(uinfo.get('home', ''), config)
+    if not uinfo or not os.path.isfile(full):
         return None
     cmd = 'ssh-keygen -F "{0}" -f "{1}"'.format(hostname, full)
     lines = __salt__['cmd.run'](cmd).splitlines()
@@ -538,7 +545,10 @@ def rm_known_host(user, hostname, config='.ssh/known_hosts'):
         salt '*' ssh.rm_known_host <user> <hostname>
     '''
     uinfo = __salt__['user.info'](user)
-    full = os.path.join(uinfo['home'], config)
+    if not uinfo:
+        return {'status': 'error',
+                'error': 'User {0} does not exist'.format(user)}
+    full = os.path.join(uinfo.get('home', ''), config)
     if not os.path.isfile(full):
         return {'status': 'error',
                 'error': 'Known hosts file {0} does not exist'.format(full)}
@@ -592,6 +602,9 @@ def set_known_host(user, hostname,
     rm_known_host(user, hostname, config=config)
     # set up new value
     uinfo = __salt__['user.info'](user)
+    if not uinfo:
+        return {'status': 'error',
+                'error': 'User {0} does not exist'.format(user)}
     full = os.path.join(uinfo['home'], config)
     line = '{hostname} {enc} {key}\n'.format(**remote_host)