From a87d8a81765ec52b2c31a560d4ee903695eaf961 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Aug 2013 10:45:39 -0500 Subject: Check the sender by asking who owns the name --- data/unity-greeter-session-broadcast-session.conf | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'data/unity-greeter-session-broadcast-session.conf') diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf index 0e92905..fa1c430 100644 --- a/data/unity-greeter-session-broadcast-session.conf +++ b/data/unity-greeter-session-broadcast-session.conf @@ -6,6 +6,20 @@ task emits application-start #TODO: Check GSettings Key -start on dbus-system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" SENDER="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast" ARG0=${USER} +start on dbus-system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast" ARG0=${USER} + +pre-start script + OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner com.canonical.Unity.Greeter.Broadcast | cut -d "'" -f 2` + + if [ -z $OWNER ] ; then + stop + exit 1 + fi + if [ $OWNER -ne $SENDER ] ; then + stop + exit 1 + fi +end script + exec initctl emit application-start APP_ID=${ARG1} -- cgit v1.2.3 From ca03238ba1b189391ffdd7de4b7a15d4a3e7711a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Aug 2013 10:51:09 -0500 Subject: Go for string comparison --- data/unity-greeter-session-broadcast-session.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/unity-greeter-session-broadcast-session.conf') diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf index fa1c430..a5b744c 100644 --- a/data/unity-greeter-session-broadcast-session.conf +++ b/data/unity-greeter-session-broadcast-session.conf @@ -15,7 +15,7 @@ pre-start script stop exit 1 fi - if [ $OWNER -ne $SENDER ] ; then + if [ $OWNER != $SENDER ] ; then stop exit 1 fi -- cgit v1.2.3 From 6646f8c2a62d8ff7bac22dddb2ccaa4e2b5a2f05 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 30 Aug 2013 14:08:04 -0500 Subject: Move the user into the script and handle the lack of PATH --- data/unity-greeter-session-broadcast-session.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'data/unity-greeter-session-broadcast-session.conf') diff --git a/data/unity-greeter-session-broadcast-session.conf b/data/unity-greeter-session-broadcast-session.conf index a5b744c..db2425c 100644 --- a/data/unity-greeter-session-broadcast-session.conf +++ b/data/unity-greeter-session-broadcast-session.conf @@ -6,9 +6,20 @@ task emits application-start #TODO: Check GSettings Key -start on dbus-system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast" ARG0=${USER} +start on dbus BUS=system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" PATH="/com/canonical/Unity/Greeter/Broadcast" pre-start script + PATH="/bin:/usr/bin:/sbin:/usr/sbin" + + if [ -z $ARG0 ] ; then + stop + exit 1 + fi + if [ $ARG0 != $USER ] ; then + stop + exit 1 + fi + OWNER=`gdbus call --system --dest org.freedesktop.DBus --object-path / --method org.freedesktop.DBus.GetNameOwner com.canonical.Unity.Greeter.Broadcast | cut -d "'" -f 2` if [ -z $OWNER ] ; then @@ -21,5 +32,4 @@ pre-start script fi end script - -exec initctl emit application-start APP_ID=${ARG1} +exec /sbin/initctl emit application-start APP_ID=${ARG1} -- cgit v1.2.3