From db67edcc988bd0ceebabd70dfc2e33428f01d0d5 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 19 Aug 2016 10:45:16 +0200
Subject: [PATCH] Fix validation of service files

We need to rewrite /app absolute paths just like we do for
desktop files.
---
 app/flatpak-builtins-build-export.c | 39 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index 6d3fecbf..0dfbbc33 100644
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -256,6 +256,24 @@ find_file_in_tree (GFile *base, const char *filename)
   return FALSE;
 }
 
+static GFile *
+convert_app_absolute_path (const char *path, GFile *files)
+{
+  g_autofree char *exec_path = NULL;
+
+  if (g_path_is_absolute (path))
+    {
+      if (g_str_has_prefix (path, "/app/"))
+        exec_path = g_strdup (path + 5);
+      else
+        exec_path = g_strdup (path);
+    }
+  else
+    exec_path = g_strconcat ("bin/", path, NULL);
+
+  return g_file_resolve_relative_path (files, exec_path);
+}
+
 static gboolean
 validate_desktop_file (GFile *desktop_file,
                        GFile *export,
@@ -273,7 +291,6 @@ validate_desktop_file (GFile *desktop_file,
   g_autoptr(GKeyFile) key_file = NULL;
   g_autofree char *command = NULL;
   g_auto(GStrv) argv = NULL;
-  g_autofree char *exec_path = NULL;
   g_autoptr(GFile) bin_file = NULL;
 
   if (!g_file_query_exists (desktop_file, NULL))
@@ -327,19 +344,8 @@ check_refs:
     }
 
   argv = g_strsplit (command, " ", 0);
-  if (g_path_is_absolute (argv[0]))
-    {
-      if (g_str_has_prefix (argv[0], "/app/"))
-        exec_path = g_strdup (argv[0] + 5);
-      else
-        exec_path = g_strdup (argv[0]);
-    }
-  else
-    {
-      exec_path = g_strconcat ("bin/", argv[0], NULL);
-    }
 
-  bin_file = g_file_resolve_relative_path (files, exec_path);
+  bin_file = convert_app_absolute_path (argv[0], files);
   if (!g_file_query_exists (bin_file, NULL))
     {
       g_set_error (error,
@@ -408,7 +414,6 @@ validate_service_file (GFile *service_file,
   g_autofree char *name = NULL;
   g_autofree char *command = NULL;
   g_auto(GStrv) argv = NULL;
-  g_autofree char *exec_path = NULL;
   g_autoptr(GFile) bin_file = NULL;
 
   if (!g_file_query_exists (service_file, NULL))
@@ -449,10 +454,10 @@ validate_service_file (GFile *service_file,
       g_prefix_error (error, "Invalid service file %s: ", path);
       return FALSE;
     }
-  argv = g_strsplit (command, " ", 0);
-  exec_path = g_strconcat ("bin/", argv[0], NULL);
-  bin_file = g_file_resolve_relative_path (files, exec_path);
 
+  argv = g_strsplit (command, " ", 0);
+
+  bin_file = convert_app_absolute_path (argv[0], files);
   if (!g_file_query_exists (bin_file, NULL))
     {
       g_set_error (error,