Options: migrated client drivers to new parser

3 files changed, 52 insertions, 35 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 9f47fb53a..482320e0d 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -6,6 +6,7 @@ import stat
 import time
 import difflib
 import tempfile
+import Bcfg2.Options
 from Bcfg2.Client.Tools.POSIX.base import POSIXTool
 from Bcfg2.Compat import unicode, b64encode, b64decode  # pylint: disable=W0622
 
@@ -43,7 +44,7 @@ class POSIXFile(POSIXTool):
             tempdata = entry.text
             if isinstance(tempdata, unicode) and unicode != str:
                 try:
-                    tempdata = tempdata.encode(self.setup['encoding'])
+                    tempdata = tempdata.encode(Bcfg2.Options.setup.encoding)
                 except UnicodeEncodeError:
                     err = sys.exc_info()[1]
                     self.logger.error("POSIX: Error encoding file %s: %s" %
@@ -82,7 +83,7 @@ class POSIXFile(POSIXTool):
             self.logger.debug("POSIX: %s has incorrect contents" %
                               entry.get("name"))
             self._get_diffs(
-                entry, interactive=self.setup['interactive'],
+                entry, interactive=Bcfg2.Options.setup.interactive,
                 sensitive=entry.get('sensitive', 'false').lower() == 'true',
                 is_binary=is_binary, content=content)
         return POSIXTool.verify(self, entry, modlist) and not different
@@ -170,7 +171,8 @@ class POSIXFile(POSIXTool):
                                   (entry.get("name"), sys.exc_info()[1]))
                 return False
         if not is_binary:
-            is_binary |= not self._is_string(content, self.setup['encoding'])
+            is_binary |= not self._is_string(content,
+                                             Bcfg2.Options.setup.encoding)
         if is_binary:
             # don't compute diffs if the file is binary
             prompt.append('Binary file, no printable diff')
@@ -183,7 +185,7 @@ class POSIXFile(POSIXTool):
                 if diff:
                     udiff = '\n'.join(l.rstrip('\n') for l in diff)
                     if hasattr(udiff, "decode"):
-                        udiff = udiff.decode(self.setup['encoding'])
+                        udiff = udiff.decode(Bcfg2.Options.setup.encoding)
                     try:
                         prompt.append(udiff)
                     except UnicodeEncodeError:
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
index 4f1f8e5aa..db0fa96ab 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
@@ -4,20 +4,31 @@ import os
 import re
 import sys
 import shutil
-from datetime import datetime
+import Bcfg2.Options
 import Bcfg2.Client.Tools
+from datetime import datetime
 from Bcfg2.Compat import walk_packages
 from Bcfg2.Client.Tools.POSIX.base import POSIXTool
 
 
 class POSIX(Bcfg2.Client.Tools.Tool):
     """POSIX File support code."""
-    name = 'POSIX'
+
+    options = Bcfg2.Client.Tools.Tool.options + [
+        Bcfg2.Options.PathOption(
+            cf=('paranoid', 'path'), default='/var/cache/bcfg2',
+            dest='paranoid_path',
+            help='Specify path for paranoid file backups'),
+        Bcfg2.Options.Option(
+            cf=('paranoid', 'max_copies'), default=1, type=int,
+            dest='paranoid_copies',
+            help='Specify the number of paranoid copies you want'),
+        Bcfg2.Options.BooleanOption(
+            '-P', '--paranoid', cf=('client', 'paranoid'),
+            help='Make automatic backups of config files')]
 
     def __init__(self, config):
         Bcfg2.Client.Tools.Tool.__init__(self, config)
-        self.ppath = self.setup['ppath']
-        self.max_copies = self.setup['max_copies']
         self._handlers = self._load_handlers()
         self.logger.debug("POSIX: Handlers loaded: %s" %
                           (", ".join(self._handlers.keys())))
@@ -89,7 +100,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
         self.logger.debug("POSIX: Verifying entry %s:%s:%s" %
                           (entry.tag, entry.get("type"), entry.get("name")))
         ret = self._handlers[entry.get("type")].verify(entry, modlist)
