use Executor class for better subprocess calling on server

1 files changed, 21 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index 7b6c9c418..fb5bd50bf 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -8,8 +8,8 @@ import shutil
 import logging
 import tempfile
 from itertools import chain
-from subprocess import Popen, PIPE
 import Bcfg2.Server.Plugin
+from Bcfg2.Utils import Executor
 from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Compat import any, u_str, b64encode  # pylint: disable=W0622
 
@@ -20,9 +20,7 @@ class KeyData(Bcfg2.Server.Plugin.SpecificData):
     """ class to handle key data for HostKeyEntrySet """
 
     def __init__(self, name, specific, encoding):
-        Bcfg2.Server.Plugin.SpecificData.__init__(self,
-                                                  name,
-                                                  specific,
+        Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific,
                                                   encoding)
         self.encoding = encoding
 
@@ -150,6 +148,8 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                 HostKeyEntrySet(keypattern, self.data)
             self.Entries['Path']["/etc/ssh/" + keypattern] = self.build_hk
 
+        self.cmd = Executor()
+
     def get_skn(self):
         """Build memory cache of the ssh known hosts file."""
         if not self.__skn:
@@ -174,7 +174,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                     newnames.add(name.split('.')[0])
                     try:
                         newips.add(self.get_ipcache_entry(name)[0])
-                    except:  # pylint: disable=W0702
+                    except PluginExecutionError:
                         continue
                 names[cmeta.hostname].update(newnames)
                 names[cmeta.hostname].update(cmeta.addresses)
@@ -279,12 +279,13 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                          (event.filename, action))
 
     def get_ipcache_entry(self, client):
-        """Build a cache of dns results."""
+        """ Build a cache of dns results. """
         if client in self.ipcache:
             if self.ipcache[client]:
                 return self.ipcache[client]
             else:
-                raise socket.gaierror
+                raise PluginExecutionError("No cached IP address for %s" %
+                                           client)
         else:
             # need to add entry
             try:
@@ -292,14 +293,17 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                 self.ipcache[client] = (ipaddr, client)
                 return (ipaddr, client)
             except socket.gaierror:
-                ipaddr = Popen(["getent", "hosts", client],
-                               stdout=PIPE).stdout.read().strip().split()
-                if ipaddr:
-                    self.ipcache[client] = (ipaddr, client)
-                    return (ipaddr, client)
+                result = self.cmd.run(["getent", "hosts", client])
+                if result.success:
+                    ipaddr = result.stdout.strip().split()
+                    if ipaddr:
+                        self.ipcache[client] = (ipaddr, client)
+                        return (ipaddr, client)
                 self.ipcache[client] = False
-                self.logger.error("Failed to find IP address for %s" % client)
-                raise socket.gaierror
+                msg = "Failed to find IP address for %s: %s" % (client,
+                                                                result.error)
+                self.logger(msg)
+                raise PluginExecutionError(msg)
 
     def get_namecache_entry(self, cip):
         """Build a cache of name lookups from client IP addresses."""
@@ -398,11 +402,10 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
         cmd = ["ssh-keygen", "-q", "-f", temploc, "-N", "",
                "-t", keytype, "-C", "root@%s" % client]
         self.debug_log("SSHbase: Running: %s" % " ".join(cmd))
-        proc = Popen(cmd, stdout=PIPE, stdin=PIPE)
-        err = proc.communicate()[1]
-        if proc.wait():
+        result = self.cmd.run(cmd)
+        if not result.success:
             raise PluginExecutionError("SSHbase: Error running ssh-keygen: %s"
-                                       % err)
+                                       % result.error)
 
         try:
             shutil.copy(temploc, fileloc)