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

qfilexchgd fixes

Browse Source 
kill dvm after is has sent an answer
set transaction_seq to 0 for normal transfers
qfilexchgd mode:=755
This commit is contained in:
Rafal Wojtczuk 2010-06-29 12:37:58 +02:00 committed by Joanna Rutkowska
parent 0dbef3f2ae
commit c05911a01e
1 changed files with 4 additions and 0 deletions

4
dom0/pendrive_swapper/qfilexchgd
View File

@ -22,6 +22,7 @@
import xen.lowlevel.xs import xen.lowlevel.xs
import os import os
import os.path
import sys import sys
import subprocess import subprocess
import daemon import daemon
@ -161,6 +162,7 @@ class DomainState:
logproc('sender ' + self.name + ' receiver ' + target.name + ' : allowed attributes mismatch, denied') logproc('sender ' + self.name + ' receiver ' + target.name + ' : allowed attributes mismatch, denied')
return False return False
else: else:
transaction_seq = '0'
retcode = subprocess.call(['/usr/bin/kdialog', '--yesno', 'Do you authorize pendrive transfer from ' + self.name + ' to ' + vmname + '?' , '--title', 'Security confirmation']) retcode = subprocess.call(['/usr/bin/kdialog', '--yesno', 'Do you authorize pendrive transfer from ' + self.name + ' to ' + vmname + '?' , '--title', 'Security confirmation'])
logproc('handle_transfer: kdialog retcode=' + str(retcode)) logproc('handle_transfer: kdialog retcode=' + str(retcode))
if retcode != 0: if retcode != 0:
@ -170,6 +172,8 @@ class DomainState:
target.rcv_seq = self.send_seq target.rcv_seq = self.send_seq
self.send_seq = None self.send_seq = None
logproc( 'set state of ' + target.domain_id + ' to has_loaded_pendrive, retcode=' + str(retcode)) logproc( 'set state of ' + target.domain_id + ' to has_loaded_pendrive, retcode=' + str(retcode))
if self.allowed_seq is not None and not os.path.isfile('/etc/debug-dvm'):
subprocess.call(['/usr/sbin/xm', 'destroy', self.domain_id])
return True return True
def handle_transfer_disposable(self, transaction_seq): def handle_transfer_disposable(self, transaction_seq):