-        if self.setup['interactive'] and not ret:
+        if Bcfg2.Options.setup.interactive and not ret:
             entry.set('qtext',
                       '%s\nInstall %s %s: (y/N) ' %
                       (entry.get('qtext', ''),
@@ -103,35 +114,39 @@ class POSIX(Bcfg2.Client.Tools.Tool):
             bkupnam + r'_\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6}$')
         # current list of backups for this file
         try:
-            bkuplist = [f for f in os.listdir(self.ppath) if
-                        bkup_re.match(f)]
+            bkuplist = [f
+                        for f in os.listdir(Bcfg2.Options.setup.paranoid_path)
+                        if bkup_re.match(f)]
         except OSError:
             err = sys.exc_info()[1]
             self.logger.error("POSIX: Failed to create backup list in %s: %s" %
-                              (self.ppath, err))
+                              (Bcfg2.Options.setup.paranoid_path, err))
             return
         bkuplist.sort()
-        while len(bkuplist) >= int(self.max_copies):
+        while len(bkuplist) >= int(Bcfg2.Options.setup.paranoid_copies):
             # remove the oldest backup available
             oldest = bkuplist.pop(0)
             self.logger.info("POSIX: Removing old backup %s" % oldest)
             try:
-                os.remove(os.path.join(self.ppath, oldest))
+                os.remove(os.path.join(Bcfg2.Options.setup.paranoid_path,
+                                       oldest))
             except OSError:
                 err = sys.exc_info()[1]
-                self.logger.error("POSIX: Failed to remove old backup %s: %s" %
-                                  (os.path.join(self.ppath, oldest), err))
+                self.logger.error(
+                    "POSIX: Failed to remove old backup %s: %s" %
+                    (os.path.join(Bcfg2.Options.setup.paranoid_path, oldest),
+                     err))
 
     def _paranoid_backup(self, entry):
         """ Take a backup of the specified entry for paranoid mode """
         if (entry.get("paranoid", 'false').lower() == 'true' and
-            self.setup.get("paranoid", False) and
+            Bcfg2.Options.setup.paranoid and
             entry.get('current_exists', 'true') == 'true' and
             not os.path.isdir(entry.get("name"))):
             self._prune_old_backups(entry)
             bkupnam = "%s_%s" % (entry.get('name').replace('/', '_'),
                                  datetime.isoformat(datetime.now()))
-            bfile = os.path.join(self.ppath, bkupnam)
+            bfile = os.path.join(Bcfg2.Options.setup.paranoid_path, bkupnam)
             try:
                 shutil.copy(entry.get('name'), bfile)
                 self.logger.info("POSIX: Backup of %s saved to %s" %
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index 16fe0acb5..fad458003 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -105,23 +105,23 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
             path = entry.get("name")
 
         rv = True
-        if entry.get("owner") and entry.get("group"):
-            try:
-                self.logger.debug("POSIX: Setting ownership of %s to %s:%s" %
-                                  (path,
-                                   self._norm_entry_uid(entry),
-                                   self._norm_entry_gid(entry)))
-                os.chown(path, self._norm_entry_uid(entry),
-                         self._norm_entry_gid(entry))
-            except KeyError:
-                self.logger.error('POSIX: Failed to change ownership of %s' %
-                                  path)
-                rv = False
-                os.chown(path, 0, 0)
-            except OSError:
-                self.logger.error('POSIX: Failed to change ownership of %s' %
-                                  path)
-                rv = False
+        if os.geteuid() == 0:
+            if entry.get("owner") and entry.get("group"):
+                try:
+                    self.logger.debug("POSIX: Setting ownership of %s to %s:%s"
+                                      % (path,
+                                         self._norm_entry_uid(entry),
+                                         self._norm_entry_gid(entry)))
+                    os.chown(path, self._norm_entry_uid(entry),
+                             self._norm_entry_gid(entry))
+                except (OSError, KeyError):
+                    self.logger.error('POSIX: Failed to change ownership of %s'
+                                      % path)
+                    rv = False
+                    if sys.exc_info()[0] == KeyError:
+                        os.chown(path, 0, 0)
+        else:
+            self.logger.debug("POSIX: Run as non-root, not setting ownership")
 
         if entry.get("mode"):
             wanted_mode = int(entry.get('mode'), 8)