Merge lp:~mvo/ubuntu-core-security/private-tmpdir-update into lp:~ubuntu-security/ubuntu-core-security/trunk

[Michael Vogt]

This is the companion branch for
  lp:~mvo/ubuntu-core-launcher/tmpdir-simplify-lp1462916
If we create a fully private /tmp via the ubuntu-core-launcher
we can update the apparmor policy so that its ok to write to /tmp

[Tyler Hicks (tyhicks)]

Looks good to me.

review: Approve

[Jamie Strandboge (jdstrand)]

I'm going to change this just a bit to be more explicit in the comment, add read on /tmp/ and not require owner for /tmp/**. Nothing needs to be done here.

review: Approve

=== modified file 'data/apparmor/templates/ubuntu-core/15.04/default'
--- data/apparmor/templates/ubuntu-core/15.04/default	2015-05-21 15:05:11 +0000
+++ data/apparmor/templates/ubuntu-core/15.04/default	2015-06-08 14:18:06 +0000
@@ -169,12 +169,9 @@
   /var/lib/apps/@{APP_PKGNAME}/@{APP_VERSION}/   w,
   /var/lib/apps/@{APP_PKGNAME}/@{APP_VERSION}/** wl,
 
-  # Writable temp area only for this version (launcher will create this
-  # directory on our behalf so only allow readonly on parent).
-  /tmp/snaps/@{APP_PKGNAME}/                  r,
-  /tmp/snaps/@{APP_PKGNAME}/**                rk,
-  /tmp/snaps/@{APP_PKGNAME}/@{APP_VERSION}/   rw,
-  /tmp/snaps/@{APP_PKGNAME}/@{APP_VERSION}/** mrwlkix,
+  # The ubuntu-core-launcher creates a private restricted /tmp just for
+  # this instance
+  owner /tmp/** mrwlkix,
 
   # Also do the same for shm
   /{dev,run}/shm/snaps/@{APP_PKGNAME}/                  r,

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-29 17:01:21 +0000
+++ debian/changelog	2015-06-08 14:18:06 +0000
@@ -1,3 +1,10 @@
+ubuntu-core-security (15.10.3) UNRELEASED; urgency=low
+
+  * allow /tmp access now that the ubuntu-core-launcher creates
+    a private /tmp for each snap
+
+ -- Michael Vogt <[e-mail]>  Mon, 08 Jun 2015 16:15:17 +0200
+
 ubuntu-core-security (15.10.2) wily; urgency=medium
 
   * seccomp/default: allow setpgid and setpgrp (they are commonly used and