Revision 0d5a999d

b/image_creator/disk.py
86 86
        self.bootable = bootable
87 87

  
88 88
        self.g = guestfs.GuestFS()
89

  
90
        self.g.set_trace(1)
91

  
89 92
        self.g.add_drive_opts(device, readonly = 0)
90 93
        self.g.launch()
91 94
        roots = self.g.inspect_os()
......
106 109
        del self.g
107 110
    
108 111
    def mount(self):
109
        mps = g.inspect_get_mountpoints(self.root)
112
        mps = self.g.inspect_get_mountpoints(self.root)
110 113
        # Sort the keys to mount the fs in a correct order.
111 114
        # / should be mounted befor /boot, etc
112 115
        def compare (a, b):
b/image_creator/main.py
46 46
    disk = Disk(source)
47 47
    try:
48 48
        dev = disk.get_device()
49
        dev.mount()
49 50
        osclass = get_os_class(dev.distro, dev.ostype)
50 51
        image_os = osclass(dev.root, dev.g)
51 52
        metadata = image_os.get_metadata()
52 53
        for key, val in metadata.iteritems():
53 54
            print "%s=%s" % (key,val)
54 55

  
56
        image_os.data_cleanup()
57

  
55 58
    finally:
56 59
        disk.cleanup()
57 60

  
b/image_creator/os_type/__init__.py
1 1
#!/usr/bin/env python
2 2

  
3
def add_prefix(target):
4
    def wrapper(self, *args):
5
        prefix = args[0]
6
        return map(lambda x: prefix + x, target(self, *args))
7
    return wrapper
8

  
3 9
class OSBase(object):
4 10
    def __init__(self, rootdev, ghandler):
5 11
        self.root = rootdev
6 12
        self.g = ghandler
7 13

  
14
    @add_prefix
15
    def ls(self, directory): return self.g.ls(directory)
16

  
17
    @add_prefix
18
    def find(self, directory): return self.g.find(directory)
19

  
8 20
    def get_metadata(self):
9 21
        meta = {}
10 22
        meta["OSFAMILY"] = self.g.inspect_get_type(self.root)
b/image_creator/os_type/unix.py
5 5
from image_creator.os_type import OSBase
6 6

  
7 7
class Unix(OSBase):
8

  
9
    sensitive_userdata = ['.bash_history']
10

  
8 11
    def get_metadata(self):
9 12
        meta = super(Unix, self).get_metadata()
10 13
        meta["USERS"] = " ".join(self.get_passworded_users())
11 14
        return meta
12 15

  
13 16
    def get_passworded_users(self):
14
        
15 17
        users = []
16

  
17 18
        regexp = re.compile('(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}')
18 19

  
19 20
        for line in open('/etc/shadow', 'r').readlines():
......
29 30

  
30 31
        return users
31 32

  
32
    def cleanup_sensitive_data(self):
33
        cleanup_userdata()
34
        cleanup_tmp()
35
        cleanup_log()
33
    def data_cleanup(self):
34
        self.cleanup_userdata()
35
        self.cleanup_tmp()
36
        self.cleanup_log()
37

  
38
    def cleanup_tmp(self):
39
        files = []
40
        files.extend(self.ls('/tmp/'))
41
        files.extend(self.ls('/var/tmp/'))
42
    
43
        for filename in files:
44
            self.g.rm_rf(filename)
45

  
46
    def cleanup_log(self):
47
        files = self.find( '/var/log/')
48

  
49
        for filename in filter(self.g.is_file, files):
50
            self.g.truncate(filename)
51
        
52
    def cleanup_userdata(self):
53
        homedirs = ['/root'] + self.ls('/home/')
54

  
55
        for homedir in homedirs:
56
            for data in self.sensitive_userdata:
57
                fname = "%s/%s" % (homedir, data)
58
                print "Filename: %s\n" % fname
59
                if self.g.is_file(fname):
60
                    self.g.scrub_file(fname)
36 61

  
37 62
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

Also available in: Unified diff