Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

30 files changed, 3546 insertions, 2 deletions

diff --git a/func/Makefile b/func/Makefile
index 86a3db8..99fd546 100755
--- a/func/Makefile
+++ b/func/Makefile
@@ -1,6 +1,7 @@
 
 
 PYFILES		= $(wildcard *.py)
+PYDIRS = minion overlord
 
 PYCHECKER       = /usr/bin/pychecker
 PYFLAKES	= /usr/bin/pyflakes
@@ -17,3 +18,7 @@ pychecker::
 pyflakes::
 	@$(PYFLAKES) $(PYFILES) || exit 0
 
+pychecker::
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done   
+pyflakes::
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done	
diff --git a/func/certmaster.py b/func/certmaster.py
index e881b3e..e8c046d 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -33,6 +33,8 @@ import utils
 from config import read_config
 from commonconfig import CMConfig
 
+CERTMASTER_LISTEN_PORT = 51235
+
 class CertMaster(object):
     def __init__(self, conf_file):
         self.cfg = read_config(conf_file, CMConfig)
@@ -203,7 +205,7 @@ def serve(xmlrpcinstance):
     Code for starting the XMLRPC service.
     """
 
-    server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port))
+    server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, CERTMASTER_LISTEN_PORT))
     server.logRequests = 0 # don't print stuff to console
     server.register_instance(xmlrpcinstance)
     server.serve_forever()
diff --git a/func/commonconfig.py b/func/commonconfig.py
index 559c290..cbf031e 100644
--- a/func/commonconfig.py
+++ b/func/commonconfig.py
@@ -4,7 +4,6 @@ from config import BaseConfig, BoolOption, IntOption, Option
 
 class CMConfig(BaseConfig):
     listen_addr = Option('')
-    listen_port = IntOption(51235)
     cadir = Option('/etc/pki/func/ca')
     certroot =  Option('/var/lib/func/certmaster/certs')
     csrroot = Option('/var/lib/func/certmaster/csrs')
diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py
new file mode 100644
index 0000000..265d1b2
--- /dev/null
+++ b/func/minion/AuthedXMLRPCServer.py
@@ -0,0 +1,140 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
+# Modifications by Seth Vidal - 2007
+
+import sys
+import socket
+import SimpleXMLRPCServer
+from func import SSLCommon
+import OpenSSL
+
+
+
+class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
+
+    # For some reason, httplib closes the connection right after headers
+    # have been sent if the connection is _not_ HTTP/1.1, which results in
+    # a "Bad file descriptor" error when the client tries to read from the socket
+    protocol_version = "HTTP/1.1"
+
+    def setup(self):
+        """
+        We need to use socket._fileobject Because SSL.Connection
+        doesn't have a 'dup'. Not exactly sure WHY this is, but
+        this is backed up by comments in socket.py and SSL/connection.c
+        """
+        self.connection = self.request # for doPOST
+        self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)
+        self.wfile = socket._fileobject(self.request, "wb", self.wbufsize)
+
+    def do_POST(self):
+        self.server._this_request = (self.request, self.client_address)
+        try:
+            SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.do_POST(self)
+        except socket.timeout:
+            pass
+        except (socket.error, OpenSSL.SSL.SysCallError), e:
+            print "Error (%s): socket error - '%s'" % (self.client_address, e)
+
+
+class BaseAuthedXMLRPCServer:
+    def __init__(self, address, authinfo_callback=None):
+        self.allow_reuse_address = 1
+        self.logRequests = 1
+        self.authinfo_callback = authinfo_callback
+
+        self.funcs = {}
+        self.instance = None
+
+    def get_authinfo(self, request, client_address):
+        print 'down here'
+        if self.authinfo_callback:
+            return self.authinfo_callback(request, client_address)
+        return None
+
+
+class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.BaseSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer):
+    """ Extension to allow more fine-tuned SSL handling """
+
+    def __init__(self, address, pkey, cert, ca_cert, authinfo_callback=None, timeout=None):
+        BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback)
+        SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler)
+        SSLCommon.BaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, pkey, cert, ca_cert, timeout=timeout)
+
+
+
+class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.BaseServer, SimpleXMLRPCServer.SimpleXMLRPCServer):
+
+    def __init__(self, address, authinfo_callback=None):
+        BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback)
+        SSLCommon.BaseServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler)
+
+
+###########################################################
+# Testing stuff
+###########################################################
+
+class ReqHandler:
+    def ping(self, callerid, trynum):
+        print 'clearly not'
+        print callerid
+        print trynum
+        return "pong %d / %d" % (callerid, trynum)
+
+class TestServer(AuthedSSLXMLRPCServer):
+    """
+    SSL XMLRPC server that authenticates clients based on their certificate.
+    """
+
+    def __init__(self, address, pkey, cert, ca_cert):
+        AuthedSSLXMLRPCServer.__init__(self, address, pkey, cert, ca_cert, self.auth_cb)
+
+    def _dispatch(self, method, params):
+        if method == 'trait_names' or method == '_getAttributeNames':
+            return dir(self)
+        # if we have _this_request then we get the peer cert from it
+        # handling all the authZ checks in _dispatch() means we don't even call the method
+        # for whatever it wants to do and we have the method name.
+
+        if hasattr(self, '_this_request'):
+            r,a = self._this_request
+            p = r.get_peer_certificate()
+            print dir(p)
+            print p.get_subject()
+        else:
+            print 'no cert'
+
+        return "your mom"
+
+    def auth_cb(self, request, client_address):
+        peer_cert = request.get_peer_certificate()
+        return peer_cert.get_subject().CN
+
+
+if __name__ == '__main__':
+    if len(sys.argv) < 4:
+        print "Usage: python AuthdXMLRPCServer.py key cert ca_cert"
+        sys.exit(1)
+
+    pkey = sys.argv[1]
+    cert = sys.argv[2]
+    ca_cert = sys.argv[3]
+
+    print "Starting the server."
+    server = TestServer(('localhost', 51234), pkey, cert, ca_cert)
+    h = ReqHandler()
+    server.register_instance(h)
+    server.serve_forever()
diff --git a/func/minion/Makefile b/func/minion/Makefile
new file mode 100755
index 0000000..d630382
--- /dev/null
+++ b/func/minion/Makefile
@@ -0,0 +1,24 @@
+
+
+PYFILES		= $(wildcard *.py)
+PYDIRS = modules
+
+PYCHECKER       = /usr/bin/pychecker
+PYFLAKES	= /usr/bin/pyflakes
+
+clean::
+	@rm -fv *.pyc *~ .*~ *.pyo
+	@find . -name .\#\* -exec rm -fv {} \;
+	@rm -fv *.rpm
+
+
+pychecker::
+	@$(PYCHECKER) $(PYFILES) || exit 0
+
+pyflakes::
+	@$(PYFLAKES) $(PYFILES) || exit 0
+
+pychecker::
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done   
+pyflakes::
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done	
diff --git a/func/minion/__init__.py b/func/minion/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/func/minion/__init__.py
diff --git a/func/minion/codes.py b/func/minion/codes.py
new file mode 100755
index 0000000..058ca44
--- /dev/null
+++ b/func/minion/codes.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+"""
+func
+
+Copyright 2007, Red Hat, Inc
+See AUTHORS
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+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., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+import exceptions
+
+
+class FuncException(exceptions.Exception):
+    pass
+
+class InvalidMethodException(FuncException):
+    pass
+
+# FIXME: more sub-exceptions maybe
diff --git a/func/minion/module_loader.py b/func/minion/module_loader.py
new file mode 100755
index 0000000..1339359
--- /dev/null
+++ b/func/minion/module_loader.py
@@ -0,0 +1,112 @@
+#!/usr/bin/python
+
+## func
+##
+## Copyright 2007, Red Hat, Inc
+## See AUTHORS
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+##
+
+
+import distutils.sysconfig
+import os
+import sys
+from gettext import gettext
+_ = gettext
+
+
+def module_walker(topdir):
+    module_files = []
+    for root, dirs, files in os.walk(topdir):
+        # we should get here for each subdir
+        for filename in files:
+            # ASSUMPTION: all module files will end with .py, .pyc, .pyo
+            if filename[-3:] == ".py" or filename[-4:] == ".pyc" or filename[-4:] == ".pyo":
+                # we don't really care about __init__ files, though we do requure them
+                if filename[:8] == "__init__":
+                    continue
+                # the normpath is important, since we eventually replace /'s with .'s
+                # in the module name, and foo..bar doesnt work -akl
+                module_files.append(os.path.normpath("%s/%s" % (root, filename)))
+
+
+    return module_files
+
+def load_modules(blacklist=None):
+
+    module_file_path="%s/func/minion/modules/" % distutils.sysconfig.get_python_lib()
+    mod_path="%s/func/minion/"  % distutils.sysconfig.get_python_lib()
+
+    sys.path.insert(0, mod_path)
+    mods = {}
+    bad_mods = {}
+
+    filenames = module_walker(module_file_path)
+
+    # FIXME: this is probably more complicated than it needs to be -akl
+    for fn in filenames:
+        # aka, everything after the module_file_path
+        module_name_part = fn[len(module_file_path):]
+        dirname, basename = os.path.split(module_name_part)
+
+        if basename == "__init__.py":
+            continue
+        if basename[-3:] == ".py":
+            modname = basename[:-3]
+        elif basename[-4:] in [".pyc", ".pyo"]:
+            modname = basename[:-4]
+
+        pathname = modname
+        if dirname != "":
+            pathname = "%s/%s" % (dirname, modname)
+
+        mod_imp_name = pathname.replace("/", ".")
+
+        if mods.has_key(mod_imp_name):
+            # If we've already imported mod_imp_name, don't import it again
+            continue
+
+        # ignore modules that we've already determined aren't valid modules
+        if bad_mods.has_key(mod_imp_name):
+            continue
+
+        try:
+            blip =  __import__("modules.%s" % ( mod_imp_name), globals(), locals(), [mod_imp_name])
+            if not hasattr(blip, "register_rpc"):
+		errmsg = _("%(module_path)s%(modname)s module not a proper module")
+                print errmsg % {'module_path': module_file_path, 'modname':mod_imp_name}
+                bad_mods[mod_imp_name] = True
+                continue
+            mods[mod_imp_name] = blip
+        except ImportError, e:
+            # A module that raises an ImportError is (for now) simply not loaded.
+            errmsg = _("Could not load %s module: %s")
+            print errmsg % (mod_imp_name, e)
+            bad_mods[mod_imp_name] = True
+
+            continue
+
+    return mods
+
+
+if __name__ == "__main__":
+
+    module_file_path = "/usr/lib/python2.5/site-packages/func/minion/modules/"
+    bar = module_walker(module_file_path)
+    print bar
+    for f in bar:
+        print f
+        print os.path.basename(f)
+        print os.path.split(f)
+        g = f[len(module_file_path):]
+        print g
+        print os.path.split(g)
+
+    print load_modules()
diff --git a/func/minion/modules/Makefile b/func/minion/modules/Makefile
new file mode 100755
index 0000000..f2bc6c4
--- /dev/null
+++ b/func/minion/modules/Makefile
@@ -0,0 +1,18 @@
+
+
+PYFILES		= $(wildcard *.py)
+
+PYCHECKER       = /usr/bin/pychecker
+PYFLAKES	= /usr/bin/pyflakes
+
+clean::
+	@rm -fv *.pyc *~ .*~ *.pyo
+	@find . -name .\#\* -exec rm -fv {} \;
+	@rm -fv *.rpm
+
+
+pychecker::
+	@$(PYCHECKER) $(PYFILES) || exit 0
+
+pyflakes::
+	@$(PYFLAKES) $(PYFILES) || exit 0
diff --git a/func/minion/modules/__init__.py b/func/minion/modules/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/func/minion/modules/__init__.py
diff --git a/func/minion/modules/command.py b/func/minion/modules/command.py
new file mode 100644
index 0000000..06adaaa
--- /dev/null
+++ b/func/minion/modules/command.py
@@ -0,0 +1,38 @@
+# Copyright 2007, Red Hat, Inc
+# James Bowes <jbowes@redhat.com>
+#
+# This software may be freely redistributed under the terms of the GNU
+# general public license.
+#
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+"""
+Abitrary command execution module for func.
+"""
+
+from modules import func_module
+
+import sub_process
+
+class Command(func_module.FuncModule):
+
+    def __init__(self):
+        self.methods = {
+                "run" : self.run
+        }
+        func_module.FuncModule.__init__(self)
+
+    def run(self, command):
+        """
+        Runs a command, returning the return code, stdout, and stderr as a tuple.
+        NOT FOR USE WITH INTERACTIVE COMMANDS.
+        """
+
+        cmdref = sub_process.Popen(command.split(),stdout=sub_process.PIPE,stderr=sub_process.PIPE, shell=False)
+        data = cmdref.communicate()
+        return (cmdref.returncode, data[0], data[1])
+
+methods = Command()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/copyfile.py b/func/minion/modules/copyfile.py
new file mode 100644
index 0000000..a4f91f0
--- /dev/null
+++ b/func/minion/modules/copyfile.py
@@ -0,0 +1,115 @@
+# Copyright 2007, Red Hat, Inc
+# seth vidal
+#
+# This software may be freely redistributed under the terms of the GNU
+# general public license.
+#
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+import sha
+import os
+import time
+import shutil
+
+from modules import func_module
+
+
+
+
+class CopyFile(func_module.FuncModule):
+
+    def __init__(self):
+        self.methods = {
+                "copyfile" : self.copyfile,
+                "checksum" : self.checksum
+        }
+        func_module.FuncModule.__init__(self)
+
+    def checksum(self, thing):
+
+        CHUNK=2**16
+        thissum = sha.new()
+        if os.path.exists(thing):
+            fo = open(thing, 'r', CHUNK)
+            chunk = fo.read
+            while chunk:
+                chunk = fo.read(CHUNK)
+                thissum.update(chunk)
+            fo.close()
+            del fo
+        else:
+            # assuming it's a string of some kind
+            thissum.update(thing)
+
+        return thissum.hexdigest()
+
+
+    def copyfile(self, filepath, filebuf, mode=0644, uid=0, gid=0, force=None):
+        # -1 = problem file was not copied
+        # 1 =  file was copied
+        # 0 = file was not copied b/c file is unchanged
+
+
+        # we should probably verify mode,uid,gid are valid as well
+
+        dirpath = os.path.dirname(filepath)
+        basepath = os.path.basename(filepath)
+        if not os.path.exists(dirpath):
+            os.makedirs(dirpath)
+
+        remote_sum = self.checksum(filebuf)
+        local_sum = 0
+        if os.path.exists(filepath):
+            local_sum = self.checksum(filepath)
+
+        if remote_sum != local_sum or force is not None:
+            # back up the localone
+            if os.path.exists(filepath):
+                if not self._backuplocal(filepath):
+                    return -1
+
+            # do the new write
+            try:
+                fo = open(filepath, 'w')
+                fo.write(filebuf)
+                fo.close()
+                del fo
+            except (IOError, OSError), e:
+                # XXX logger output here
+                return -1
+        else:
+            return 0
+
+        # hmm, need to figure out proper exceptions -akl
+        try:
+            # we could intify the mode here if it's a string
+            os.chmod(filepath, mode)
+            os.chown(filepath, uid, gid)
+        except (IOError, OSError), e:
+            return -1
+
+        return 1
+
+    def _backuplocal(self, fn):
+        """
+        make a date-marked backup of the specified file,
+        return True or False on success or failure
+        """
+        # backups named basename-YYYY-MM-DD@HH:MM~
+        ext = time.strftime("%Y-%m-%d@%H:%M~", time.localtime(time.time()))
+        backupdest = '%s.%s' % (fn, ext)
+
+        try:
+            shutil.copy2(fn, backupdest)
+        except shutil.Error, e:
+            #XXX logger output here
+            return False
+        return True
+
+
+
+methods = CopyFile()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py
new file mode 100755
index 0000000..aa3c132
--- /dev/null
+++ b/func/minion/modules/func_module.py
@@ -0,0 +1,67 @@
+#!/usr/bin/python
+
+##
+## Copyright 2007, Red Hat, Inc
+## see AUTHORS
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+
+from func import logger
+from func.config import read_config
+from func.commonconfig import FuncdConfig
+
+
+class FuncModule(object):
+
+    # the version is meant to
+    version = "0.0.0"
+    api_version = "0.0.0"
+    description = "No Description provided"
+
+    def __init__(self):
+
+        config_file = '/etc/func/minion.conf'
+        self.config = read_config(config_file, FuncdConfig)
+        self.__init_log()
+        self.__base_methods = {
+            # __'s so we don't clobber useful names
+            "module_version" : self.__module_version,
+            "module_api_version" : self.__module_api_version,
+            "module_description" : self.__module_description,
+            "list_methods"       : self.__list_methods
+            }
+
+    def __init_log(self):
+        log = logger.Logger()
+        self.logger = log.logger
+
+    def register_rpc(self, handlers, module_name):
+        # add the internal methods, note that this means they
+        # can get clobbbered by subclass versions
+        for meth in self.__base_methods:
+            handlers["%s.%s" % (module_name, meth)] = self.__base_methods[meth]
+        for meth in self.methods:
+            handlers["%s.%s" % (module_name,meth)] = self.methods[meth]
+
+    def __list_methods(self):
+        return self.methods.keys() + self.__base_methods.keys()
+
+    def __module_version(self):
+        return self.version
+
+    def __module_api_version(self):
+        return self.api_version
+
+    def __module_description(self):
+        return self.description
+
+
+methods = FuncModule()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/hardware.py b/func/minion/modules/hardware.py
new file mode 100755
index 0000000..79faf4c
--- /dev/null
+++ b/func/minion/modules/hardware.py
@@ -0,0 +1,130 @@
+#!/usr/bin/python
+
+##
+## Hardware profiler plugin
+## requires the "smolt" client package be installed
+## but also relies on lspci for some things
+##
+## Copyright 2007, Red Hat, Inc
+## Michael DeHaan <mdehaan@redhat.com>
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+
+# other modules
+import sys
+
+# our modules
+import sub_process
+from modules import func_module
+
+# =================================
+
+class HardwareModule(func_module.FuncModule):
+    def __init__(self):
+        self.methods = {
+            "info"     : self.info,
+            "hal_info" : self.hal_info
+        }
+        func_module.FuncModule.__init__(self)
+
+    def hal_info(self):
+        """
+        Returns the output of lshal, but split up into seperate devices
+        for easier parsing.  Each device is a entry in the return hash.
+        """
+
+        cmd = sub_process.Popen(["/usr/bin/lshal"],shell=False,stdout=sub_process.PIPE)
+        data = cmd.communicate()[0]
+
+        data = data.split("\n")
+
+        results = {}
+        current = ""
+        label = data[0]
+        for d in data:
+            if d == '':
+                results[label] = current
+                current = ""
+                label = ""
+            else:
+                if label == "":
+                    label = d
+                current = current + d
+
+        return results
+
+
+    def info(self,with_devices=True):
+        """
+        Returns a struct of hardware information.  By default, this pulls down
+        all of the devices.  If you don't care about them, set with_devices to
+        False.
+        """
+        return hw_info(with_devices)
+
+# =================================
+
+def hw_info(with_devices=True):
+
+    # this may fail if smolt is not installed.  That's ok.  hal_info will
+    # still work.
+
+    # hack: smolt is not installed in site-packages
+    sys.path.append("/usr/share/smolt/client")
+    import smolt
+
+    hardware = smolt.Hardware()
+    host = hardware.host
+
+    # NOTE: casting is needed because these are DBusStrings, not real strings
+    data = {
+        'os'              : str(host.os),
+        'defaultRunlevel' : str(host.defaultRunlevel),
+        'bogomips'        : str(host.bogomips),
+        'cpuVendor'       : str(host.cpuVendor),
+        'cpuModel'        : str(host.cpuModel),
+        'numCpus'         : str(host.numCpus),
+        'cpuSpeed'        : str(host.cpuSpeed),
+        'systemMemory'    : str(host.systemMemory),
+        'systemSwap'      : str(host.systemSwap),
+        'kernelVersion'   : str(host.kernelVersion),
+        'language'        : str(host.language),
+        'platform'        : str(host.platform),
+        'systemVendor'    : str(host.systemVendor),
+        'systemModel'     : str(host.systemModel),
+        'formfactor'      : str(host.formfactor),
+        'selinux_enabled' : str(host.selinux_enabled),
+        'selinux_enforce' : str(host.selinux_enforce)
+    }
+
+    # if no hardware info requested, just return the above bits
+    if not with_devices:
+        return data
+
+    collection = data["devices"] = []
+
+    for item in hardware.deviceIter():
+
+        (VendorID,DeviceID,SubsysVendorID,SubsysDeviceID,Bus,Driver,Type,Description) = item
+
+        collection.append({
+            "VendorID"       : str(VendorID),
+            "DeviceID"       : str(DeviceID),
+            "SubsysVendorID" : str(SubsysVendorID),
+            "Bus"            : str(Bus),
+            "Driver"         : str(Driver),
+            "Type"           : str(Type),
+            "Description"    : str(Description)
+        })
+
+    return data
+
+methods = HardwareModule()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/process.py b/func/minion/modules/process.py
new file mode 100755
index 0000000..b48b910
--- /dev/null
+++ b/func/minion/modules/process.py
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+
+##
+## Process lister (control TBA)
+##
+## Copyright 2007, Red Hat, Inc
+## Michael DeHaan <mdehaan@redhat.com>
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+# other modules
+import sub_process
+import codes
+
+# our modules
+from modules import func_module
+
+# =================================
+
+class ProcessModule(func_module.FuncModule):
+    def __init__(self):
+        self.methods = {
+            "info"    : self.info,
+            "kill"    : self.kill,
+            "pkill"   : self.pkill
+        }
+        func_module.FuncModule.__init__(self)
+
+    def info(self,flags="-auxh"):
+        """
+        Returns a struct of hardware information.  By default, this pulls down
+        all of the devices.  If you don't care about them, set with_devices to
+        False.
+        """
+
+        flags.replace(";","") # prevent stupidity
+
+
+        #FIXME: we need to swallow stdout/stderr as well, right now it spews to the console
+        cmd = sub_process.Popen(["/bin/ps", flags] ,executable="/bin/ps", stdout=sub_process.PIPE,shell=False)
+        data = cmd.communicate()[0]
+
+        results = []
+
+        for x in data.split("\n"):
+            tokens = x.split()
+            results.append(tokens)
+
+        return results
+
+
+    def kill(self,pid,signal="TERM"):
+        if pid == "0":
+            raise codes.FuncException("Killing pid group 0 not permitted")
+        if signal == "":
+            # this is default /bin/kill behaviour, it claims, but enfore it anyway
+            signal = "-TERM"
+        if signal[0] != "-":
+            signal = "-%s" % signal
+        rc = sub_process.call(["/bin/kill",signal, pid], executable="/bin/kill", shell=False)
+        print rc
+        return rc
+
+    def pkill(self,name,level=""):
+        # example killall("thunderbird","-9")
+        rc = sub_process.call(["/usr/bin/pkill", name, level], executable="/usr/bin/pkill", shell=False)
+        return rc
+
+methods = ProcessModule()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/reboot.py b/func/minion/modules/reboot.py
new file mode 100755
index 0000000..8772b8f
--- /dev/null
+++ b/func/minion/modules/reboot.py
@@ -0,0 +1,29 @@
+# Copyright 2007, Red Hat, Inc
+# James Bowes <jbowes@redhat.com>
+#
+# This software may be freely redistributed under the terms of the GNU
+# general public license.
+#
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+from modules import func_module
+
+import sub_process
+
+class Reboot(func_module.FuncModule):
+
+    def __init__(self):
+        self.methods = {
+                "reboot" : self.reboot
+        }
+        func_module.FuncModule.__init__(self)
+
+    def reboot(self, when='now', message=''):
+        return sub_process.call(["/sbin/shutdown", '-r', when, message])
+
+
+methods = Reboot()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/service.py b/func/minion/modules/service.py
new file mode 100755
index 0000000..433d70b
--- /dev/null
+++ b/func/minion/modules/service.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+
+## func
+##
+## Copyright 2007, Red Hat, Inc
+## Michael DeHaan <mdehaan@redhat.com>
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+##
+
+import codes
+from modules import func_module
+
+import sub_process
+import os
+
+class Service(func_module.FuncModule):
+
+    def __init__(self):
+        self.methods = {
+            "start"   : self.start,
+            "stop"    : self.stop,
+            "restart" : self.restart,
+            "reload"  : self.reload,
+            "status"  : self.status
+        }
+        func_module.FuncModule.__init__(self)
+
+    def __command(self, service_name, command):
+
+        filename = os.path.join("/etc/rc.d/init.d/",service_name)
+        if os.path.exists(filename):
+            return sub_process.call(["/sbin/service", service_name, command])
+        else:
+            raise codes.FuncException("Service not installed: %s" % service_name)
+
+    def start(self, service_name):
+        return self.__command(service_name, "start")
+
+    def stop(self, service_name):
+        return self.__command(service_name, "stop")
+
+    def restart(self, service_name):
+        return self.__command(service_name, "restart")
+
+    def reload(self, service_name):
+        return self.__command(service_name, "reload")
+
+    def status(self, service_name):
+        return self.__command(service_name, "status")
+
+methods = Service()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/smart.py b/func/minion/modules/smart.py
new file mode 100755
index 0000000..c65dfb1
--- /dev/null
+++ b/func/minion/modules/smart.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+##
+## Grabs status from SMART to see if your hard drives are ok
+## Returns in the format of (return code, [line1, line2, line3,...])
+##
+## Copyright 2007, Red Hat, Inc
+## Michael DeHaan <mdehaan@redhat.com>
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+# other modules
+import sub_process
+
+# our modules
+from modules import func_module
+
+# =================================
+
+class SmartModule(func_module.FuncModule):
+    def __init__(self):
+        self.methods = {
+            "info"    : self.info,
+        }
+        func_module.FuncModule.__init__(self)
+
+    def info(self,flags="-q onecheck"):
+        """
+        Returns a struct of hardware information.  By default, this pulls down
+        all of the devices.  If you don't care about them, set with_devices to
+        False.
+        """
+
+        flags.replace(";","") # prevent stupidity
+
+        cmd = sub_process.Popen("/usr/sbin/smartd %s" % flags,stdout=sub_process.PIPE,shell=True)
+        data = cmd.communicate()[0]
+
+        results = []
+
+        for x in data.split("\n"):
+            results.append(x)
+
+        return (cmd.returncode, results)
+
+methods = SmartModule()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/test.py b/func/minion/modules/test.py
new file mode 100755
index 0000000..55265a3
--- /dev/null
+++ b/func/minion/modules/test.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+
+from modules import func_module
+
+class Test(func_module.FuncModule):
+    version = "11.11.11"
+    api_version = "0.0.1"
+    description = "Just a very simple example module"
+    def __init__(self):
+        self.methods = {
+            "add": self.add
+        }
+        func_module.FuncModule.__init__(self)
+
+    def add(self, numb1, numb2):
+        return numb1 + numb2
+
+methods = Test()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/virt.py b/func/minion/modules/virt.py
new file mode 100755
index 0000000..07a9a87
--- /dev/null
+++ b/func/minion/modules/virt.py
@@ -0,0 +1,272 @@
+#!/usr/bin/python
+
+"""
+Virt management features
+
+Copyright 2007, Red Hat, Inc
+Michael DeHaan <mdehaan@redhat.com>
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+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., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+# warning: virt management is rather complicated
+# to see a simple example of func, look at the
+# service control module.  API docs on how
+# to use this to come.
+
+# other modules
+import os
+import sub_process
+import libvirt
+
+# our modules
+import codes
+import func_module
+
+VIRT_STATE_NAME_MAP = {
+   0 : "running",
+   1 : "running",
+   2 : "running",
+   3 : "paused",
+   4 : "shutdown",
+   5 : "shutdown",
+   6 : "crashed"
+}
+
+class FuncLibvirtConnection(object):
+
+    def __init__(self):
+
+
+        cmd = sub_process.Popen("uname -r", shell=True, stdout=sub_process.PIPE)
+        output = cmd.communicate()[0]
+
+        if output.find("xen") != -1:
+            conn = libvirt.open(None)
+        else:
+            conn = libvirt.open("qemu:///system")
+
+        if not conn:
+            raise codes.FuncException("hypervisor connection failure")
+
+        self.conn = conn
+
+    def find_vm(self, vmid):
+        """
+        Extra bonus feature: vmid = -1 returns a list of everything
+        """
+        conn = self.conn
+
+        vms = []
+
+        # this block of code borrowed from virt-manager:
+        # get working domain's name
+        ids = conn.listDomainsID();
+        for id in ids:
+            vm = conn.lookupByID(id)
+            vms.append(vm)
+        # get defined domain
+        names = conn.listDefinedDomains()
+        for name in names:
+            vm = conn.lookupByName(name)
+            vms.append(vm)
+
+        if vmid == -1:
+            return vms
+
+        for vm in vms:
+            if vm.name() == vmid:
+                return vm
+
+        raise codes.FuncException("virtual machine %s not found" % needle)
+
+    def shutdown(self, vmid):
+        return self.find_vm(vmid).shutdown()
+
+    def pause(self, vmid):
+        return suspend(self.conn,vmid)
+
+    def unpause(self, vmid):
+        return resume(self.conn,vmid)
+
+    def suspend(self, vmid):
+        return self.find_vm(vmid).suspend()
+
+    def resume(self, vmid):
+        return self.find_vm(vmid).resume()
+
+    def create(self, vmid):
+        return self.find_vm(vmid).create()
+
+    def destroy(self, vmid):
+        return self.find_vm(vmid).destroy()
+
+    def undefine(self, vmid):
+        return self.find_vm(vmid).undefine()
+
+    def get_status2(self, vm):
+        state = vm.info()[0]
+        # print "DEBUG: state: %s" % state
+        return VIRT_STATE_NAME_MAP.get(state,"unknown")
+
+    def get_status(self, vmid):
+        state = self.find_vm(vmid).info()[0]
+        return VIRT_STATE_NAME_MAP.get(state,"unknown")
+
+
+
+class Virt(func_module.FuncModule):
+
+
+    def __init__(self):
+
+        """
+        Constructor.  Register methods and make them available.
+        """
+
+        self.methods = {
+            "install"  : self.install,
+            "shutdown" : self.shutdown,
+            "destroy"  : self.destroy,
+            "start"    : self.create,
+            "pause"    : self.pause,
+            "unpause"  : self.unpause,
+            "delete"   : self.undefine,
+            "status"   : self.get_status,
+            "list_vms" : self.list_vms,
+        }
+
+        func_module.FuncModule.__init__(self)
+
+    def get_conn(self):
+	self.conn = FuncLibvirtConnection()
+        return self.conn
+
+    def list_vms(self):
+        self.conn = self.get_conn()
+        vms = self.conn.find_vm(-1)
+        results = []
+        for x in vms:
+            try:
+                results.append(x.name())
+            except:
+                pass
+        return results
+
+    def install(self, server_name, target_name, system=False):
+
+        """
+        Install a new virt system by way of a named cobbler profile.
+        """
+
+        # Example:
+        # install("bootserver.example.org", "fc7webserver", True)
+
+        conn = self.get_conn()
+
+        if conn is None:
+            raise codes.FuncException("no connection")
+
+        if not os.path.exists("/usr/bin/koan"):
+            raise codes.FuncException("no /usr/bin/koan")
+        target = "profile"
+        if system:
+            target = "system"
+
+        # TODO: FUTURE: set --virt-path in cobbler or here
+        koan_args = [
+            "/usr/bin/koan",
+            "--virt",
+            "--virt-graphics",  # enable VNC
+            "--%s=%s" % (target, target_name),
+            "--server=%s" % server_name
+        ]
+
+        rc = sub_process.call(koan_args,shell=False)
+        if rc == 0:
+            return 0
+        else:
+            raise codes.FuncException("koan returned %d" % rc)
+
+
+    def shutdown(self, vmid):
+        """
+        Make the machine with the given vmid stop running.
+        Whatever that takes.
+        """
+        self.get_conn()
+        self.conn.shutdown(vmid)
+        return 0
+
+
+    def pause(self, vmid):
+
+        """
+        Pause the machine with the given vmid.
+        """
+        self.get_conn()
+        self.conn.suspend(vmid)
+        return 0
+
+
+    def unpause(self, vmid):
+
+        """
+        Unpause the machine with the given vmid.
+        """
+
+        self.get_conn()
+        self.conn.resume(vmid)
+        return 0
+
+
+    def create(self, vmid):
+
+        """
+        Start the machine via the given mac address.
+        """
+        self.get_conn()
+        self.conn.create(vmid)
+        return 0
+
+
+    def destroy(self, vmid):
+
+        """
+        Pull the virtual power from the virtual domain, giving it virtually no
+        time to virtually shut down.
+        """
+        self.get_conn()
+        self.conn.destroy(vmid)
+        return 0
+
+
+    def undefine(self, vmid):
+
+        """
+        Stop a domain, and then wipe it from the face of the earth.
+        by deleting the disk image and it's configuration file.
+        """
+
+        self.get_conn()
+        self.conn.undefine(vmid)
+        return 0
+
+
+    def get_status(self, vmid):
+
+        """
+        Return a state suitable for server consumption.  Aka, codes.py values, not XM output.
+        """
+
+        self.get_conn()
+        return self.conn.get_status(vmid)
+
+
+methods = Virt()
+register_rpc = methods.register_rpc
diff --git a/func/minion/modules/yum.py b/func/minion/modules/yum.py
new file mode 100644
index 0000000..6600d47
--- /dev/null
+++ b/func/minion/modules/yum.py
@@ -0,0 +1,48 @@
+# Copyright 2007, Red Hat, Inc
+# James Bowes <jbowes@redhat.com>
+#
+# This software may be freely redistributed under the terms of the GNU
+# general public license.
+#
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+from modules import func_module
+
+import yum
+
+# XXX Use internal yum callback or write a useful one.
+class DummyCallback(object):
+
+    def event(self, state, data=None):
+        pass
+
+class Yum(func_module.FuncModule):
+
+    def __init__(self):
+        self.methods = {
+                "update" : self.update
+        }
+        func_module.FuncModule.__init__(self)
+
+    def update(self):
+        # XXX support updating specific rpms
+        ayum = yum.YumBase()
+        ayum.doGenericSetup()
+        ayum.doRepoSetup()
+        try:
+            ayum.doLock()
+            ayum.update()
+            ayum.buildTransaction()
+            ayum.processTransaction(
+                    callback=DummyCallback())
+        finally:
+            ayum.closeRpmDB()
+            ayum.doUnlock()
+        return True
+
+
+methods = Yum()
+register_rpc = methods.register_rpc
diff --git a/func/minion/server.py b/func/minion/server.py
new file mode 100755
index 0000000..f155dba
--- /dev/null
+++ b/func/minion/server.py
@@ -0,0 +1,232 @@
+#!/usr/bin/python
+
+"""
+func
+
+Copyright 2007, Red Hat, Inc
+see AUTHORS
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+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., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+# standard modules
+import SimpleXMLRPCServer
+import string
+import sys
+import traceback
+import socket
+
+from gettext import textdomain
+I18N_DOMAIN = "func"
+
+
+from func.config import read_config
+from func.commonconfig import FuncdConfig
+from func import logger
+
+# our modules
+import AuthedXMLRPCServer
+import codes
+import module_loader
+import utils
+
+
+
+class XmlRpcInterface(object):
+
+    def __init__(self):
+
+        """
+        Constructor.
+        """
+
+        config_file = '/etc/func/minion.conf'
+        self.config = read_config(config_file, FuncdConfig)
+        self.logger = logger.Logger().logger
+        self.audit_logger = logger.AuditLogger()
+        self.__setup_handlers()
+
+        # need a reference so we can log ip's, certs, etc
+#        self.server = server
+
+    def __setup_handlers(self):
+
+        """
+        Add RPC functions from each class to the global list so they can be called.
+        """
+
+        self.handlers = {}
+        for x in self.modules.keys():
+            try:
+                self.modules[x].register_rpc(self.handlers, x)
+                self.logger.debug("adding %s" % x)
+            except AttributeError, e:
+                self.logger.warning("module %s not loaded, missing register_rpc method" % self.modules[x])
+
+
+        # internal methods that we do instead of spreading internal goo
+        # all over the modules. For now, at lest -akl
+
+
+        # system.listMethods os a quasi stanard xmlrpc method, so
+        # thats why it has a odd looking name
+        self.handlers["system.listMethods"] = self.list_methods
+        self.handlers["system.list_modules"] = self.list_modules
+
+    def list_modules(self):
+        return self.modules.keys()
+
+    def list_methods(self):
+        return self.handlers.keys()
+
+    def get_dispatch_method(self, method):
+
+        if method in self.handlers:
+            return FuncApiMethod(self.logger, method, self.handlers[method])
+
+        else:
+            self.logger.info("Unhandled method call for method: %s " % method)
+            raise codes.InvalidMethodException
+
+
+
+
+class FuncApiMethod:
+
+    """
+    Used to hold a reference to all of the registered functions.
+    """
+
+    def __init__(self, logger, name, method):
+
+        self.logger = logger
+        self.__method = method
+        self.__name = name
+
+    def __log_exc(self):
+
+        """
+        Log an exception.
+        """
+
+        (t, v, tb) = sys.exc_info()
+        self.logger.info("Exception occured: %s" % t )
+        self.logger.info("Exception value: %s" % v)
+        self.logger.info("Exception Info:\n%s" % string.join(traceback.format_list(traceback.extract_tb(tb))))
+
+    def __call__(self, *args):
+
+        self.logger.debug("(X) -------------------------------------------")
+
+        try:
+            rc = self.__method(*args)
+        except codes.FuncException, e:
+            self.__log_exc()
+            rc = e
+        except:
+            self.logger.debug("Not a Func-specific exception")
+            self.__log_exc()
+            raise
+        self.logger.debug("Return code for %s: %s" % (self.__name, rc))
+
+        return rc
+
+
+
+def serve():
+
+    """
+    Code for starting the XMLRPC service.
+    """
+    server =FuncSSLXMLRPCServer(('', 51234))
+    server.logRequests = 0 # don't print stuff to console
+    server.serve_forever()
+
+
+
+class FuncXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer, XmlRpcInterface):
+
+    def __init__(self, args):
+
+        self.allow_reuse_address = True
+
+        self.modules = module_loader.load_modules()
+        SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+        XmlRpcInterface.__init__(self)
+
+
+class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer,
+                          XmlRpcInterface):
+    def __init__(self, args):
+        self.allow_reuse_address = True
+        self.modules = module_loader.load_modules()
+
+        XmlRpcInterface.__init__(self)
+        hn = socket.getfqdn()
+        self.key = "%s/%s.pem" % (self.config.cert_dir, hn)
+        self.cert = "%s/%s.cert" % (self.config.cert_dir, hn)
+        self.ca = "%s/ca.cert" % self.config.cert_dir
+
+        AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, ("", 51234),
+                                                          self.key, self.cert,
+                                                          self.ca)
+
+    def _dispatch(self, method, params):
+
+        """
+        the SimpleXMLRPCServer class will call _dispatch if it doesn't
+        find a handler method
+        """
+
+        # Recognize ipython's tab completion calls
+        if method == 'trait_names' or method == '_getAttributeNames':
+            return self.handlers.keys()
+
+        if hasattr(self, '_this_request'):
+            r,a = self._this_request
+            p = r.get_peer_certificate()
+            ip = a[0]
+            cn = p.get_subject().CN
+            sub_hash = p.subject_name_hash()
+        else:
+            print 'no cert'
+
+        # XXX FIXME - need to figure out how to dig into the server base classes
+        # so we can get client ip, and eventually cert id info -akl
+        self.audit_logger.log_call(ip, cn, sub_hash, method, params)
+
+        return self.get_dispatch_method(method)(*params)
+
+    def auth_cb(self, request, client_address):
+        peer_cert = request.get_peer_certificate()
+        return peer_cert.get_subject().CN
+
+
+def main(argv):
+
+    """
+    Start things up.
+    """
+
+    if "daemon" in sys.argv or "--daemon" in sys.argv:
+        utils.daemonize("/var/run/funcd.pid")
+    else:
+        print "serving...\n"
+
+    try:
+        utils.create_minion_keys()
+        serve()
+    except codes.FuncException, e:
+        print >> sys.stderr, 'error: %s' % e
+        sys.exit(1)
+
+# ======================================================================================
+
+if __name__ == "__main__":
+    textdomain(I18N_DOMAIN)
+    main(sys.argv)
diff --git a/func/minion/sub_process.py b/func/minion/sub_process.py
new file mode 100644
index 0000000..351a951
--- /dev/null
+++ b/func/minion/sub_process.py
@@ -0,0 +1,1221 @@
+# subprocess - Subprocesses with accessible I/O streams
+#
+# For more information about this module, see PEP 324.
+#
+# This module should remain compatible with Python 2.2, see PEP 291.
+#
+# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
+#
+# Licensed to PSF under a Contributor Agreement.
+# See http://www.python.org/2.4/license for licensing details.
+
+r"""subprocess - Subprocesses with accessible I/O streams
+
+This module allows you to spawn processes, connect to their
+input/output/error pipes, and obtain their return codes.  This module
+intends to replace several other, older modules and functions, like:
+
+os.system
+os.spawn*
+os.popen*
+popen2.*
+commands.*
+
+Information about how the subprocess module can be used to replace these
+modules and functions can be found below.
+
+
+
+Using the subprocess module
+===========================
+This module defines one class called Popen:
+
+class Popen(args, bufsize=0, executable=None,
+            stdin=None, stdout=None, stderr=None,
+            preexec_fn=None, close_fds=False, shell=False,
+            cwd=None, env=None, universal_newlines=False,
+            startupinfo=None, creationflags=0):
+
+
+Arguments are:
+
+args should be a string, or a sequence of program arguments.  The
+program to execute is normally the first item in the args sequence or
+string, but can be explicitly set by using the executable argument.
+
+On UNIX, with shell=False (default): In this case, the Popen class
+uses os.execvp() to execute the child program.  args should normally
+be a sequence.  A string will be treated as a sequence with the string
+as the only item (the program to execute).
+
+On UNIX, with shell=True: If args is a string, it specifies the
+command string to execute through the shell.  If args is a sequence,
+the first item specifies the command string, and any additional items
+will be treated as additional shell arguments.
+
+On Windows: the Popen class uses CreateProcess() to execute the child
+program, which operates on strings.  If args is a sequence, it will be
+converted to a string using the list2cmdline method.  Please note that
+not all MS Windows applications interpret the command line the same
+way: The list2cmdline is designed for applications using the same
+rules as the MS C runtime.
+
+bufsize, if given, has the same meaning as the corresponding argument
+to the built-in open() function: 0 means unbuffered, 1 means line
+buffered, any other positive value means use a buffer of
+(approximately) that size.  A negative bufsize means to use the system
+default, which usually means fully buffered.  The default value for
+bufsize is 0 (unbuffered).
+
+stdin, stdout and stderr specify the executed programs' standard
+input, standard output and standard error file handles, respectively.
+Valid values are PIPE, an existing file descriptor (a positive
+integer), an existing file object, and None.  PIPE indicates that a
+new pipe to the child should be created.  With None, no redirection
+will occur; the child's file handles will be inherited from the
+parent.  Additionally, stderr can be STDOUT, which indicates that the
+stderr data from the applications should be captured into the same
+file handle as for stdout.
+
+If preexec_fn is set to a callable object, this object will be called
+in the child process just before the child is executed.
+
+If close_fds is true, all file descriptors except 0, 1 and 2 will be
+closed before the child process is executed.
+
+if shell is true, the specified command will be executed through the
+shell.
+
+If cwd is not None, the current directory will be changed to cwd
+before the child is executed.
+
+If env is not None, it defines the environment variables for the new
+process.
+
+If universal_newlines is true, the file objects stdout and stderr are
+opened as a text files, but lines may be terminated by any of '\n',
+the Unix end-of-line convention, '\r', the Macintosh convention or
+'\r\n', the Windows convention.  All of these external representations
+are seen as '\n' by the Python program.  Note: This feature is only
+available if Python is built with universal newline support (the
+default).  Also, the newlines attribute of the file objects stdout,
+stdin and stderr are not updated by the communicate() method.
+
+The startupinfo and creationflags, if given, will be passed to the
+underlying CreateProcess() function.  They can specify things such as
+appearance of the main window and priority for the new process.
+(Windows only)
+
+
+This module also defines two shortcut functions:
+
+call(*popenargs, **kwargs):
+    Run command with arguments.  Wait for command to complete, then
+    return the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    retcode = call(["ls", "-l"])
+
+check_call(*popenargs, **kwargs):
+    Run command with arguments.  Wait for command to complete.  If the
+    exit code was zero then return, otherwise raise
+    CalledProcessError.  The CalledProcessError object will have the
+    return code in the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    check_call(["ls", "-l"])
+
+Exceptions
+----------
+Exceptions raised in the child process, before the new program has
+started to execute, will be re-raised in the parent.  Additionally,
+the exception object will have one extra attribute called
+'child_traceback', which is a string containing traceback information
+from the childs point of view.
+
+The most common exception raised is OSError.  This occurs, for
+example, when trying to execute a non-existent file.  Applications
+should prepare for OSErrors.
+
+A ValueError will be raised if Popen is called with invalid arguments.
+
+check_call() will raise CalledProcessError, if the called process
+returns a non-zero return code.
+
+
+Security
+--------
+Unlike some other popen functions, this implementation will never call
+/bin/sh implicitly.  This means that all characters, including shell
+metacharacters, can safely be passed to child processes.
+
+
+Popen objects
+=============
+Instances of the Popen class have the following methods:
+
+poll()
+    Check if child process has terminated.  Returns returncode
+    attribute.
+
+wait()
+    Wait for child process to terminate.  Returns returncode attribute.
+
+communicate(input=None)
+    Interact with process: Send data to stdin.  Read data from stdout
+    and stderr, until end-of-file is reached.  Wait for process to
+    terminate.  The optional stdin argument should be a string to be
+    sent to the child process, or None, if no data should be sent to
+    the child.
+
+    communicate() returns a tuple (stdout, stderr).
+
+    Note: The data read is buffered in memory, so do not use this
+    method if the data size is large or unlimited.
+
+The following attributes are also available:
+
+stdin
+    If the stdin argument is PIPE, this attribute is a file object
+    that provides input to the child process.  Otherwise, it is None.
+
+stdout
+    If the stdout argument is PIPE, this attribute is a file object
+    that provides output from the child process.  Otherwise, it is
+    None.
+
+stderr
+    If the stderr argument is PIPE, this attribute is file object that
+    provides error output from the child process.  Otherwise, it is
+    None.
+
+pid
+    The process ID of the child process.
+
+returncode
+    The child return code.  A None value indicates that the process
+    hasn't terminated yet.  A negative value -N indicates that the
+    child was terminated by signal N (UNIX only).
+
+
+Replacing older functions with the subprocess module
+====================================================
+In this section, "a ==> b" means that b can be used as a replacement
+for a.
+
+Note: All functions in this section fail (more or less) silently if
+the executed program cannot be found; this module raises an OSError
+exception.
+
+In the following examples, we assume that the subprocess module is
+imported with "from subprocess import *".
+
+
+Replacing /bin/sh shell backquote
+---------------------------------
+output=`mycmd myarg`
+==>
+output = Popen(["mycmd", "myarg"], stdout=PIPE).communicate()[0]
+
+
+Replacing shell pipe line
+-------------------------
+output=`dmesg | grep hda`
+==>
+p1 = Popen(["dmesg"], stdout=PIPE)
+p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
+output = p2.communicate()[0]
+
+
+Replacing os.system()
+---------------------
+sts = os.system("mycmd" + " myarg")
+==>
+p = Popen("mycmd" + " myarg", shell=True)
+pid, sts = os.waitpid(p.pid, 0)
+
+Note:
+
+* Calling the program through the shell is usually not required.
+
+* It's easier to look at the returncode attribute than the
+  exitstatus.
+
+A more real-world example would look like this:
+
+try:
+    retcode = call("mycmd" + " myarg", shell=True)
+    if retcode < 0:
+        print >>sys.stderr, "Child was terminated by signal", -retcode
+    else:
+        print >>sys.stderr, "Child returned", retcode
+except OSError, e:
+    print >>sys.stderr, "Execution failed:", e
+
+
+Replacing os.spawn*
+-------------------
+P_NOWAIT example:
+
+pid = os.spawnlp(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg")
+==>
+pid = Popen(["/bin/mycmd", "myarg"]).pid
+
+
+P_WAIT example:
+
+retcode = os.spawnlp(os.P_WAIT, "/bin/mycmd", "mycmd", "myarg")
+==>
+retcode = call(["/bin/mycmd", "myarg"])
+
+
+Vector example:
+
+os.spawnvp(os.P_NOWAIT, path, args)
+==>
+Popen([path] + args[1:])
+
+
+Environment example:
+
+os.spawnlpe(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg", env)
+==>
+Popen(["/bin/mycmd", "myarg"], env={"PATH": "/usr/bin"})
+
+
+Replacing os.popen*
+-------------------
+pipe = os.popen(cmd, mode='r', bufsize)
+==>
+pipe = Popen(cmd, shell=True, bufsize=bufsize, stdout=PIPE).stdout
+
+pipe = os.popen(cmd, mode='w', bufsize)
+==>
+pipe = Popen(cmd, shell=True, bufsize=bufsize, stdin=PIPE).stdin
+
+
+(child_stdin, child_stdout) = os.popen2(cmd, mode, bufsize)
+==>
+p = Popen(cmd, shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdin, child_stdout) = (p.stdin, p.stdout)
+
+
+(child_stdin,
+ child_stdout,
+ child_stderr) = os.popen3(cmd, mode, bufsize)
+==>
+p = Popen(cmd, shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
+(child_stdin,
+ child_stdout,
+ child_stderr) = (p.stdin, p.stdout, p.stderr)
+
+
+(child_stdin, child_stdout_and_stderr) = os.popen4(cmd, mode, bufsize)
+==>
+p = Popen(cmd, shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
+(child_stdin, child_stdout_and_stderr) = (p.stdin, p.stdout)
+
+
+Replacing popen2.*
+------------------
+Note: If the cmd argument to popen2 functions is a string, the command
+is executed through /bin/sh.  If it is a list, the command is directly
+executed.
+
+(child_stdout, child_stdin) = popen2.popen2("somestring", bufsize, mode)
+==>
+p = Popen(["somestring"], shell=True, bufsize=bufsize
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdout, child_stdin) = (p.stdout, p.stdin)
+
+
+(child_stdout, child_stdin) = popen2.popen2(["mycmd", "myarg"], bufsize, mode)
+==>
+p = Popen(["mycmd", "myarg"], bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdout, child_stdin) = (p.stdout, p.stdin)
+
+The popen2.Popen3 and popen3.Popen4 basically works as subprocess.Popen,
+except that:
+
+* subprocess.Popen raises an exception if the execution fails
+* the capturestderr argument is replaced with the stderr argument.
+* stdin=PIPE and stdout=PIPE must be specified.
+* popen2 closes all filedescriptors by default, but you have to specify
+  close_fds=True with subprocess.Popen.
+
+
+"""
+
+import sys
+mswindows = (sys.platform == "win32")
+
+import os
+import types
+import traceback
+
+# Exception classes used by this module.
+class CalledProcessError(Exception):
+    """This exception is raised when a process run by check_call() returns
+    a non-zero exit status.  The exit status will be stored in the
+    returncode attribute."""
+    def __init__(self, returncode, cmd):
+        self.returncode = returncode
+        self.cmd = cmd
+    def __str__(self):
+        return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
+
+
+if mswindows:
+    import threading
+    import msvcrt
+    if 0: # <-- change this to use pywin32 instead of the _subprocess driver
+        import pywintypes
+        from win32api import GetStdHandle, STD_INPUT_HANDLE, \
+                             STD_OUTPUT_HANDLE, STD_ERROR_HANDLE
+        from win32api import GetCurrentProcess, DuplicateHandle, \
+                             GetModuleFileName, GetVersion
+        from win32con import DUPLICATE_SAME_ACCESS, SW_HIDE
+        from win32pipe import CreatePipe
+        from win32process import CreateProcess, STARTUPINFO, \
+                                 GetExitCodeProcess, STARTF_USESTDHANDLES, \
+                                 STARTF_USESHOWWINDOW, CREATE_NEW_CONSOLE
+        from win32event import WaitForSingleObject, INFINITE, WAIT_OBJECT_0
+    else:
+        from _subprocess import *
+        class STARTUPINFO:
+            dwFlags = 0
+            hStdInput = None
+            hStdOutput = None
+            hStdError = None
+            wShowWindow = 0
+        class pywintypes:
+            error = IOError
+else:
+    import select
+    import errno
+    import fcntl
+    import pickle
+
+__all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "CalledProcessError"]
+
+try:
+    MAXFD = os.sysconf("SC_OPEN_MAX")
+except:
+    MAXFD = 256
+
+# True/False does not exist on 2.2.0
+try:
+    False
+except NameError:
+    False = 0
+    True = 1
+
+_active = []
+
+def _cleanup():
+    for inst in _active[:]:
+        if inst.poll(_deadstate=sys.maxint) >= 0:
+            try:
+                _active.remove(inst)
+            except ValueError:
+                # This can happen if two threads create a new Popen instance.
+                # It's harmless that it was already removed, so ignore.
+                pass
+
+PIPE = -1
+STDOUT = -2
+
+
+def call(*popenargs, **kwargs):
+    """Run command with arguments.  Wait for command to complete, then
+    return the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    retcode = call(["ls", "-l"])
+    """
+    return Popen(*popenargs, **kwargs).wait()
+
+
+def check_call(*popenargs, **kwargs):
+    """Run command with arguments.  Wait for command to complete.  If
+    the exit code was zero then return, otherwise raise
+    CalledProcessError.  The CalledProcessError object will have the
+    return code in the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    check_call(["ls", "-l"])
+    """
+    retcode = call(*popenargs, **kwargs)
+    cmd = kwargs.get("args")
+    if cmd is None:
+        cmd = popenargs[0]
+    if retcode:
+        raise CalledProcessError(retcode, cmd)
+    return retcode
+
+
+def list2cmdline(seq):
+    """
+    Translate a sequence of arguments into a command line
+    string, using the same rules as the MS C runtime:
+
+    1) Arguments are delimited by white space, which is either a
+       space or a tab.
+
+    2) A string surrounded by double quotation marks is
+       interpreted as a single argument, regardless of white space
+       contained within.  A quoted string can be embedded in an
+       argument.
+
+    3) A double quotation mark preceded by a backslash is
+       interpreted as a literal double quotation mark.
+
+    4) Backslashes are interpreted literally, unless they
+       immediately precede a double quotation mark.
+
+    5) If backslashes immediately precede a double quotation mark,
+       every pair of backslashes is interpreted as a literal
+       backslash.  If the number of backslashes is odd, the last
+       backslash escapes the next double quotation mark as
+       described in rule 3.
+    """
+
+    # See
+    # http://msdn.microsoft.com/library/en-us/vccelng/htm/progs_12.asp
+    result = []
+    needquote = False
+    for arg in seq:
+        bs_buf = []
+
+        # Add a space to separate this argument from the others
+        if result:
+            result.append(' ')
+
+        needquote = (" " in arg) or ("\t" in arg)
+        if needquote:
+            result.append('"')
+
+        for c in arg:
+            if c == '\\':
+                # Don't know if we need to double yet.
+                bs_buf.append(c)
+            elif c == '"':
+                # Double backspaces.
+                result.append('\\' * len(bs_buf)*2)
+                bs_buf = []
+                result.append('\\"')
+            else:
+                # Normal char
+                if bs_buf:
+                    result.extend(bs_buf)
+                    bs_buf = []
+                result.append(c)
+
+        # Add remaining backspaces, if any.
+        if bs_buf:
+            result.extend(bs_buf)
+
+        if needquote:
+            result.extend(bs_buf)
+            result.append('"')
+
+    return ''.join(result)
+
+
+class Popen(object):
+    def __init__(self, args, bufsize=0, executable=None,
+                 stdin=None, stdout=None, stderr=None,
+                 preexec_fn=None, close_fds=False, shell=False,
+                 cwd=None, env=None, universal_newlines=False,
+                 startupinfo=None, creationflags=0):
+        """Create new Popen instance."""
+        _cleanup()
+
+        self._child_created = False
+        if not isinstance(bufsize, (int, long)):
+            raise TypeError("bufsize must be an integer")
+
+        if mswindows:
+            if preexec_fn is not None:
+                raise ValueError("preexec_fn is not supported on Windows "
+                                 "platforms")
+            if close_fds:
+                raise ValueError("close_fds is not supported on Windows "
+                                 "platforms")
+        else:
+            # POSIX
+            if startupinfo is not None:
+                raise ValueError("startupinfo is only supported on Windows "
+                                 "platforms")
+            if creationflags != 0:
+                raise ValueError("creationflags is only supported on Windows "
+                                 "platforms")
+
+        self.stdin = None
+        self.stdout = None
+        self.stderr = None
+        self.pid = None
+        self.returncode = None
+        self.universal_newlines = universal_newlines
+
+        # Input and output objects. The general principle is like
+        # this:
+        #
+        # Parent                   Child
+        # ------                   -----
+        # p2cwrite   ---stdin--->  p2cread
+        # c2pread    <--stdout---  c2pwrite
+        # errread    <--stderr---  errwrite
+        #
+        # On POSIX, the child objects are file descriptors.  On
+        # Windows, these are Windows file handles.  The parent objects
+        # are file descriptors on both platforms.  The parent objects
+        # are None when not using PIPEs. The child objects are None
+        # when not redirecting.
+
+        (p2cread, p2cwrite,
+         c2pread, c2pwrite,
+         errread, errwrite) = self._get_handles(stdin, stdout, stderr)
+
+        self._execute_child(args, executable, preexec_fn, close_fds,
+                            cwd, env, universal_newlines,
+                            startupinfo, creationflags, shell,
+                            p2cread, p2cwrite,
+                            c2pread, c2pwrite,
+                            errread, errwrite)
+
+        if p2cwrite:
+            self.stdin = os.fdopen(p2cwrite, 'wb', bufsize)
+        if c2pread:
+            if universal_newlines:
+                self.stdout = os.fdopen(c2pread, 'rU', bufsize)
+            else:
+                self.stdout = os.fdopen(c2pread, 'rb', bufsize)
+        if errread:
+            if universal_newlines:
+                self.stderr = os.fdopen(errread, 'rU', bufsize)
+            else:
+                self.stderr = os.fdopen(errread, 'rb', bufsize)
+
+
+    def _translate_newlines(self, data):
+        data = data.replace("\r\n", "\n")
+        data = data.replace("\r", "\n")
+        return data
+
+
+    def __del__(self):
+        if not self._child_created:
+            # We didn't get to successfully create a child process.
+            return
+        # In case the child hasn't been waited on, check if it's done.
+        self.poll(_deadstate=sys.maxint)
+        if self.returncode is None and _active is not None:
+            # Child is still running, keep us alive until we can wait on it.
+            _active.append(self)
+
+
+    def communicate(self, input=None):
+        """Interact with process: Send data to stdin.  Read data from
+        stdout and stderr, until end-of-file is reached.  Wait for
+        process to terminate.  The optional input argument should be a
+        string to be sent to the child process, or None, if no data
+        should be sent to the child.
+
+        communicate() returns a tuple (stdout, stderr)."""
+
+        # Optimization: If we are only using one pipe, or no pipe at
+        # all, using select() or threads is unnecessary.
+        if [self.stdin, self.stdout, self.stderr].count(None) >= 2:
+            stdout = None
+            stderr = None
+            if self.stdin:
+                if input:
+                    self.stdin.write(input)
+                self.stdin.close()
+            elif self.stdout:
+                stdout = self.stdout.read()
+            elif self.stderr:
+                stderr = self.stderr.read()
+            self.wait()
+            return (stdout, stderr)
+
+        return self._communicate(input)
+
+
+    if mswindows:
+        #
+        # Windows methods
+        #
+        def _get_handles(self, stdin, stdout, stderr):
+            """Construct and return tupel with IO objects:
+            p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
+            """
+            if stdin is None and stdout is None and stderr is None:
+                return (None, None, None, None, None, None)
+
+            p2cread, p2cwrite = None, None
+            c2pread, c2pwrite = None, None
+            errread, errwrite = None, None
+
+            if stdin is None:
+                p2cread = GetStdHandle(STD_INPUT_HANDLE)
+            elif stdin == PIPE:
+                p2cread, p2cwrite = CreatePipe(None, 0)
+                # Detach and turn into fd
+                p2cwrite = p2cwrite.Detach()
+                p2cwrite = msvcrt.open_osfhandle(p2cwrite, 0)
+            elif isinstance(stdin, int):
+                p2cread = msvcrt.get_osfhandle(stdin)
+            else:
+                # Assuming file-like object
+                p2cread = msvcrt.get_osfhandle(stdin.fileno())
+            p2cread = self._make_inheritable(p2cread)
+
+            if stdout is None:
+                c2pwrite = GetStdHandle(STD_OUTPUT_HANDLE)
+            elif stdout == PIPE:
+                c2pread, c2pwrite = CreatePipe(None, 0)
+                # Detach and turn into fd
+                c2pread = c2pread.Detach()
+                c2pread = msvcrt.open_osfhandle(c2pread, 0)
+            elif isinstance(stdout, int):
+                c2pwrite = msvcrt.get_osfhandle(stdout)
+            else:
+                # Assuming file-like object
+                c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
+            c2pwrite = self._make_inheritable(c2pwrite)
+
+            if stderr is None:
+                errwrite = GetStdHandle(STD_ERROR_HANDLE)
+            elif stderr == PIPE:
+                errread, errwrite = CreatePipe(None, 0)
+                # Detach and turn into fd
+                errread = errread.Detach()
+                errread = msvcrt.open_osfhandle(errread, 0)
+            elif stderr == STDOUT:
+                errwrite = c2pwrite
+            elif isinstance(stderr, int):
+                errwrite = msvcrt.get_osfhandle(stderr)
+            else:
+                # Assuming file-like object
+                errwrite = msvcrt.get_osfhandle(stderr.fileno())
+            errwrite = self._make_inheritable(errwrite)
+
+            return (p2cread, p2cwrite,
+                    c2pread, c2pwrite,
+                    errread, errwrite)
+
+
+        def _make_inheritable(self, handle):
+            """Return a duplicate of handle, which is inheritable"""
+            return DuplicateHandle(GetCurrentProcess(), handle,
+                                   GetCurrentProcess(), 0, 1,
+                                   DUPLICATE_SAME_ACCESS)
+
+
+        def _find_w9xpopen(self):
+            """Find and return absolut path to w9xpopen.exe"""
+            w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)),
+                                    "w9xpopen.exe")
+            if not os.path.exists(w9xpopen):
+                # Eeek - file-not-found - possibly an embedding
+                # situation - see if we can locate it in sys.exec_prefix
+                w9xpopen = os.path.join(os.path.dirname(sys.exec_prefix),
+                                        "w9xpopen.exe")
+                if not os.path.exists(w9xpopen):
+                    raise RuntimeError("Cannot locate w9xpopen.exe, which is "
+                                       "needed for Popen to work with your "
+                                       "shell or platform.")
+            return w9xpopen
+
+
+        def _execute_child(self, args, executable, preexec_fn, close_fds,
+                           cwd, env, universal_newlines,
+                           startupinfo, creationflags, shell,
+                           p2cread, p2cwrite,
+                           c2pread, c2pwrite,
+                           errread, errwrite):
+            """Execute program (MS Windows version)"""
+
+            if not isinstance(args, types.StringTypes):
+                args = list2cmdline(args)
+
+            # Process startup details
+            if startupinfo is None:
+                startupinfo = STARTUPINFO()
+            if None not in (p2cread, c2pwrite, errwrite):
+                startupinfo.dwFlags |= STARTF_USESTDHANDLES
+                startupinfo.hStdInput = p2cread
+                startupinfo.hStdOutput = c2pwrite
+                startupinfo.hStdError = errwrite
+
+            if shell:
+                startupinfo.dwFlags |= STARTF_USESHOWWINDOW
+                startupinfo.wShowWindow = SW_HIDE
+                comspec = os.environ.get("COMSPEC", "cmd.exe")
+                args = comspec + " /c " + args
+                if (GetVersion() >= 0x80000000L or
+                        os.path.basename(comspec).lower() == "command.com"):
+                    # Win9x, or using command.com on NT. We need to
+                    # use the w9xpopen intermediate program. For more
+                    # information, see KB Q150956
+                    # (http://web.archive.org/web/20011105084002/http://support.microsoft.com/support/kb/articles/Q150/9/56.asp)
+                    w9xpopen = self._find_w9xpopen()
+                    args = '"%s" %s' % (w9xpopen, args)
+                    # Not passing CREATE_NEW_CONSOLE has been known to
+                    # cause random failures on win9x.  Specifically a
+                    # dialog: "Your program accessed mem currently in
+                    # use at xxx" and a hopeful warning about the
+                    # stability of your system.  Cost is Ctrl+C wont
+                    # kill children.
+                    creationflags |= CREATE_NEW_CONSOLE
+
+            # Start the process
+            try:
+                hp, ht, pid, tid = CreateProcess(executable, args,
+                                         # no special security
+                                         None, None,
+                                         # must inherit handles to pass std
+                                         # handles
+                                         1,
+                                         creationflags,
+                                         env,
+                                         cwd,
+                                         startupinfo)
+            except pywintypes.error, e:
+                # Translate pywintypes.error to WindowsError, which is
+                # a subclass of OSError.  FIXME: We should really
+                # translate errno using _sys_errlist (or simliar), but
+                # how can this be done from Python?
+                raise WindowsError(*e.args)
+
+            # Retain the process handle, but close the thread handle
+            self._child_created = True
+            self._handle = hp
+            self.pid = pid
+            ht.Close()
+
+            # Child is launched. Close the parent's copy of those pipe
+            # handles that only the child should have open.  You need
+            # to make sure that no handles to the write end of the
+            # output pipe are maintained in this process or else the
+            # pipe will not close when the child process exits and the
+            # ReadFile will hang.
+            if p2cread is not None:
+                p2cread.Close()
+            if c2pwrite is not None:
+                c2pwrite.Close()
+            if errwrite is not None:
+                errwrite.Close()
+
+
+        def poll(self, _deadstate=None):
+            """Check if child process has terminated.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                if WaitForSingleObject(self._handle, 0) == WAIT_OBJECT_0:
+                    self.returncode = GetExitCodeProcess(self._handle)
+            return self.returncode
+
+
+        def wait(self):
+            """Wait for child process to terminate.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                obj = WaitForSingleObject(self._handle, INFINITE)
+                self.returncode = GetExitCodeProcess(self._handle)
+            return self.returncode
+
+
+        def _readerthread(self, fh, buffer):
+            buffer.append(fh.read())
+
+
+        def _communicate(self, input):
+            stdout = None # Return
+            stderr = None # Return
+
+            if self.stdout:
+                stdout = []
+                stdout_thread = threading.Thread(target=self._readerthread,
+                                                 args=(self.stdout, stdout))
+                stdout_thread.setDaemon(True)
+                stdout_thread.start()
+            if self.stderr:
+                stderr = []
+                stderr_thread = threading.Thread(target=self._readerthread,
+                                                 args=(self.stderr, stderr))
+                stderr_thread.setDaemon(True)
+                stderr_thread.start()
+
+            if self.stdin:
+                if input is not None:
+                    self.stdin.write(input)
+                self.stdin.close()
+
+            if self.stdout:
+                stdout_thread.join()
+            if self.stderr:
+                stderr_thread.join()
+
+            # All data exchanged.  Translate lists into strings.
+            if stdout is not None:
+                stdout = stdout[0]
+            if stderr is not None:
+                stderr = stderr[0]
+
+            # Translate newlines, if requested.  We cannot let the file
+            # object do the translation: It is based on stdio, which is
+            # impossible to combine with select (unless forcing no
+            # buffering).
+            if self.universal_newlines and hasattr(file, 'newlines'):
+                if stdout:
+                    stdout = self._translate_newlines(stdout)
+                if stderr:
+                    stderr = self._translate_newlines(stderr)
+
+            self.wait()
+            return (stdout, stderr)
+
+    else:
+        #
+        # POSIX methods
+        #
+        def _get_handles(self, stdin, stdout, stderr):
+            """Construct and return tupel with IO objects:
+            p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
+            """
+            p2cread, p2cwrite = None, None
+            c2pread, c2pwrite = None, None
+            errread, errwrite = None, None
+
+            if stdin is None:
+                pass
+            elif stdin == PIPE:
+                p2cread, p2cwrite = os.pipe()
+            elif isinstance(stdin, int):
+                p2cread = stdin
+            else:
+                # Assuming file-like object
+                p2cread = stdin.fileno()
+
+            if stdout is None:
+                pass
+            elif stdout == PIPE:
+                c2pread, c2pwrite = os.pipe()
+            elif isinstance(stdout, int):
+                c2pwrite = stdout
+            else:
+                # Assuming file-like object
+                c2pwrite = stdout.fileno()
+
+            if stderr is None:
+                pass
+            elif stderr == PIPE:
+                errread, errwrite = os.pipe()
+            elif stderr == STDOUT:
+                errwrite = c2pwrite
+            elif isinstance(stderr, int):
+                errwrite = stderr
+            else:
+                # Assuming file-like object
+                errwrite = stderr.fileno()
+
+            return (p2cread, p2cwrite,
+                    c2pread, c2pwrite,
+                    errread, errwrite)
+
+
+        def _set_cloexec_flag(self, fd):
+            try:
+                cloexec_flag = fcntl.FD_CLOEXEC
+            except AttributeError:
+                cloexec_flag = 1
+
+            old = fcntl.fcntl(fd, fcntl.F_GETFD)
+            fcntl.fcntl(fd, fcntl.F_SETFD, old | cloexec_flag)
+
+
+        def _close_fds(self, but):
+            for i in xrange(3, MAXFD):
+                if i == but:
+                    continue
+                try:
+                    os.close(i)
+                except:
+                    pass
+
+
+        def _execute_child(self, args, executable, preexec_fn, close_fds,
+                           cwd, env, universal_newlines,
+                           startupinfo, creationflags, shell,
+                           p2cread, p2cwrite,
+                           c2pread, c2pwrite,
+                           errread, errwrite):
+            """Execute program (POSIX version)"""
+
+            if isinstance(args, types.StringTypes):
+                args = [args]
+
+            if shell:
+                args = ["/bin/sh", "-c"] + args
+
+            if executable is None:
+                executable = args[0]
+
+            # For transferring possible exec failure from child to parent
+            # The first char specifies the exception type: 0 means
+            # OSError, 1 means some other error.
+            errpipe_read, errpipe_write = os.pipe()
+            self._set_cloexec_flag(errpipe_write)
+
+            self.pid = os.fork()
+            self._child_created = True
+            if self.pid == 0:
+                # Child
+                try:
+                    # Close parent's pipe ends
+                    if p2cwrite:
+                        os.close(p2cwrite)
+                    if c2pread:
+                        os.close(c2pread)
+                    if errread:
+                        os.close(errread)
+                    os.close(errpipe_read)
+
+                    # Dup fds for child
+                    if p2cread:
+                        os.dup2(p2cread, 0)
+                    if c2pwrite:
+                        os.dup2(c2pwrite, 1)
+                    if errwrite:
+                        os.dup2(errwrite, 2)
+
+                    # Close pipe fds.  Make sure we don't close the same
+                    # fd more than once, or standard fds.
+                    if p2cread:
+                        os.close(p2cread)
+                    if c2pwrite and c2pwrite not in (p2cread,):
+                        os.close(c2pwrite)
+                    if errwrite and errwrite not in (p2cread, c2pwrite):
+                        os.close(errwrite)
+
+                    # Close all other fds, if asked for
+                    if close_fds:
+                        self._close_fds(but=errpipe_write)
+
+                    if cwd is not None:
+                        os.chdir(cwd)
+
+                    if preexec_fn:
+                        apply(preexec_fn)
+
+                    if env is None:
+                        os.execvp(executable, args)
+                    else:
+                        os.execvpe(executable, args, env)
+
+                except:
+                    exc_type, exc_value, tb = sys.exc_info()
+                    # Save the traceback and attach it to the exception object
+                    exc_lines = traceback.format_exception(exc_type,
+                                                           exc_value,
+                                                           tb)
+                    exc_value.child_traceback = ''.join(exc_lines)
+                    os.write(errpipe_write, pickle.dumps(exc_value))
+
+                # This exitcode won't be reported to applications, so it
+                # really doesn't matter what we return.
+                os._exit(255)
+
+            # Parent
+            os.close(errpipe_write)
+            if p2cread and p2cwrite:
+                os.close(p2cread)
+            if c2pwrite and c2pread:
+                os.close(c2pwrite)
+            if errwrite and errread:
+                os.close(errwrite)
+
+            # Wait for exec to fail or succeed; possibly raising exception
+            data = os.read(errpipe_read, 1048576) # Exceptions limited to 1 MB
+            os.close(errpipe_read)
+            if data != "":
+                os.waitpid(self.pid, 0)
+                child_exception = pickle.loads(data)
+                raise child_exception
+
+
+        def _handle_exitstatus(self, sts):
+            if os.WIFSIGNALED(sts):
+                self.returncode = -os.WTERMSIG(sts)
+            elif os.WIFEXITED(sts):
+                self.returncode = os.WEXITSTATUS(sts)
+            else:
+                # Should never happen
+                raise RuntimeError("Unknown child exit status!")
+
+
+        def poll(self, _deadstate=None):
+            """Check if child process has terminated.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                try:
+                    pid, sts = os.waitpid(self.pid, os.WNOHANG)
+                    if pid == self.pid:
+                        self._handle_exitstatus(sts)
+                except os.error:
+                    if _deadstate is not None:
+                        self.returncode = _deadstate
+            return self.returncode
+
+
+        def wait(self):
+            """Wait for child process to terminate.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                pid, sts = os.waitpid(self.pid, 0)
+                self._handle_exitstatus(sts)
+            return self.returncode
+
+
+        def _communicate(self, input):
+            read_set = []
+            write_set = []
+            stdout = None # Return
+            stderr = None # Return
+
+            if self.stdin:
+                # Flush stdio buffer.  This might block, if the user has
+                # been writing to .stdin in an uncontrolled fashion.
+                self.stdin.flush()
+                if input:
+                    write_set.append(self.stdin)
+                else:
+                    self.stdin.close()
+            if self.stdout:
+                read_set.append(self.stdout)
+                stdout = []
+            if self.stderr:
+                read_set.append(self.stderr)
+                stderr = []
+
+            while read_set or write_set:
+                rlist, wlist, xlist = select.select(read_set, write_set, [])
+
+                if self.stdin in wlist:
+                    # When select has indicated that the file is writable,
+                    # we can write up to PIPE_BUF bytes without risk
+                    # blocking.  POSIX defines PIPE_BUF >= 512
+                    bytes_written = os.write(self.stdin.fileno(), input[:512])
+                    input = input[bytes_written:]
+                    if not input:
+                        self.stdin.close()
+                        write_set.remove(self.stdin)
+
+                if self.stdout in rlist:
+                    data = os.read(self.stdout.fileno(), 1024)
+                    if data == "":
+                        self.stdout.close()
+                        read_set.remove(self.stdout)
+                    stdout.append(data)
+
+                if self.stderr in rlist:
+                    data = os.read(self.stderr.fileno(), 1024)
+                    if data == "":
+                        self.stderr.close()
+                        read_set.remove(self.stderr)
+                    stderr.append(data)
+
+            # All data exchanged.  Translate lists into strings.
+            if stdout is not None:
+                stdout = ''.join(stdout)
+            if stderr is not None:
+                stderr = ''.join(stderr)
+
+            # Translate newlines, if requested.  We cannot let the file
+            # object do the translation: It is based on stdio, which is
+            # impossible to combine with select (unless forcing no
+            # buffering).
+            if self.universal_newlines and hasattr(file, 'newlines'):
+                if stdout:
+                    stdout = self._translate_newlines(stdout)
+                if stderr:
+                    stderr = self._translate_newlines(stderr)
+
+            self.wait()
+            return (stdout, stderr)
+
+
+def _demo_posix():
+    #
+    # Example 1: Simple redirection: Get process list
+    #
+    plist = Popen(["ps"], stdout=PIPE).communicate()[0]
+    print "Process list:"
+    print plist
+
+    #
+    # Example 2: Change uid before executing child
+    #
+    if os.getuid() == 0:
+        p = Popen(["id"], preexec_fn=lambda: os.setuid(100))
+        p.wait()
+
+    #
+    # Example 3: Connecting several subprocesses
+    #
+    print "Looking for 'hda'..."
+    p1 = Popen(["dmesg"], stdout=PIPE)
+    p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
+    print repr(p2.communicate()[0])
+
+    #
+    # Example 4: Catch execution error
+    #
+    print
+    print "Trying a weird file..."
+    try:
+        print Popen(["/this/path/does/not/exist"]).communicate()
+    except OSError, e:
+        if e.errno == errno.ENOENT:
+            print "The file didn't exist.  I thought so..."
+            print "Child traceback:"
+            print e.child_traceback
+        else:
+            print "Error", e.errno
+    else:
+        print >>sys.stderr, "Gosh.  No error."
+
+
+def _demo_windows():
+    #
+    # Example 1: Connecting several subprocesses
+    #
+    print "Looking for 'PROMPT' in set output..."
+    p1 = Popen("set", stdout=PIPE, shell=True)
+    p2 = Popen('find "PROMPT"', stdin=p1.stdout, stdout=PIPE)
+    print repr(p2.communicate()[0])
+
+    #
+    # Example 2: Simple execution of program
+    #
+    print "Executing calc..."
+    p = Popen("calc")
+    p.wait()
+
+
+if __name__ == "__main__":
+    if mswindows:
+        _demo_windows()
+    else:
+        _demo_posix()
diff --git a/func/minion/utils.py b/func/minion/utils.py
new file mode 100755
index 0000000..d13808e
--- /dev/null
+++ b/func/minion/utils.py
@@ -0,0 +1,159 @@
+#!/usr/bin/python
+
+"""
+Copyright 2007, Red Hat, Inc
+see AUTHORS
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+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., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+import os
+import socket
+import string
+import sys
+import time
+import traceback
+import xmlrpclib
+
+import codes
+from func import certs
+from func.config import read_config
+from func.commonconfig import FuncdConfig
+
+# "localhost" is a lame hostname to use for a key, so try to get
+# a more meaningful hostname. We do this by connecting to the certmaster
+# and seeing what interface/ip it uses to make that connection, and looking
+# up the hostname for that. 
+def get_hostname():
+
+    # FIXME: this code ignores http proxies (which granted, we don't
+    #      support elsewhere either. It also hardcodes the port number
+    #      for the certmaster for now
+    hostname = None
+    hostname = socket.gethostname()
+    ip = socket.gethostbyname(hostname)
+    if ip != "127.0.0.1":
+        return hostname
+
+
+    config_file = '/etc/func/minion.conf'
+    config = read_config(config_file, FuncdConfig)
+
+    server = config.certmaster
+    port = 51235
+
+    try:
+        s = socket.socket()
+        s.settimeout(5)
+        s.connect((server, port))
+        (intf, port) = s.getsockname()
+        hostname = socket.gethostbyaddr(intf)[0]
+        s.close()
+    except:
+        s.close()
+        raise
+
+    return hostname
+    
+
+
+def create_minion_keys():
+    config_file = '/etc/func/minion.conf'
+    config = read_config(config_file, FuncdConfig)
+    cert_dir = config.cert_dir
+    master_uri = 'http://%s:51235/' % config.certmaster
+    hn = get_hostname()
+
+    if hn is None:
+        raise codes.FuncException("Could not determine a hostname other than localhost")
+
+    key_file = '%s/%s.pem' % (cert_dir, hn)
+    csr_file = '%s/%s.csr' % (cert_dir, hn)
+    cert_file = '%s/%s.cert' % (cert_dir, hn)
+    ca_cert_file = '%s/ca.cert' % cert_dir
+
+
+    if os.path.exists(cert_file) and os.path.exists(ca_cert_file):
+        return
+
+    keypair = None
+    try:
+        if not os.path.exists(cert_dir):
+            os.makedirs(cert_dir)
+        if not os.path.exists(key_file):
+            keypair = certs.make_keypair(dest=key_file)
+        if not os.path.exists(csr_file):
+            if not keypair:
+                keypair = certs.retrieve_key_from_file(key_file)
+            csr = certs.make_csr(keypair, dest=csr_file)
+    except Exception, e: # need a little more specificity here
+        raise codes.FuncException, "Could not create local keypair or csr for minion funcd session"
+
+    result = False
+    while not result:
+        try:
+            result, cert_string, ca_cert_string = submit_csr_to_master(csr_file, master_uri)
+        except socket.gaierror, e:
+            raise codes.FuncException, "Could not locate certmaster at: http://certmaster:51235/"
+
+        # logging here would be nice
+        if not result:
+            time.sleep(10)
+
+
+    if result:
+        cert_fo = open(cert_file, 'w')
+        cert_fo.write(cert_string)
+        cert_fo.close()
+
+        ca_cert_fo = open(ca_cert_file, 'w')
+        ca_cert_fo.write(ca_cert_string)
+        ca_cert_fo.close()
+
+def submit_csr_to_master(csr_file, master_uri):
+    """"
+    gets us our cert back from the certmaster.wait_for_cert() method
+    takes csr_file as path location and master_uri
+    returns Bool, str(cert), str(ca_cert)
+    """
+
+    fo = open(csr_file)
+    csr = fo.read()
+    s = xmlrpclib.ServerProxy(master_uri)
+
+    return s.wait_for_cert(csr)
+
+
+# this is kind of handy, so keep it around for now
+# but we really need to fix out server side logging and error
+# reporting so we don't need it
+def trace_me():
+    x = traceback.extract_stack()
+    bar = string.join(traceback.format_list(x))
+    return bar
+
+
+def daemonize(pidfile=None):
+    """
+    Daemonize this process with the UNIX double-fork trick.
+    Writes the new PID to the provided file name if not None.
+    """
+
+    print pidfile
+    pid = os.fork()
+    if pid > 0:
+        sys.exit(0)
+    os.setsid()
+    os.umask(0)
+    pid = os.fork()
+
+
+    if pid > 0:
+        if pidfile is not None:
+            open(pidfile, "w").write(str(pid))
+        sys.exit(0)
diff --git a/func/overlord/Makefile b/func/overlord/Makefile
new file mode 100755
index 0000000..f2bc6c4
--- /dev/null
+++ b/func/overlord/Makefile
@@ -0,0 +1,18 @@
+
+
+PYFILES		= $(wildcard *.py)
+
+PYCHECKER       = /usr/bin/pychecker
+PYFLAKES	= /usr/bin/pyflakes
+
+clean::
+	@rm -fv *.pyc *~ .*~ *.pyo
+	@find . -name .\#\* -exec rm -fv {} \;
+	@rm -fv *.rpm
+
+
+pychecker::
+	@$(PYCHECKER) $(PYFILES) || exit 0
+
+pyflakes::
+	@$(PYFLAKES) $(PYFILES) || exit 0
diff --git a/func/overlord/__init__.py b/func/overlord/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/func/overlord/__init__.py
diff --git a/func/overlord/client.py b/func/overlord/client.py
new file mode 100755
index 0000000..3c60148
--- /dev/null
+++ b/func/overlord/client.py
@@ -0,0 +1,295 @@
+#!/usr/bin/python
+
+##
+## func command line interface & client lib
+##
+## Copyright 2007, Red Hat, Inc
+## Michael DeHaan <mdehaan@redhat.com>
+## +AUTHORS
+##
+## This software may be freely redistributed under the terms of the GNU
+## general public license.
+##
+## 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+##
+
+import optparse
+import sys
+import glob
+import pprint
+
+from func.commonconfig import CMConfig
+from func.config import read_config, CONFIG_FILE
+import sslclient
+
+import command
+
+# ===================================
+# defaults
+# TO DO: some of this may want to come from config later
+
+DEFAULT_PORT = 51234
+FUNC_USAGE = "Usage: %s [ --help ] [ --verbose ] target.example.org module method arg1 [...]"
+
+# ===================================
+
+class CommandAutomagic(object):
+    """
+    This allows a client object to act as if it were one machine, when in
+    reality it represents many.
+    """
+
+    def __init__(self, clientref, base):
+        self.base = base
+        self.clientref = clientref
+
+    def __getattr__(self,name):
+        base2 = self.base[:]
+        base2.append(name)
+        return CommandAutomagic(self.clientref, base2)
+
+    def __call__(self, *args):
+        if not self.base:
+            raise AttributeError("something wrong here")
+        if len(self.base) < 2:
+            raise AttributeError("no method called: %s" % ".".join(self.base))
+        module = self.base[0]
+        method = ".".join(self.base[1:])
+        return self.clientref.run(module,method,args)
+
+# ===================================
+
+class Client(object):
+
+    def __init__(self, server_spec, port=DEFAULT_PORT, interactive=False,
+        verbose=False, noglobs=False, config=None):
+        """
+        Constructor.
+        @server_spec -- something like "*.example.org" or "foosball"
+        @port -- is the port where all funcd processes should be contacted
+        @verbose -- whether to print unneccessary things
+        @noglobs -- specifies server_spec is not a glob, and run should return single values
+        @config -- optional config object
+        """
+        self.config  = config
+        if config is None:
+            self.config  = read_config(CONFIG_FILE, CMConfig)
+
+        self.server_spec = server_spec
+        self.port        = port
+        self.verbose     = verbose
+        self.interactive = interactive
+        self.noglobs     = noglobs
+        self.servers     = self.expand_servers(self.server_spec)
+
+        # default cert/ca/key is the same as the certmaster ca - need to
+        # be able to change that on the cli
+        self.key = '%s/funcmaster.key' % self.config.cadir
+        self.cert = '%s/funcmaster.crt' % self.config.cadir
+        # yes, they're the same, that's the point
+        self.ca = '%s/funcmaster.crt' % self.config.cadir
+
+    # -----------------------------------------------
+
+    def expand_servers(self,spec):
+        """
+        Given a regex/blob of servers, expand to a list
+        of server ids.
+        """
+
+        if self.noglobs:
+            return [ "https://%s:%s" % (spec, self.port) ]
+
+        all_hosts = []
+        all_certs = []
+        seperate_gloobs = spec.split(";")
+        for each_gloob in seperate_gloobs:
+            actual_gloob = "%s/%s.cert" % (self.config.certroot, each_gloob)
+            certs = glob.glob(actual_gloob)
+            for cert in certs:
+                all_certs.append(cert)
+                host = cert.replace(self.config.certroot,"")[1:-5]
+                all_hosts.append(host)
+
+        all_urls = []
+        for x in all_hosts:
+            all_urls.append("https://%s:%s" % (x, self.port))
+
+        if self.verbose and len(all_urls) == 0:
+            sys.stderr.write("no hosts matched\n")
+
+        return all_urls
+
+    # -----------------------------------------------
+
+    def __getattr__(self, name):
+        """
+        This getattr allows manipulation of the object as if it were
+        a XMLRPC handle to a single machine, when in reality it is a handle
+        to an unspecified number of machines.
+
+        So, it enables stuff like this:
+
+        Client("*.example.org").yum.install("foo")
+
+        # WARNING: any missing values in Client's source will yield
+        # strange errors with this engaged.  Be aware of that.
+        """
+
+        return CommandAutomagic(self, [name])
+
+    # -----------------------------------------------
+
+    def run(self, module, method, args):
+        """
+        Invoke a remote method on one or more servers.
+        Run returns a hash, the keys are server names, the values are the
+        returns.
+
+        The returns may include exception objects.
+        If Client() was constructed with noglobs=True, the return is instead
+        just a single value, not a hash.
+        """
+
+        results = {}
+
+        for server in self.servers:
+
+            conn = sslclient.FuncServer(server, self.key, self.cert, self.ca )
+            # conn = xmlrpclib.ServerProxy(server)
+
+            if self.interactive:
+                sys.stderr.write("on %s running %s %s (%s)\n" % (server,
+                    module, method, ",".join(args)))
+
+            # FIXME: support userland command subclassing only if a module
+            # is present, otherwise run as follows.  -- MPD
+
+            try:
+                # thats some pretty code right there aint it? -akl
+                # we can't call "call" on s, since thats a rpc, so
+                # we call gettatr around it.
+                meth = "%s.%s" % (module, method)
+                retval = getattr(conn, meth)(*args[:])
+                if self.interactive:
+                    pprint.pprint(retval)
+            except Exception, e:
+                retval = e
+                if self.interactive:
+                    sys.stderr.write("remote exception on %s: %s\n" %
+                        (server, str(e)))
+
+            if self.noglobs:
+                return retval
+            else:
+                left = server.rfind("/")+1
+                right = server.rfind(":")
+                server_name = server[left:right]
+                results[server_name] = retval
+
+        return results
+
+   # -----------------------------------------------
+
+    def cli_return(self,results):
+        """
+        As the return code list could return strings and exceptions
+        and all sorts of crazy stuff, reduce it down to a simple
+        integer return.  It may not be useful but we need one.
+        """
+        numbers = []
+        for x in results.keys():
+            # faults are the most important
+            if type(x) == Exception:
+                return -911
+            # then pay attention to numbers
+            if type(x) == int:
+                numbers.append(x)
+
+        # if there were no numbers, assume 0
+        if len(numbers) == 0:
+            return 0
+
+        # if there were numbers, return the highest
+        # (presumably the worst error code
+        max = -9999
+        for x in numbers:
+            if x > max:
+                max = x
+        return max
+
+# ===================================================================
+
+class Call(command.Command):
+    name = "call"
+    useage = "call nodule method name arg1 arg2..."
+    def addOptions(self):
+        self.parser.add_option("-v", "--verbose", dest="verbose",
+            action="store_true")
+        self.parser.add_option("-p", "--port", dest="port",
+            default=DEFAULT_PORT)
+
+    def handleOptions(self, options):
+        self.options = options
+
+        self.verbose = options.verbose
+        self.port = options.port
+        # I'm not really a fan of the "module methodname" approach
+        # but we'll keep it for now -akl
+
+    def do(self, args):
+
+        # I'm not really a fan of the "module methodname" approach
+        # but we'll keep it for now -akl
+
+        self.server_spec = args[0]
+        self.module      = args[1]
+        self.method      = args[2]
+        self.method_args = args[3:]
+
+        client = Client(self.server_spec,port=self.port,interactive=True,
+            verbose=self.verbose, config=self.config)
+        results = client.run(self.module, self.method, self.method_args)
+
+        # TO DO: add multiplexer support
+        # probably as a higher level module.
+
+        return client.cli_return(results)
+
+class FuncCommandLine(command.Command):
+    name = "client"
+    useage = "func is the commandline interface to a func minion"
+
+    subCommandClasses = [Call]
+
+    def __init__(self):
+
+        command.Command.__init__(self)
+
+    def do(self, args):
+        pass
+
+    def addOptions(self):
+        self.parser.add_option('', '--version', action="store_true",
+            help="show version information")
+        self.parser.add_option("--list-minions", dest="list_minions",
+            action="store_true", help="list all available minions")
+
+    def handleOptions(self, options):
+        if options.version:
+            #FIXME
+            print "version is NOT IMPLEMENTED YET"
+        if options.list_minions:
+            self.list_minions()
+
+            sys.exit(0) # stop execution
+
+    def list_minions(self):
+        print "Minions:"
+        gloob = "%s/%s.cert" % (self.config.certroot, "*")
+        certs = glob.glob(gloob)
+        for cert in certs:
+            host = cert.replace(self.config.certroot, "")[1:-5]
+            print "   %s" % host
diff --git a/func/overlord/command.py b/func/overlord/command.py
new file mode 100644
index 0000000..812ad8d
--- /dev/null
+++ b/func/overlord/command.py
@@ -0,0 +1,275 @@
+# -*- Mode: Python; test-case-name: test_command -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+# This file is released under the standard PSF license.
+#
+#  from MOAP - https://thomas.apestaart.org/moap/trac
+#    written by Thomas Vander Stichele (thomas at apestaart dot org)
+#
+
+"""
+Command class.
+"""
+
+import optparse
+import sys
+
+from func.config import read_config, CONFIG_FILE
+from func.commonconfig import CMConfig
+
+class CommandHelpFormatter(optparse.IndentedHelpFormatter):
+    """
+    I format the description as usual, but add an overview of commands
+    after it if there are any, formatted like the options.
+    """
+    _commands = None
+
+    def addCommand(self, name, description):
+        if self._commands is None:
+            self._commands = {}
+        self._commands[name] = description
+
+    ### override parent method
+    def format_description(self, description):
+        # textwrap doesn't allow for a way to preserve double newlines
+        # to separate paragraphs, so we do it here.
+        blocks = description.split('\n\n')
+        rets = []
+
+        for block in blocks:
+            rets.append(optparse.IndentedHelpFormatter.format_description(self,
+                block))
+        ret = "\n".join(rets)
+        if self._commands:
+            commandDesc = []
+            commandDesc.append("commands:")
+            keys = self._commands.keys()
+            keys.sort()
+            length = 0
+            for key in keys:
+                if len(key) > length:
+                    length = len(key)
+            for name in keys:
+                format = "  %-" + "%d" % length + "s  %s"
+                commandDesc.append(format % (name, self._commands[name]))
+            ret += "\n" + "\n".join(commandDesc) + "\n"
+        return ret
+
+class CommandOptionParser(optparse.OptionParser):
+    """
+    I parse options as usual, but I explicitly allow setting stdout
+    so that our print_help() method (invoked by default with -h/--help)
+    defaults to writing there.
+    """
+    _stdout = sys.stdout
+
+    def set_stdout(self, stdout):
+        self._stdout = stdout
+
+    # we're overriding the built-in file, but we need to since this is
+    # the signature from the base class
+    __pychecker__ = 'no-shadowbuiltin'
+    def print_help(self, file=None):
+        # we are overriding a parent method so we can't do anything about file
+        __pychecker__ = 'no-shadowbuiltin'
+        if file is None:
+            file = self._stdout
+        file.write(self.format_help())
+
+class Command:
+    """
+    I am a class that handles a command for a program.
+    Commands can be nested underneath a command for further processing.
+
+    @cvar name:        name of the command, lowercase
+    @cvar aliases:     list of alternative lowercase names recognized
+    @type aliases:     list of str
+    @cvar usage:       short one-line usage string;
+                       %command gets expanded to a sub-command or [commands]
+                       as appropriate
+    @cvar summary:     short one-line summary of the command
+    @cvar description: longer paragraph explaining the command
+    @cvar subCommands: dict of name -> commands below this command
+    @type subCommands: dict of str  -> L{Command}
+    """
+    name = None
+    aliases = None
+    usage = None
+    summary = None
+    description = None
+    parentCommand = None
+    subCommands = None
+    subCommandClasses = None
+    aliasedSubCommands = None
+
+    def __init__(self, parentCommand=None, stdout=sys.stdout,
+        stderr=sys.stderr):
+        """
+        Create a new command instance, with the given parent.
+        Allows for redirecting stdout and stderr if needed.
+        This redirection will be passed on to child commands.
+        """
+        if not self.name:
+            self.name = str(self.__class__).split('.')[-1].lower()
+        self.stdout = stdout
+        self.stderr = stderr
+        self.parentCommand = parentCommand
+
+        self.config = read_config(CONFIG_FILE, CMConfig)
+
+        # create subcommands if we have them
+        self.subCommands = {}
+        self.aliasedSubCommands = {}
+        if self.subCommandClasses:
+            for C in self.subCommandClasses:
+                c = C(self, stdout=stdout, stderr=stderr)
+                self.subCommands[c.name] = c
+                if c.aliases:
+                    for alias in c.aliases:
+                        self.aliasedSubCommands[alias] = c
+
+        # create our formatter and add subcommands if we have them
+        formatter = CommandHelpFormatter()
+        if self.subCommands:
+            for name, command in self.subCommands.items():
+                formatter.addCommand(name, command.summary or
+                    command.description)
+
+        # expand %command for the bottom usage
+        usage = self.usage or self.name
+        if usage.find("%command") > -1:
+            usage = usage.split("%command")[0] + '[command]'
+        usages = [usage, ]
+
+        # FIXME: abstract this into getUsage that takes an optional
+        # parentCommand on where to stop recursing up
+        # useful for implementing subshells
+
+        # walk the tree up for our usage
+        c = self.parentCommand
+        while c:
+            usage = c.usage or c.name
+            if usage.find(" %command") > -1:
+                usage = usage.split(" %command")[0]
+            usages.append(usage)
+            c = c.parentCommand
+        usages.reverse()
+        usage = " ".join(usages)
+
+        # create our parser
+        description = self.description or self.summary
+        self.parser = CommandOptionParser(
+            usage=usage, description=description,
+            formatter=formatter)
+        self.parser.set_stdout(self.stdout)
+        self.parser.disable_interspersed_args()
+
+        # allow subclasses to add options
+        self.addOptions()
+
+    def addOptions(self):
+        """
+        Override me to add options to the parser.
+        """
+        pass
+
+    def do(self, args):
+        """
+        Override me to implement the functionality of the command.
+        """
+        pass
+
+    def parse(self, argv):
+        """
+        Parse the given arguments and act on them.
+
+        @rtype:   int
+        @returns: an exit code
+        """
+        self.options, args = self.parser.parse_args(argv)
+
+        # FIXME: make handleOptions not take options, since we store it
+        # in self.options now
+        ret = self.handleOptions(self.options)
+        if ret:
+            return ret
+
+        # handle pleas for help
+        if args and args[0] == 'help':
+            self.debug('Asked for help, args %r' % args)
+
+            # give help on current command if only 'help' is passed
+            if len(args) == 1:
+                self.outputHelp()
+                return 0
+
+            # complain if we were asked for help on a subcommand, but we don't
+            # have any
+            if not self.subCommands:
+                self.stderr.write('No subcommands defined.')
+                self.parser.print_usage(file=self.stderr)
+                self.stderr.write(
+                    "Use --help to get more information about this command.\n")
+                return 1
+
+            # rewrite the args the other way around;
+            # help doap becomes doap help so it gets deferred to the doap
+            # command
+            args = [args[1], args[0]]
+
+        # if we don't have subcommands, defer to our do() method
+        if not self.subCommands:
+            ret = self.do(args)
+
+            # if everything's fine, we return 0
+            if not ret:
+                ret = 0
+
+            return ret
+
+        # if we do have subcommands, defer to them
+        try:
+            command = args[0]
+        except IndexError:
+            self.parser.print_usage(file=self.stderr)
+            self.stderr.write(
+                "Use --help to get a list of commands.\n")
+            return 1
+
+        if command in self.subCommands.keys():
+            return self.subCommands[command].parse(args[1:])
+
+        if self.aliasedSubCommands:
+            if command in self.aliasedSubCommands.keys():
+                return self.aliasedSubCommands[command].parse(args[1:])
+
+        self.stderr.write("Unknown command '%s'.\n" % command)
+        return 1
+
+    def outputHelp(self):
+        """
+        Output help information.
+        """
+        self.parser.print_help(file=self.stderr)
+
+    def outputUsage(self):
+        """
+        Output usage information.
+        Used when the options or arguments were missing or wrong.
+        """
+        self.parser.print_usage(file=self.stderr)
+
+    def handleOptions(self, options):
+        """
+        Handle the parsed options.
+        """
+        pass
+
+    def getRootCommand(self):
+        """
+        Return the top-level command, which is typically the program.
+        """
+        c = self
+        while c.parentCommand:
+            c = c.parentCommand
+        return c
diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
new file mode 100644
index 0000000..ccb2c9c
--- /dev/null
+++ b/func/overlord/sslclient.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+import sys
+import xmlrpclib
+import urllib
+
+from func import SSLCommon
+
+
+class SSL_Transport(xmlrpclib.Transport):
+
+    user_agent = "pyOpenSSL_XMLRPC/%s - %s" % ('0.1', xmlrpclib.Transport.user_agent)
+
+    def __init__(self, ssl_context, timeout=None, use_datetime=0):
+        if sys.version_info[:3] >= (2, 5, 0):
+            xmlrpclib.Transport.__init__(self, use_datetime)
+        self.ssl_ctx=ssl_context
+        self._timeout = timeout
+
+    def make_connection(self, host):
+        # Handle username and password.
+        try:
+            host, extra_headers, x509 = self.get_host_info(host)
+        except AttributeError:
+            # Yay for Python 2.2
+            pass
+        _host, _port = urllib.splitport(host)
+        return SSLCommon.HTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
+
+
+class SSLXMLRPCServerProxy(xmlrpclib.ServerProxy):
+    def __init__(self, uri, pkey_file, cert_file, ca_cert_file, timeout=None):
+        self.ctx = SSLCommon.CreateSSLContext(pkey_file, cert_file, ca_cert_file)
+        xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx, timeout=timeout))
+
+
+class FuncServer(SSLXMLRPCServerProxy):
+    def __init__(self, uri, pem=None, crt=None, ca=None):
+        self.pem = pem
+        self.crt = crt
+        self.ca = ca
+
+        SSLXMLRPCServerProxy.__init__(self, uri,
+                                      self.pem,
+                                      self.crt,
+                                      self.ca)
+
+
+if __name__ == "__main__":
+    s = SSLXMLRPCServerProxy('https://localhost:51234/', '/etc/pki/func/slave.pem', '/etc/pki/func/slave.cert', '/etc/pki/func/ca/funcmaster.crt')
+    f = s.ping(1, 2)
+    print f
diff --git a/func/overlord/test_func.py b/func/overlord/test_func.py
new file mode 100644
index 0000000..2b3f041
--- /dev/null
+++ b/func/overlord/test_func.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+
+
+# FIXME: should import the client lib, not XMLRPC lib, when we are done
+
+import xmlrpclib
+import sys
+
+TEST_GETATTR = True
+TEST_PROCESS = False
+TEST_VIRT = False
+TEST_SERVICES = False
+TEST_HARDWARE =  False
+TEST_SMART = True
+
+if TEST_GETATTR:
+    import func.overlord.client as func_client
+    print func_client.Client("*").hardware.pci_info()
+    #print func_client.Client("*").test.add(1,2)
+    #print func_client.Client("*").hardware.info()
+    #print func_client.Client("*").run("hardware","info",[])
+    #print func_client.Client(socket.gethostname(),noglobs=True).test.add("1","2")
+    sys.exit(1)
+
+# get a connecton (to be replaced by client lib logic)
+s = xmlrpclib.ServerProxy("http://127.0.0.1:51234")
+
+# here's the basic test...
+print s.test.add(1, 2)
+
+if TEST_SMART:
+    print s.smart.info()
+
+if TEST_PROCESS:
+    print s.process.info()
+    # print s.process.pkill("thunderbird")
+
+# here's the service module testing
+if TEST_SERVICES:
+    print s.service.restart("httpd")
+
+if TEST_HARDWARE:
+    print s.hardware.info()
+
+# this is so I can remember how the virt module works
+if TEST_VIRT:
+
+    # example of using koan to install a virtual machine
+    #s.virt_install("mdehaan.rdu.redhat.com","profileX")
+
+    # wait ...
+    vms = s.virt.list_vms()
+    # example of stopping all stopped virtual machines
+    print "list of virtual instances = %s" % vms
+    for vm in vms:
+        status = s.virt.status(vm)
+        print status
+        if status == "shutdown":
+            s.virt.start(vm)
+
+# add more tests here