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

tests: adjust SystemTestCase.create_remote_file to create executables

Browse Source 
The main use case for this function is to create qrexec services in VMs.
Since qrexec now require service scripts to be executable, make
create_remote_file() adjust permissions.
This commit is contained in:
Marek Marczykowski-Górecki 2020-02-24 02:51:55 +01:00
parent 27e8d9ef4d
commit 3ce4e5eaa5
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/tests/__init__.py
View File

@ -1260,9 +1260,9 @@ class SystemTestCase(QubesTestCase):
file.write(content) file.write(content)
self.addCleanup(os.unlink, filename) self.addCleanup(os.unlink, filename)
def create_remote_file(self, vm, filename, content): def create_remote_file(self, vm, filename, content, mode=0o755):
self.loop.run_until_complete(vm.run_for_stdio( self.loop.run_until_complete(vm.run_for_stdio(
'cat > {}'.format(shlex.quote(filename)), 'cat > {0}; chmod {1:o} {0}'.format(shlex.quote(filename), mode),
user='root', input=content.encode('utf-8'))) user='root', input=content.encode('utf-8')))
@asyncio.coroutine @asyncio.coroutine

7
qubes/tests/integ/vm_qrexec_gui.py
View File

@ -239,10 +239,9 @@ class TC_00_AppVMMixin(object):
self.loop.run_until_complete(asyncio.wait([ self.loop.run_until_complete(asyncio.wait([
self.wait_for_session(self.testvm1), self.wait_for_session(self.testvm1),
self.wait_for_session(self.testvm2)])) self.wait_for_session(self.testvm2)]))
self.loop.run_until_complete(self.testvm2.run_for_stdio( self.create_remote_file(self.testvm2,
'cat > /etc/qubes-rpc/test.EOF', '/etc/qubes-rpc/test.EOF',
user='root', '#!/bin/sh\n/bin/cat\n')
input=b'/bin/cat'))
with self.qrexec_policy('test.EOF', self.testvm1, self.testvm2): with self.qrexec_policy('test.EOF', self.testvm1, self.testvm2):
try: try: