Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backup: minor code structure changes

Browse Source 
- initialize internal objects object in constructor
- use 'with'
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-02 23:56:00 +02:00 committed by Wojtek Porczyk
parent 78dbadab57
commit d9cf64a41d
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
qubes/backup.py
View File

@ -78,16 +78,23 @@ class BackupHeader(object):
bool_options = ['encrypted', 'compressed'] bool_options = ['encrypted', 'compressed']
int_options = ['version'] int_options = ['version']
def __init__(self, header_data=None): def __init__(self,
header_data=None,
version=None,
encrypted=None,
compressed=None,
compression_filter=None,
hmac_algorithm=None,
crypto_algorithm=None):
# repeat the list to help code completion... # repeat the list to help code completion...
self.version = None self.version = version
self.encrypted = None self.encrypted = encrypted
self.compressed = None self.compressed = compressed
# Options introduced in backup format 3+, which always have a header, # Options introduced in backup format 3+, which always have a header,
# so no need for fallback in function parameter # so no need for fallback in function parameter
self.compression_filter = None self.compression_filter = compression_filter
self.hmac_algorithm = None self.hmac_algorithm = hmac_algorithm
self.crypto_algorithm = None self.crypto_algorithm = crypto_algorithm
if header_data is not None: if header_data is not None:
self.load(header_data) self.load(header_data)
@ -109,7 +116,7 @@ class BackupHeader(object):
for untrusted_line in untrusted_header_text.splitlines(): for untrusted_line in untrusted_header_text.splitlines():
if untrusted_line.count('=') != 1: if untrusted_line.count('=') != 1:
raise qubes.exc.QubesException("Invalid backup header") raise qubes.exc.QubesException("Invalid backup header")
(key, value) = untrusted_line.strip().split('=') key, value = untrusted_line.strip().split('=', 1)
if not _re_alphanum.match(key): if not _re_alphanum.match(key):
raise qubes.exc.QubesException("Invalid backup header (key)") raise qubes.exc.QubesException("Invalid backup header (key)")
if key not in self.header_keys.keys(): if key not in self.header_keys.keys():
@ -283,9 +290,8 @@ class Backup(object):
self.vms_for_backup = vms_list self.vms_for_backup = vms_list
# Apply exclude list # Apply exclude list
if exclude_list: self.vms_for_backup = [vm for vm in vms_list
self.vms_for_backup = [vm for vm in vms_list if vm.name not in exclude_list]
if vm.name not in exclude_list]
def __del__(self): def __del__(self):
if self.tmpdir and os.path.exists(self.tmpdir): if self.tmpdir and os.path.exists(self.tmpdir):
@ -511,14 +517,14 @@ class Backup(object):
def prepare_backup_header(self): def prepare_backup_header(self):
header_file_path = os.path.join(self.tmpdir, HEADER_FILENAME) header_file_path = os.path.join(self.tmpdir, HEADER_FILENAME)
backup_header = BackupHeader() backup_header = BackupHeader(
backup_header.version = CURRENT_BACKUP_FORMAT_VERSION version=CURRENT_BACKUP_FORMAT_VERSION,
backup_header.hmac_algorithm = self.hmac_algorithm hmac_algorithm=self.hmac_algorithm,
backup_header.crypto_algorithm = self.crypto_algorithm crypto_algorithm=self.crypto_algorithm,
backup_header.encrypted = self.encrypted encrypted=self.encrypted,
backup_header.compressed = self.compressed compressed=self.compressed,
if self.compressed: compression_filter=self.compression_filter,
backup_header.compression_filter = self.compression_filter )
backup_header.save(header_file_path) backup_header.save(header_file_path)
hmac = subprocess.Popen( hmac = subprocess.Popen(
@ -772,10 +778,8 @@ class Backup(object):
hmac_data = hmac.stdout.read() hmac_data = hmac.stdout.read()
self.log.debug( self.log.debug(
"Writing hmac to {}.hmac".format(chunkfile)) "Writing hmac to {}.hmac".format(chunkfile))
hmac_file = open(chunkfile + ".hmac", 'w') with open(chunkfile + ".hmac", 'w') as hmac_file:
hmac_file.write(hmac_data) hmac_file.write(hmac_data)
hmac_file.flush()
hmac_file.close()
# Send the HMAC to the backup target # Send the HMAC to the backup target
self._queue_put_with_check( self._queue_put_with_check(
@ -1556,13 +1560,14 @@ class BackupRestore(object):
os.unlink(filename) os.unlink(filename)
else: else:
# if no header found, create one with guessed HMAC algo # if no header found, create one with guessed HMAC algo
header_data = BackupHeader() header_data = BackupHeader(
header_data.version = 2 version=2,
header_data.hmac_algorithm = hmac_algorithm hmac_algorithm=hmac_algorithm,
# place explicitly this value, because it is what format_version # place explicitly this value, because it is what format_version
# 2 have # 2 have
header_data.crypto_algorithm = 'aes-256-cbc' crypto_algorithm='aes-256-cbc',
# TODO: set header_data.encrypted to something... # TODO: set encrypted to something...
)
# when tar do not find expected file in archive, it exit with # when tar do not find expected file in archive, it exit with
# code 2. This will happen because we've requested backup-header # code 2. This will happen because we've requested backup-header
# file, but the archive do not contain it. Ignore this particular # file, but the archive do not contain it. Ignore this particular
@ -1649,7 +1654,7 @@ class BackupRestore(object):
os.path.join(self.tmpdir, 'qubes.xml')) os.path.join(self.tmpdir, 'qubes.xml'))
else: else:
backup_app = qubes.Qubes(os.path.join(self.tmpdir, 'qubes.xml')) backup_app = qubes.Qubes(os.path.join(self.tmpdir, 'qubes.xml'))
# Not needed anymore - all the data stored in backup_app # Not needed anymore - all the data stored in backup_app
os.unlink(os.path.join(self.tmpdir, 'qubes.xml')) os.unlink(os.path.join(self.tmpdir, 'qubes.xml'))
return backup_app return backup_app