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

backup: improve error reporting about passphrase retrieval

Browse Source 
QubesOS/qubes-issues#2931
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-29 04:41:38 +02:00
parent bde8d45cca
commit 27ce27b6e9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/api/admin.py
View File

@ -27,6 +27,7 @@ import functools
import itertools import itertools
import os import os
import string import string
import subprocess
import libvirt import libvirt
import pkg_resources import pkg_resources
@ -1146,8 +1147,16 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
except KeyError: except KeyError:
raise qubes.exc.QubesException( raise qubes.exc.QubesException(
'Invalid backup profile - invalid passphrase_vm') 'Invalid backup profile - invalid passphrase_vm')
passphrase, _ = yield from passphrase_vm.run_service_for_stdio( try:
'qubes.BackupPassphrase+' + self.arg) passphrase, _ = yield from passphrase_vm.run_service_for_stdio(
'qubes.BackupPassphrase+' + self.arg)
# make it foolproof against "echo passphrase" implementation
passphrase = passphrase.strip()
assert b'\n' not in passphrase
except subprocess.CalledProcessError:
raise qubes.exc.QubesException(
'Failed to retrieve passphrase from \'{}\' VM'.format(
passphrase_vm_name))
else: else:
raise qubes.exc.QubesException( raise qubes.exc.QubesException(
'Invalid backup profile - you need to ' 'Invalid backup profile - you need to '