Merge lp:~mandel/ubuntu-touch-session/pulse-trust-store into lp:ubuntu-touch-session

[Manuel de la Peña]

* Add upstart job for trust-store for camera service
* Add upstart job for trust-store for pulseaudio
* Load trust-store module for pulseaudio

* Add upstart job for trust-store for camera service
* Add upstart job for trust-store for pulseaudio
* Load trust-store module for pulseaudio

[lp:~mandel/ubuntu-touch-session/pulse-trust-store]

279. By Manuel de la Peña on 2015-08-25

Tabs vs spaces.

[Ken VanDine (ken-vandine)]

Please drop the debian/changelog entry, we can't build it in the silo like this.

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-03 13:33:43 +0000
+++ debian/changelog	2015-08-25 11:13:15 +0000
@@ -1,3 +1,11 @@
+ubuntu-touch-session (0.108+15.10.20150807-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add upstart job for trust-store for camera service
+  * Add upstart job for trust-store for pulseaudio
+  * Load trust-store module for pulseaudio
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 07 Aug 2015 17:23:11 +0200
+
 ubuntu-touch-session (0.108+15.10.20150803-0ubuntu1) wily; urgency=medium
 
   [ Tiago Salem Herrmann ]

=== modified file 'touch.pa'
--- touch.pa	2015-03-31 02:49:56 +0000
+++ touch.pa	2015-08-25 11:13:15 +0000
@@ -42,6 +42,11 @@
 load-module module-droid-card voice_virtual_stream=true
 .endif
 
+### Automatically load the trust-store module
+.ifexists module-trust-store.so
+load-module module-trust-store
+.endif
+
 ### Fake sink and source used by HSP
 load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
 load-module module-null-source source_name=source.fake.sco rate=8000 channels=1

=== added file 'upstart-session/cameraservice-trust-stored.conf'
--- upstart-session/cameraservice-trust-stored.conf	1970-01-01 00:00:00 +0000
+++ upstart-session/cameraservice-trust-stored.conf	2015-08-25 11:13:15 +0000
@@ -0,0 +1,33 @@
+description "CameraService Trust Store Daemon"
+
+start on started dbus and xsession SESSION=ubuntu-touch
+stop on runlevel [06]
+
+respawn
+
+script
+    timeout=800
+    service_socket=/dev/socket/camera_service/camera_service_to_trust
+    # loop and then exit, if camera service isnt up after 80 sec
+    # it is likely not starting at all (or not there)
+    while [ ! -e $service_socket ]; do
+        sleep 0.1
+        if [ "$timeout" -le 0 ]; then
+            stop; exit 0
+        fi
+        timeout=$(($timeout - 1))
+    done
+
+    # Extra security to make sure the service is bound to the sockec
+    # TODO check if needed by inspection of trust store library / camera service
+    sleep 1
+
+    exec /usr/bin/trust-stored-skeleton \
+        --remote-agent UnixDomainSocketRemoteAgent --endpoint=$service_socket \
+        --local-agent MirAgent \
+        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
+        --for-service CameraService \
+        --with-text-domain CameraService \
+        --store-bus session \
+        --disable-whitelisting=yes
+end script

=== added file 'upstart-session/pulseaudio-trust-stored.conf'
--- upstart-session/pulseaudio-trust-stored.conf	1970-01-01 00:00:00 +0000
+++ upstart-session/pulseaudio-trust-stored.conf	2015-08-25 11:13:15 +0000
@@ -0,0 +1,21 @@
+description "Pulseaudio Trust Store Daemon"
+
+start on started pulseaudio
+stop on stopped pulseaudio
+
+respawn
+
+script
+    # Extra security until trust-stored handles DBus name owner changes
+    # for the service
+    sleep 2
+
+    exec /usr/bin/trust-stored-skeleton \
+        --remote-agent DBusRemoteAgent --bus=session \
+        --local-agent MirAgent \
+        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
+        --for-service PulseAudio \
+        --with-text-domain PulseAudio \
+        --store-bus session \
+        --disable-whitelisting=yes
+end script