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

qvm-backup: encrypt the backup when custom enc algo specified

Browse Source 
Also move forcing encryption earlier to have VM names hidden
(backup_prepare call).
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-15 05:51:52 +01:00
parent 16f8e46f68
commit d473140dff
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qvm-tools/qvm-backup
View File

@ -47,7 +47,9 @@ def main():
help="Encrypts the backup") help="Encrypts the backup")
parser.add_option ("-E", "--enc-algo", action="store", parser.add_option ("-E", "--enc-algo", action="store",
dest="crypto_algorithm", default=None, dest="crypto_algorithm", default=None,
help="Specify non-default encryption algorithm. For list of supported algos execute 'openssl list-cipher-algorithms'") help="Specify non-default encryption algorithm. For "
"list of supported algos execute 'openssl "
"list-cipher-algorithms' (implies -e)")
parser.add_option ("-H", "--hmac-algo", action="store", parser.add_option ("-H", "--hmac-algo", action="store",
dest="hmac_algorithm", default=None, dest="hmac_algorithm", default=None,
help="Specify non-default hmac algorithm. For list of " help="Specify non-default hmac algorithm. For list of "
@ -86,6 +88,8 @@ def main():
"store the backup.").format(options.appvm) "store the backup.").format(options.appvm)
options.exclude_list.append(options.appvm) options.exclude_list.append(options.appvm)
if options.appvm or options.crypto_algorithm:
options.encrypt = True
files_to_backup = None files_to_backup = None
try: try:
files_to_backup = backup_prepare( files_to_backup = backup_prepare(
@ -111,7 +115,6 @@ def main():
print "-> Available space: {0}".format(size_to_human(backup_fs_free_sz)) print "-> Available space: {0}".format(size_to_human(backup_fs_free_sz))
else: else:
options.encrypt = True
appvm = qvm_collection.get_vm_by_name(options.appvm) appvm = qvm_collection.get_vm_by_name(options.appvm)
if appvm is None: if appvm is None:
print >>sys.stderr, "ERROR: VM {0} does not exist".format(options.appvm) print >>sys.stderr, "ERROR: VM {0} does not exist".format(options.appvm)