In cleanup_userdata sysprep check if /home exists

[snf-image-creator] / image_creator / os_type / unix.py

diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index fa70805..f2abd0e 100644 (file)
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -32,124 +32,24 @@
 # or implied, of GRNET S.A.
 
 import re
-import sys
 
 from image_creator.os_type import OSBase, sysprep
 
 
 class Unix(OSBase):
-
+    """OS class for Unix"""
     sensitive_userdata = [
+        '.history',
         '.bash_history',
         '.gnupg',
         '.ssh',
-        '.mozilla',
-        '.thunderbird'
+        '.kamakirc',
+        '.kamaki.history'
     ]
 
     def __init__(self, rootdev, ghandler, output):
         super(Unix, self).__init__(rootdev, ghandler, output)
 
-        self.meta["USERS"] = " ".join(self._get_passworded_users())
-        # Delete the USERS metadata if empty
-        if not len(self.meta['USERS']):
-            self.out.warn("No passworded users found!")
-            del self.meta['USERS']
-
-
-    def _get_passworded_users(self):
-        users = []
-        regexp = re.compile('(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}')
-
-        for line in self.g.cat('/etc/shadow').splitlines():
-            match = regexp.match(line)
-            if not match:
-                continue
-
-            user, passwd = match.groups()
-            if len(passwd) > 0 and passwd[0] == '!':
-                self.out.warn("Ignoring locked %s account." % user)
-            else:
-                users.append(user)
-
-        return users
-
-    @sysprep(enabled=False)
-    def remove_user_accounts(self, print_header=True):
-        """Remove all user accounts with id greater than 1000"""
-
-        if print_header:
-            self.out.output("Removing all user accounts with id greater than "
-                            "1000")
-
-        if 'USERS' not in self.meta:
-            return
-
-        # Remove users from /etc/passwd
-        passwd = []
-        removed_users = {}
-        metadata_users = self.meta['USERS'].split()
-        for line in self.g.cat('/etc/passwd').splitlines():
-            fields = line.split(':')
-            if int(fields[2]) > 1000:
-                removed_users[fields[0]] = fields
-                # remove it from the USERS metadata too
-                if fields[0] in metadata_users:
-                    metadata_users.remove(fields[0])
-            else:
-                passwd.append(':'.join(fields))
-
-        self.meta['USERS'] = " ".join(metadata_users)
-
-        # Delete the USERS metadata if empty
-        if not len(self.meta['USERS']):
-            del self.meta['USERS']
-
-        self.g.write('/etc/passwd', '\n'.join(passwd) + '\n')
-
-        # Remove the corresponding /etc/shadow entries
-        shadow = []
-        for line in self.g.cat('/etc/shadow').splitlines():
-            fields = line.split(':')
-            if fields[0] not in removed_users:
-                shadow.append(':'.join(fields))
-
-        self.g.write('/etc/shadow', "\n".join(shadow) + '\n')
-
-        # Remove the corresponding /etc/group entries
-        group = []
-        for line in self.g.cat('/etc/group').splitlines():
-            fields = line.split(':')
-            # Remove groups tha have the same name as the removed users
-            if fields[0] not in removed_users:
-                group.append(':'.join(fields))
-
-        self.g.write('/etc/group', '\n'.join(group) + '\n')
-
-        # Remove home directories
-        for home in [field[5] for field in removed_users.values()]:
-            if self.g.is_dir(home) and home.startswith('/home/'):
-                self.g.rm_rf(home)
-
-    @sysprep()
-    def cleanup_passwords(self, print_header=True):
-        """Remove all passwords and lock all user accounts"""
-
-        if print_header:
-            self.out.output("Cleaning up passwords & locking all user "
-                            "accounts")
-
-        shadow = []
-
-        for line in self.g.cat('/etc/shadow').splitlines():
-            fields = line.split(':')
-            if fields[1] not in ('*', '!'):
-                fields[1] = '!'
-
-            shadow.append(":".join(fields))
-
-        self.g.write('/etc/shadow', "\n".join(shadow) + '\n')
-
     @sysprep()
     def cleanup_cache(self, print_header=True):
         """Remove all regular files under /var/cache"""
@@ -192,7 +92,9 @@ class Unix(OSBase):
     def cleanup_userdata(self, print_header=True):
         """Delete sensitive userdata"""
 
-        homedirs = ['/root'] + self.ls('/home/')
+        homedirs = ['/root']
+        if self.g.is_dir('/home/'):
+            homedirs += self.ls('/home/')
 
         if print_header:
             self.out.output("Removing sensitive user data under %s" %
@@ -203,5 +105,7 @@ class Unix(OSBase):
                 fname = "%s/%s" % (homedir, data)
                 if self.g.is_file(fname):
                     self.g.scrub_file(fname)
+                elif self.g.is_dir(fname):
+                    self.foreach_file(fname, self.g.scrub_file, ftype='r')
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :