From e28907aeacb0f2d9d0ec65e65593231a91e756a6 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 17 May 2018 13:38:43 +0200
Subject: [PATCH] install: Always use bare-user-only repos for child repos

This way everything works with /var/tmp on tmpfs or other non-xattr system
by default. The reason we used to use bare-user for the child repo is that bare-user-only
can't represent all possible ostree repos. For instance a file non-canonical permissions
such as "readable by user but not other/group" cannot be stored. Reading back such a file
when commiting to the real repo would give you a repo-corrupt error.

However, its been a long time since we made flatpak always generate canonical permissions
for all exports, so at this point I think its safe to switch this over by default.

This also fixes https://github.com/flatpak/flatpak/issues/1622

Closes: #1686
Approved by: alexlarsson
---
 common/flatpak-dir.c | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index a6c86dcc..34138e12 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -950,14 +950,6 @@ flatpak_ensure_system_user_cache_dir_location (GError **error)
       return NULL;
     }
 
-  if (setxattr (path, "user.test", "novalue", strlen ("novalue"), 0) < 0 &&
-      (errno == ENOTSUP || errno == EOPNOTSUPP))
-    {
-      flatpak_fail (error,
-                    _("/var/tmp does not suport xattrs which is needed for system-wide installation as a user. FLATPAK_SYSTEM_CACHE_DIR can be used to set an alternative path."));
-      return NULL;
-    }
-
   unlink (symlink_path);
   if (symlink (path, symlink_path) != 0)
     {
@@ -1909,13 +1901,9 @@ _flatpak_dir_ensure_repo (FlatpakDir   *self,
 
       if (!g_file_query_exists (repodir, cancellable))
         {
+          /* We always use bare-user-only these days, except old installations
+             that still user bare-user */
           OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
-          const char *mode_env = g_getenv ("FLATPAK_OSTREE_REPO_MODE");
-
-          if (g_strcmp0 (mode_env, "user-only") == 0)
-            mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
-          if (g_strcmp0 (mode_env, "user") == 0)
-            mode = OSTREE_REPO_MODE_BARE_USER;
 
           if (!ostree_repo_create (repo, mode, cancellable, &my_error))
             {
@@ -6385,13 +6373,20 @@ flatpak_dir_create_system_child_repo (FlatpakDir   *self,
   g_autofree char *tmpdir_name = NULL;
   g_autoptr(OstreeRepo) new_repo = NULL;
   g_autoptr(GKeyFile) config = NULL;
-  OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER;
-  const char *mode_str = "bare-user";
   g_autofree char *current_mode = NULL;
-  const char *mode_env = g_getenv ("FLATPAK_OSTREE_REPO_MODE");
   GKeyFile *orig_config = NULL;
   g_autofree char *orig_min_free_space_percent = NULL;
 
+  /* We use bare-user-only here now, which means we don't need xattrs
+   * for the child repo. This only works as long as the pulled repo
+   * is valid in a bare-user-only repo, i.e. doesn't have xattrs or
+   * weird permissions, because then the pull into the system repo
+   * would complain that the checksum was wrong. However, by now all
+   * flatpak builds are likely to be valid, so this is fine.
+   */
+  OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
+  const char *mode_str = "bare-user-only";
+
   g_assert (!self->user);
 
   if (!flatpak_dir_ensure_repo (self, NULL, error))
@@ -6416,12 +6411,6 @@ flatpak_dir_create_system_child_repo (FlatpakDir   *self,
 
   new_repo = ostree_repo_new (repo_dir);
 
-  /* Allow to override the mode when user-only is needed (e.g. live systems) */
-  if (g_strcmp0 (mode_env, "user-only") == 0) {
-    mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
-    mode_str = "bare-user-only";
-  }
-
   repo_dir_config = g_file_get_child (repo_dir, "config");
   if (!g_file_query_exists (repo_dir_config, NULL))
     {