Skip to content

Commit

Permalink
qrexec: add service argument support
Browse files Browse the repository at this point in the history
Fixes QubesOS/qubes-issues#1876

Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
  • Loading branch information
marmarek committed May 19, 2016
1 parent 59193c0 commit d20efc2
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions qrexec/qubes-rpc-multiplexer
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,26 @@ if ! [ $# = 2 ] ; then
exit 1
fi
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
break
fi
done

if [ -x "$CFG_FILE" ] ; then
exec "$CFG_FILE"
exec "$CFG_FILE" ${QREXEC_SERVICE_ARGUMENT}
echo "$0: failed to execute handler for" "$1" >&2
exit 1
else
exec /bin/sh "$CFG_FILE"
exec /bin/sh -- "$CFG_FILE" ${QREXEC_SERVICE_ARGUMENT}
echo "$0: failed to execute handler for" "$1" >&2
exit 1
fi

0 comments on commit d20efc2

Please sign in to comment.