backup: add support for restoring pre-core3 backups
This commit is contained in:
Marek Marczykowski-Górecki
Wojtek Porczyk
parent
304d2b10bc
commit
8c5d42a095
@ -39,13 +39,13 @@ import errno
|
||||
import datetime
|
||||
from multiprocessing import Queue, Process
|
||||
import qubes
|
||||
import qubes.core2migration
|
||||
|
||||
HEADER_FILENAME = 'backup-header'
|
||||
DEFAULT_CRYPTO_ALGORITHM = 'aes-256-cbc'
|
||||
DEFAULT_HMAC_ALGORITHM = 'SHA512'
|
||||
DEFAULT_COMPRESSION_FILTER = 'gzip'
|
||||
# TODO: increase version after finishing implementation
|
||||
CURRENT_BACKUP_FORMAT_VERSION = '3'
|
||||
CURRENT_BACKUP_FORMAT_VERSION = '4'
|
||||
# Maximum size of error message get from process stderr (including VM process)
|
||||
MAX_STDERR_BYTES = 1024
|
||||
# header + qubes.xml max size
|
||||
@ -149,7 +149,7 @@ class BackupHeader(object):
|
||||
if self.version == 1:
|
||||
# header not really present
|
||||
pass
|
||||
elif self.version in [2, 3]:
|
||||
elif self.version in [2, 3, 4]:
|
||||
expected_attrs = ['version', 'encrypted', 'compressed',
|
||||
'hmac_algorithm']
|
||||
if self.encrypted:
|
||||
@ -1630,7 +1630,7 @@ class BackupRestore(object):
|
||||
format_version = self.header_data.version
|
||||
if format_version == 2:
|
||||
extract_proc = ExtractWorker2(**extractor_params)
|
||||
elif format_version == 3:
|
||||
elif format_version in [3, 4]:
|
||||
extractor_params['compression_filter'] = \
|
||||
self.header_data.compression_filter
|
||||
extract_proc = ExtractWorker3(**extractor_params)
|
||||
@ -1646,7 +1646,9 @@ class BackupRestore(object):
|
||||
and :py:meth:`retrieve_backup_header` was called.
|
||||
"""
|
||||
if self.header_data.version == 1:
|
||||
raise NotImplementedError("TODO: conversion core[12] qubes.xml")
|
||||
backup_app = qubes.core2migration.Core2Qubes(
|
||||
os.path.join(self.backup_location, 'qubes.xml'))
|
||||
return backup_app
|
||||
else:
|
||||
self._verify_hmac("qubes.xml.000", "qubes.xml.000.hmac")
|
||||
queue = Queue()
|
||||
@ -1660,13 +1662,14 @@ class BackupRestore(object):
|
||||
"unable to extract the qubes backup. "
|
||||
"Check extracting process errors.")
|
||||
|
||||
if self.header_data.version in [2]: # TODO add 3
|
||||
raise NotImplementedError("TODO: conversion core[12] qubes.xml")
|
||||
if self.header_data.version in [2, 3]:
|
||||
backup_app = qubes.core2migration.Core2Qubes(
|
||||
os.path.join(self.tmpdir, 'qubes.xml'))
|
||||
else:
|
||||
backup_app = qubes.Qubes(os.path.join(self.tmpdir, 'qubes.xml'))
|
||||
# Not needed anymore - all the data stored in backup_app
|
||||
os.unlink(os.path.join(self.tmpdir, 'qubes.xml'))
|
||||
return backup_app
|
||||
os.unlink(os.path.join(self.tmpdir, 'qubes.xml'))
|
||||
return backup_app
|
||||
|
||||
def _restore_vm_dirs(self, vms_dirs, vms_size):
|
||||
# Currently each VM consists of at most 7 archives (count
|
||||
@ -1917,7 +1920,7 @@ class BackupRestore(object):
|
||||
def _is_vm_included_in_backup(self, vm):
|
||||
if self.header_data.version == 1:
|
||||
return self._is_vm_included_in_backup_v1(vm)
|
||||
elif self.header_data.version in [2, 3]:
|
||||
elif self.header_data.version in [2, 3, 4]:
|
||||
return self._is_vm_included_in_backup_v2(vm)
|
||||
else:
|
||||
raise qubes.exc.QubesException(
|
||||
|
||||
220
qubes/core2migration.py
Normal file
220
qubes/core2migration.py
Normal file
@ -0,0 +1,220 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# The Qubes OS Project, http://www.qubes-os.org
|
||||
#
|
||||
# Copyright (C) 2016 Marek Marczykowski-Górecki
|
||||
# <marmarek@invisiblethingslab.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#
|
||||
#
|
||||
import os
|
||||
import sys
|
||||
import qubes
|
||||
import qubes.vm.appvm
|
||||
import qubes.vm.standalonevm
|
||||
import qubes.vm.templatevm
|
||||
import qubes.vm.adminvm
|
||||
import qubes.ext.r3compatibility
|
||||
import lxml.etree
|
||||
import xml.parsers.expat
|
||||
|
||||
|
||||
class AppVM(qubes.vm.appvm.AppVM):
|
||||
"""core2 compatibility AppVM class, with variable dir_path"""
|
||||
dir_path = qubes.property('dir_path',
|
||||
default=(lambda self: self.storage.vmdir),
|
||||
saver=qubes.property.dontsave,
|
||||
doc="VM storage directory",
|
||||
)
|
||||
|
||||
def is_running(self):
|
||||
return False
|
||||
|
||||
class StandaloneVM(qubes.vm.standalonevm.StandaloneVM):
|
||||
"""core2 compatibility StandaloneVM class, with variable dir_path"""
|
||||
dir_path = qubes.property('dir_path',
|
||||
default=(lambda self: self.storage.vmdir),
|
||||
saver=qubes.property.dontsave,
|
||||
doc="VM storage directory")
|
||||
|
||||
def is_running(self):
|
||||
return False
|
||||
|
||||
|
||||
class Core2Qubes(qubes.Qubes):
|
||||
|
||||
def __init__(self, store=None, load=True, **kwargs):
|
||||
if store is None:
|
||||
raise ValueError("store path required")
|
||||
super(Core2Qubes, self).__init__(store, load, **kwargs)
|
||||
|
||||
def load_globals(self, element):
|
||||
default_template = element.get("default_template")
|
||||
self.default_template = int(default_template) \
|
||||
if default_template.lower() != "none" else None
|
||||
|
||||
default_netvm = element.get("default_netvm")
|
||||
if default_netvm is not None:
|
||||
self.default_netvm = int(default_netvm) \
|
||||
if default_netvm != "None" else None
|
||||
|
||||
default_fw_netvm = element.get("default_fw_netvm")
|
||||
if default_fw_netvm is not None:
|
||||
self.default_fw_netvm = int(default_fw_netvm) \
|
||||
if default_fw_netvm != "None" else None
|
||||
|
||||
updatevm = element.get("updatevm")
|
||||
if updatevm is not None:
|
||||
self.updatevm = int(updatevm) \
|
||||
if updatevm != "None" else None
|
||||
|
||||
clockvm = element.get("clockvm")
|
||||
if clockvm is not None:
|
||||
self.clockvm = int(clockvm) \
|
||||
if clockvm != "None" else None
|
||||
|
||||
self.default_kernel = element.get("default_kernel")
|
||||
|
||||
def set_netvm_dependency(self, element):
|
||||
kwargs = {}
|
||||
attr_list = ("qid", "uses_default_netvm", "netvm_qid")
|
||||
|
||||
for attribute in attr_list:
|
||||
kwargs[attribute] = element.get(attribute)
|
||||
|
||||
vm = self.domains[int(kwargs["qid"])]
|
||||
|
||||
if element.get("uses_default_netvm") is None:
|
||||
uses_default_netvm = True
|
||||
else:
|
||||
uses_default_netvm = (
|
||||
True if element.get("uses_default_netvm") == "True" else False)
|
||||
if not uses_default_netvm:
|
||||
netvm_qid = element.get("netvm_qid")
|
||||
if netvm_qid is None or netvm_qid == "none":
|
||||
vm.netvm = None
|
||||
else:
|
||||
vm.netvm = int(netvm_qid)
|
||||
|
||||
# TODO: dispvm_netvm
|
||||
|
||||
def load(self):
|
||||
qubes_store_file = open(self._store, 'r')
|
||||
|
||||
try:
|
||||
qubes_store_file.seek(0)
|
||||
tree = lxml.etree.parse(qubes_store_file)
|
||||
except (EnvironmentError,
|
||||
xml.parsers.expat.ExpatError) as err:
|
||||
self.log.error(err)
|
||||
return False
|
||||
|
||||
self.labels = {
|
||||
1: qubes.Label(1, '0xcc0000', 'red'),
|
||||
2: qubes.Label(2, '0xf57900', 'orange'),
|
||||
3: qubes.Label(3, '0xedd400', 'yellow'),
|
||||
4: qubes.Label(4, '0x73d216', 'green'),
|
||||
5: qubes.Label(5, '0x555753', 'gray'),
|
||||
6: qubes.Label(6, '0x3465a4', 'blue'),
|
||||
7: qubes.Label(7, '0x75507b', 'purple'),
|
||||
8: qubes.Label(8, '0x000000', 'black'),
|
||||
}
|
||||
|
||||
self.domains.add(qubes.vm.adminvm.AdminVM(
|
||||
self, None, qid=0, name='dom0'))
|
||||
|
||||
vm_classes = ["TemplateVm", "TemplateHVm",
|
||||
"AppVm", "HVm", "NetVm", "ProxyVm"]
|
||||
for (vm_class_name) in vm_classes:
|
||||
vms_of_class = tree.findall("Qubes" + vm_class_name)
|
||||
# first non-template based, then template based
|
||||
sorted_vms_of_class = sorted(vms_of_class,
|
||||
key=lambda x: str(x.get('template_qid')).lower() != "none")
|
||||
for element in sorted_vms_of_class:
|
||||
try:
|
||||
kwargs = {}
|
||||
if vm_class_name in ["TemplateVm", "TemplateHVm"]:
|
||||
vm_class = qubes.vm.templatevm.TemplateVM
|
||||
elif element.get('template_qid').lower() == "none":
|
||||
kwargs['dir_path'] = element.get('dir_path')
|
||||
vm_class = StandaloneVM
|
||||
else:
|
||||
kwargs['dir_path'] = element.get('dir_path')
|
||||
kwargs['template'] = int(element.get('template_qid'))
|
||||
vm_class = AppVM
|
||||
# simple attributes
|
||||
for attr in ['installed_by_rpm', 'include_in_backups',
|
||||
'qrexec_timeout', 'internal', 'label', 'name',
|
||||
'vcpus', 'memory', 'maxmem', 'default_user',
|
||||
'debug', 'pci_strictreset', 'mac', 'autostart',
|
||||
'backup_content', 'backup_path', 'backup_size']:
|
||||
value = element.get(attr)
|
||||
if value:
|
||||
kwargs[attr] = value
|
||||
# attributes with default value
|
||||
for attr in ["kernel", "kernelopts"]:
|
||||
value = element.get(attr)
|
||||
if value and value.lower() == "none":
|
||||
value = None
|
||||
value_is_default = element.get(
|
||||
"uses_default_{}".format(attr))
|
||||
if value_is_default and value_is_default.lower() != \
|
||||
"true":
|
||||
kwargs[attr] = value
|
||||
kwargs['hvm'] = "HVm" in vm_class_name
|
||||
vm = self.add_new_vm(vm_class,
|
||||
qid=int(element.get('qid')), **kwargs)
|
||||
services = element.get('services')
|
||||
if services:
|
||||
services = eval(services)
|
||||
else:
|
||||
services = {}
|
||||
for service, value in services.iteritems():
|
||||
feature = service
|
||||
for repl_feature, repl_service in \
|
||||
qubes.ext.r3compatibility.\
|
||||
R3Compatibility.features_to_services.\
|
||||
iteritems():
|
||||
if repl_service == service:
|
||||
feature = repl_feature
|
||||
vm.features[feature] = value
|
||||
pcidevs = element.get('pcidevs')
|
||||
if pcidevs:
|
||||
pcidevs = eval(pcidevs)
|
||||
for pcidev in pcidevs:
|
||||
try:
|
||||
vm.devices["pci"].attach(pcidev)
|
||||
except qubes.exc.QubesException as e:
|
||||
self.log.error("VM {}: {}".format(vm.name, str(e)))
|
||||
except (ValueError, LookupError) as err:
|
||||
self.log.error("import error ({1}): {2}".format(
|
||||
vm_class_name, err))
|
||||
if 'vm' in locals():
|
||||
del self.domains[vm]
|
||||
|
||||
# After importing all VMs, set netvm references, in the same order
|
||||
for vm_class_name in vm_classes:
|
||||
for element in tree.findall("Qubes" + vm_class_name):
|
||||
try:
|
||||
self.set_netvm_dependency(element)
|
||||
except (ValueError, LookupError) as err:
|
||||
self.log.error("VM {}: failed to set netvm dependency: {}".
|
||||
format(element.get('name'), err))
|
||||
|
||||
self.load_globals(tree.getroot())
|
||||
|
||||
def save(self):
|
||||
raise NotImplementedError("Saving old qubes.xml not supported")
|
||||
@ -203,6 +203,7 @@ fi
|
||||
%{python_sitelib}/qubes/__init__.py*
|
||||
%{python_sitelib}/qubes/backup.py*
|
||||
%{python_sitelib}/qubes/config.py*
|
||||
%{python_sitelib}/qubes/core2migration.py*
|
||||
%{python_sitelib}/qubes/devices.py*
|
||||
%{python_sitelib}/qubes/dochelpers.py*
|
||||
%{python_sitelib}/qubes/events.py*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user