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

qrexec: add service argument support

Browse Source 
Fixes QubesOS/qubes-issues#1876
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-27 04:30:44 +02:00
parent da2a4911a3
commit 6e8f0e1a61
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qrexec/qubes-rpc-multiplexer
View File

@ -22,19 +22,26 @@ if ! [ $# = 2 ] ; then
exit 1 exit 1
fi fi
export QREXEC_REMOTE_DOMAIN="$2" export QREXEC_REMOTE_DOMAIN="$2"
export QREXEC_SERVICE_FULL_NAME="$1"
SERVICE_WITHOUT_ARGUMENT="${1%%+*}"
if [ "${QREXEC_SERVICE_FULL_NAME}" != "${SERVICE_WITHOUT_ARGUMENT}" ]; then
export QREXEC_SERVICE_ARGUMENT="${QREXEC_SERVICE_FULL_NAME#*+}"
fi
for CFG_FILE in $LOCAL_QUBES_RPC/"$1" $QUBES_RPC/"$1"; do for CFG_FILE in $LOCAL_QUBES_RPC/"$1" $QUBES_RPC/"$1" \
$LOCAL_QUBES_RPC/"${SERVICE_WITHOUT_ARGUMENT}" \
$QUBES_RPC/"${SERVICE_WITHOUT_ARGUMENT}"; do
if [ -s "$CFG_FILE" ]; then if [ -s "$CFG_FILE" ]; then
break break
fi fi
done done
if [ -x "$CFG_FILE" ] ; then if [ -x "$CFG_FILE" ] ; then
exec "$CFG_FILE" exec "$CFG_FILE" ${QREXEC_SERVICE_ARGUMENT}
echo "$0: failed to execute handler for" "$1" >&2 echo "$0: failed to execute handler for" "$1" >&2
exit 1 exit 1
else else
exec /bin/sh "$CFG_FILE" exec /bin/sh -- "$CFG_FILE" ${QREXEC_SERVICE_ARGUMENT}
echo "$0: failed to execute handler for" "$1" >&2 echo "$0: failed to execute handler for" "$1" >&2
exit 1 exit 1
fi fi