Merge lp:~chipaca/snap-confine/mktmpdir into lp:~snappy-dev/snap-confine/trunk

[John Lenton]

Make a best-effort attempt at creating the old TMPDIR.

[Michael Vogt (mvo)]

This looks good, thanks!

review: Approve

=== modified file 'src/main.c'
--- src/main.c	2015-05-22 09:39:09 +0000
+++ src/main.c	2015-05-22 09:39:09 +0000
@@ -232,6 +232,32 @@
     }
 }
 
+// best-effort attempt at creating the old /tmp/snaps/* TMPDIR.
+void mkoldtmpdir() {
+    char *dir = getenv("TMPDIR");
+    if (!dir || !*dir) {
+        // TMPDIR not set, or empty
+        return;
+    }
+
+    if (strncmp(dir, "/tmp/snaps/", strlen("/tmp/snaps/")) != 0) {
+        // TMPDIR is not /tmp/snaps/*
+        return;
+    }
+
+    int n = 4;
+    char buf[MAX_BUF] = "/tmp";
+    char *d = strtok(dir+4, "/");
+    while (d) {
+        n += must_snprintf(buf+n, MAX_BUF-n, "/%s", d);
+        if (mkdir(buf, 01777) < 0) {
+            return;
+        }
+
+        d = strtok(NULL, "/");
+    }
+}
+
 int main(int argc, char **argv)
 {
    const int NR_ARGS = 3;
@@ -286,9 +312,11 @@
           die("dropping privs did not work");
     }
 
-   //https://wiki.ubuntu.com/SecurityTeam/Specifications/SnappyConfinement#ubuntu-snapp-launch
-
-   int rc = 0;
+    mkoldtmpdir();
+
+    //https://wiki.ubuntu.com/SecurityTeam/Specifications/SnappyConfinement#ubuntu-snapp-launch
+
+    int rc = 0;
     // set apparmor rules
     rc = aa_change_onexec(aa_profile);
     if (rc != 0) {