QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-rpc: log (local) service output to syslog, discard stderr from VMs (#842)

Browse Source 
Basically - store the logs where the service is running.
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-05 05:27:08 +02:00
parent c103f3713c
commit 9de6171a43
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qrexec/qrexec-policy
View File

@ -122,6 +122,9 @@ def do_execute(domain, target, user, exec_index, process_ident):
spawn_target_if_necessary(target) spawn_target_if_necessary(target)
cmd= QREXEC_CLIENT + " -d " + target + " '" + user cmd= QREXEC_CLIENT + " -d " + target + " '" + user
cmd+=":QUBESRPC "+ exec_index + " " + domain + "'" cmd+=":QUBESRPC "+ exec_index + " " + domain + "'"
# stderr should be logged in source/target VM
null = open(os.devnull, 'w')
os.dup2(null.fileno(), 2)
os.execl(QREXEC_CLIENT, "qrexec-client", "-d", domain, "-l", cmd, "-c", process_ident) os.execl(QREXEC_CLIENT, "qrexec-client", "-d", domain, "-l", cmd, "-c", process_ident)
def confirm_execution(domain, target, exec_index): def confirm_execution(domain, target, exec_index):

6
qrexec/qubes-rpc-multiplexer
View File

@ -1,4 +1,10 @@
#!/bin/sh #!/bin/sh
mkfifo /tmp/qrexec-rpc-stderr.$$
logger -t "$1-$2" -f /tmp/qrexec-rpc-stderr.$$ &
exec 2>/tmp/qrexec-rpc-stderr.$$
rm -f /tmp/qrexec-rpc-stderr.$$
QUBES_RPC=/etc/qubes-rpc QUBES_RPC=/etc/qubes-rpc
# XXX: Backward compatibility # XXX: Backward compatibility
DEPRECATED_QUBES_RPC=/etc/qubes_rpc DEPRECATED_QUBES_RPC=/etc/qubes_rpc