mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 22:35:35 +00:00
Code Issues Releases Wiki Activity

remove and add some comments

Browse Source
This commit is contained in:
Jamie Strandboge
2012-08-23 20:25:29 -05:00
parent 51256d8fe7
commit c0821032fb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/apparmor/sandbox.py
View File

@@ -101,8 +101,8 @@ def aa_exec(command, opt):
tmp.write(bytes(policy, 'utf-8')) tmp.write(bytes(policy, 'utf-8'))
else: else:
tmp.write(policy) tmp.write(policy)
tmp.flush() tmp.flush()
debug("using '%s' template" % opt.template) debug("using '%s' template" % opt.template)
rc, report = cmd(['sudo', 'apparmor_parser', '-r', tmp.name]) rc, report = cmd(['sudo', 'apparmor_parser', '-r', tmp.name])
if rc != 0: if rc != 0:
@@ -229,16 +229,15 @@ class SandboxXpra(SandboxXserver):
listener_x = os.fork() listener_x = os.fork()
if listener_x == 0: if listener_x == 0:
x_args = ['--no-daemon', x_args = ['--no-daemon',
#'--no-mmap', # for security?
'--no-clipboard', '--no-clipboard',
'--no-pulseaudio'] '--no-pulseaudio']
# TODO: --password-file
args = ['/usr/bin/xpra', 'start', self.display] + x_args args = ['/usr/bin/xpra', 'start', self.display] + x_args
debug(" ".join(args)) debug(" ".join(args))
sys.stderr.flush() sys.stderr.flush()
os.execv(args[0], args) os.execv(args[0], args)
sys.exit(0) sys.exit(0)
self.pids.append(listener_x) self.pids.append(listener_x)
time.sleep(2) # FIXME: detect if running time.sleep(2) # FIXME: detect if running
# Next, attach to xpra # Next, attach to xpra
@@ -246,9 +245,8 @@ class SandboxXpra(SandboxXserver):
os.chdir(os.environ["HOME"]) os.chdir(os.environ["HOME"])
listener_attach = os.fork() listener_attach = os.fork()
if listener_attach == 0: if listener_attach == 0:
# TODO: --pasword-file
args = ['/usr/bin/xpra', 'attach', self.display, args = ['/usr/bin/xpra', 'attach', self.display,
'--title=%s' % self.title] '--title=%s' % self.title]
debug(" ".join(args)) debug(" ".join(args))
sys.stderr.flush() sys.stderr.flush()
os.execv(args[0], args) os.execv(args[0], args)