Merge lp:~ted/unity-greeter-session-broadcast/check-sender into lp:unity-greeter-session-broadcast/13.10

[Ted Gould]

Get name owner and make sure it matches the sender.

Upstart won't allow for putting the name of the sender in v1 of the dbus stuff. Let's do it ourselves.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-session-broadcast-ci/2/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

You should add libglib2.0-bin to the Depends for the package, eh?

[lp:~ted/unity-greeter-session-broadcast/check-sender]

18. By Ted Gould on 2013-08-28

Add libglib2.0-bin to get gdbus

[Ted Gould (ted)]

On Tue, 2013-08-27 at 23:52 +0000, Michael Terry wrote:

> You should add libglib2.0-bin to the Depends for the package, eh?

Good catch. Fixed r18.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-saucy-amd64-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-session-broadcast-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/unity-greeter-session-broadcast/check-sender]

19. By Ted Gould on 2013-08-28

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-saucy-amd64-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-session-broadcast-ci/6/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Testing this, I can't get the upstart file to kick off... I have upstart daily ppa installed, I'm sending out the signal... But the pre-start script doesn't happen. Am I missing a step?

[Michael Terry (mterry)]

With latest upstart, this still doesn't seem to work.

[lp:~ted/unity-greeter-session-broadcast/check-sender]

20. By Ted Gould on 2013-08-30

Update to trunk

21. By Ted Gould on 2013-08-30

Move the user into the script and handle the lack of PATH

22. By Ted Gould on 2013-08-30

Handy little script

23. By Ted Gould on 2013-08-30

Install as a system bus service

24. By Ted Gould on 2013-08-30

Add a user so we can do system activation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-saucy-amd64-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-session-broadcast-ci/9/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Should also change this to be system-services:
   set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")

Otherwise looks great, and WFM. Thanks for fixing dbus autostarting.

review: Needs Fixing

[lp:~ted/unity-greeter-session-broadcast/check-sender]

25. By Ted Gould on 2013-08-30

Making sure the local install directory is correct

[Michael Terry (mterry)]

Awesome!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-28 16:37:47 +0000
+++ CMakeLists.txt	2013-08-30 19:43:43 +0000
@@ -40,11 +40,11 @@
 include_directories(${GIO_UNIX2_INCLUDE_DIRS})
 
 if(${LOCAL_INSTALL})
-  set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")
+  set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/")
 else()
-  EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable session_bus_services_dir OUTPUT_VARIABLE DBUSSERVICEDIR )
+  EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable system_bus_services_dir OUTPUT_VARIABLE DBUSSERVICEDIR )
 endif()
-message("Installing DBus services to ${DBUSSERVICEDIR}")
+message("Installing DBus system services to ${DBUSSERVICEDIR}")
 
 if(${LOCAL_INSTALL})
   set(DBUSSYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}")

=== modified file 'data/com.canonical.Unity.Greeter.Broadcast.service.in'
--- data/com.canonical.Unity.Greeter.Broadcast.service.in	2013-06-26 21:25:55 +0000
+++ data/com.canonical.Unity.Greeter.Broadcast.service.in	2013-08-30 19:43:43 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Greeter.Broadcast
 Exec=@pkglibexecdir@/unity-greeter-session-broadcast-service
+User=root

=== modified file 'data/unity-greeter-session-broadcast-session.conf'
--- data/unity-greeter-session-broadcast-session.conf	2013-06-28 20:55:05 +0000
+++ data/unity-greeter-session-broadcast-session.conf	2013-08-30 19:43:43 +0000
@@ -6,6 +6,30 @@
 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}
-
-exec initctl emit application-start APP_ID=${ARG1}
+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
+		stop
+		exit 1
+	fi
+	if [ $OWNER != $SENDER ] ; then
+		stop
+		exit 1
+	fi
+end script
+
+exec /sbin/initctl emit application-start APP_ID=${ARG1}

=== modified file 'debian/control'
--- debian/control	2013-07-09 19:31:17 +0000
+++ debian/control	2013-08-30 19:43:43 +0000
@@ -10,6 +10,7 @@
                intltool,
                libdbus-1-dev,
                libdbustest1-dev,
+               libglib2.0-bin,
                python3-dbusmock,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/unity-greeter-session-broadcast

=== added file 'test-call.sh'
--- test-call.sh	1970-01-01 00:00:00 +0000
+++ test-call.sh	2013-08-30 19:43:43 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gdbus call --system --dest com.canonical.Unity.Greeter.Broadcast --object-path /com/canonical/Unity/Greeter/Broadcast --method com.canonical.Unity.Greeter.Broadcast.RequestApplicationStart $1 $2