Merge lp:~ted/ubuntu-app-launch/xdg-data-dirs into lp:ubuntu-app-launch/14.04

[Ted Gould]

Set the XDG Data Dirs to include the application install directory

This branch makes it so that we update the XDG_DATA_DIRS to include the application install path. It also fixes the tests around this function to make sure we're actually checking values.

[Chris Wayne (cwayne)]

I just tested by pbuilding + installing on a mako, and this seems to do the trick, click apps are now translated!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/146/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Can this be top-approved now? It seems to work

[Charles Kerr (charlesk)]

WfM as well.

review: Approve

=== modified file 'click-exec.c'
--- click-exec.c	2013-09-23 19:42:54 +0000
+++ click-exec.c	2013-11-13 04:06:57 +0000
@@ -60,8 +60,6 @@
 		return 1;
 	}
 
-	set_confined_envvars(package);
-
 	/* Check click to find out where the files are */
 	gchar * cmdline = g_strdup_printf("click pkgdir \"%s\"", package);
 	g_free(package);
@@ -92,6 +90,8 @@
 	g_debug("Setting 'APP_DIR' to '%s'", output);
 	set_upstart_variable("APP_DIR", output);
 
+	set_confined_envvars(package, output);
+
 	gchar * desktopfile = manifest_to_desktop(output, app_id);
 	g_free(output);
 	if (desktopfile == NULL) {

=== modified file 'desktop-exec.c'
--- desktop-exec.c	2013-09-23 19:42:54 +0000
+++ desktop-exec.c	2013-11-13 04:06:57 +0000
@@ -64,7 +64,7 @@
 	gchar * apparmor = g_key_file_get_string(keyfile, "Desktop Entry", "X-Ubuntu-AppArmor-Profile", NULL);
 	if (apparmor != NULL) {
 		set_upstart_variable("APP_EXEC_POLICY", apparmor);
-		set_confined_envvars(app_id);
+		set_confined_envvars(app_id, "/usr/share");
 		g_free(apparmor);
 	} else {
 		set_upstart_variable("APP_EXEC_POLICY", "unconfined");

=== modified file 'helpers.c'
--- helpers.c	2013-10-04 20:51:05 +0000
+++ helpers.c	2013-11-13 04:06:57 +0000
@@ -605,8 +605,11 @@
  * https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement
  */
 void
-set_confined_envvars (const gchar * package)
+set_confined_envvars (const gchar * package, const gchar * app_dir)
 {
+	g_return_if_fail(package != NULL);
+	g_return_if_fail(app_dir != NULL);
+
 	g_debug("Setting 'UBUNTU_APPLICATION_ISOLATION' to '1'");
 	set_upstart_variable("UBUNTU_APPLICATION_ISOLATION", "1");
 
@@ -627,6 +630,11 @@
 	g_debug("Setting 'XDG_RUNTIME_DIR' using g_get_user_runtime_dir()");
 	set_upstart_variable("XDG_RUNTIME_DIR", g_get_user_runtime_dir());
 
+	/* Add the application's dir to the list of sources for data */
+	gchar * datadirs = g_strjoin(":", app_dir, g_getenv("XDG_DATA_DIRS"), NULL);
+	set_upstart_variable("XDG_DATA_DIRS", datadirs);
+	g_free(datadirs);
+
 	/* Set TMPDIR to something sane and application-specific */
 	gchar * tmpdir = g_strdup_printf("%s/confined/%s", g_get_user_runtime_dir(), package);
 	g_debug("Setting 'TMPDIR' to '%s'", tmpdir);

=== modified file 'helpers.h'
--- helpers.h	2013-09-23 17:27:08 +0000
+++ helpers.h	2013-11-13 04:06:57 +0000
@@ -33,5 +33,6 @@
                                   const gchar *   uri_list);
 GKeyFile * keyfile_for_appid     (const gchar *   appid,
                                   gchar * *       desktopfile);
-void      set_confined_envvars   (const gchar *   package);
+void      set_confined_envvars   (const gchar *   package,
+                                  const gchar *   app_dir);
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-09-30 17:09:10 +0000
+++ tests/CMakeLists.txt	2013-11-13 04:06:57 +0000
@@ -13,6 +13,7 @@
 
 add_executable (helper-test helper-test.cc)
 add_definitions ( -DCMAKE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" )
+add_definitions ( -DCMAKE_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}" )
 target_link_libraries (helper-test helpers gtest ${GTEST_LIBS})
 
 add_test (helper-test helper-test)

=== modified file 'tests/helper-test.cc'
--- tests/helper-test.cc	2013-09-24 03:48:52 +0000
+++ tests/helper-test.cc	2013-11-13 04:06:57 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <gtest/gtest.h>
+#include <glib/gstdio.h>
 
 extern "C" {
 #include "../helpers.h"
@@ -31,6 +32,7 @@
 		virtual void SetUp() {
 			g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
 			g_setenv("PATH", CMAKE_SOURCE_DIR, TRUE);
+			g_setenv("DATA_WRITE_DIR", CMAKE_BINARY_DIR, TRUE);
 			return;
 		}
 };
@@ -261,8 +263,79 @@
 
 TEST_F(HelperTest, SetConfinedEnvvars)
 {
+	g_unlink(CMAKE_BINARY_DIR "/initctl-output.txt");
+
 	/* Not a test other than "don't crash" */
-	set_confined_envvars("pkg");
+	set_confined_envvars("foo-app-pkg", "/foo/bar");
+
+	ASSERT_TRUE(g_file_test(CMAKE_BINARY_DIR "/initctl-output.txt", G_FILE_TEST_EXISTS));
+
+	gchar * contents = NULL;
+	ASSERT_TRUE(g_file_get_contents(CMAKE_BINARY_DIR "/initctl-output.txt", &contents, NULL, NULL));
+
+	gchar ** lines = g_strsplit(contents, "\n", 0);
+	g_free(contents);
+	unsigned int i;
+
+	bool got_app_isolation = false;
+	bool got_cache_home = false;
+	bool got_config_home = false;
+	bool got_data_home = false;
+	bool got_runtime_dir = false;
+	bool got_data_dirs = false;
+	bool got_temp_dir = false;
+	bool got_shader_dir = false;
+
+	for (i = 0; lines[i] != NULL; i++) {
+		g_debug("Checking: '%s'", lines[i]);
+		if (lines[i][0] == '\0') continue;
+
+		ASSERT_TRUE(g_str_has_prefix(lines[i], "set-env "));
+
+		gchar * var = lines[i] + strlen("set-env ");
+		gchar * equal = g_strstr_len(var, -1, "=");
+		ASSERT_NE(equal, nullptr);
+
+		equal[0] = '\0';
+		gchar * value = &(equal[1]);
+
+		if (g_strcmp0(var, "UBUNTU_APPLICATION_ISOLATION") == 0) {
+			ASSERT_STREQ(value, "1");
+			got_app_isolation = true;
+		} else if (g_strcmp0(var, "XDG_CACHE_HOME") == 0) {
+			got_cache_home = true;
+		} else if (g_strcmp0(var, "XDG_CONFIG_HOME") == 0) {
+			got_config_home = true;
+		} else if (g_strcmp0(var, "XDG_DATA_HOME") == 0) {
+			got_data_home = true;
+		} else if (g_strcmp0(var, "XDG_RUNTIME_DIR") == 0) {
+			got_runtime_dir = true;
+		} else if (g_strcmp0(var, "XDG_DATA_DIRS") == 0) {
+			ASSERT_TRUE(g_str_has_prefix(value, "/foo/bar:"));
+			got_data_dirs = true;
+		} else if (g_strcmp0(var, "TMPDIR") == 0) {
+			ASSERT_TRUE(g_str_has_suffix(value, "foo-app-pkg"));
+			got_temp_dir = true;
+		} else if (g_strcmp0(var, "__GL_SHADER_DISK_CACHE_PATH") == 0) {
+			ASSERT_TRUE(g_str_has_suffix(value, "foo-app-pkg"));
+			got_shader_dir = true;
+		} else {
+			g_warning("Unknown variable! %s", lines[i]);
+			ASSERT_TRUE(false);
+		}
+	}
+
+	g_strfreev(lines);
+
+	ASSERT_TRUE(got_app_isolation);
+	ASSERT_TRUE(got_cache_home);
+	ASSERT_TRUE(got_config_home);
+	ASSERT_TRUE(got_data_home);
+	ASSERT_TRUE(got_runtime_dir);
+	ASSERT_TRUE(got_data_dirs);
+	ASSERT_TRUE(got_temp_dir);
+	ASSERT_TRUE(got_shader_dir);
+
 	return;
 }
 

=== modified file 'tests/initctl'
--- tests/initctl	2013-09-24 02:56:22 +0000
+++ tests/initctl	2013-11-13 04:06:57 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo $@
+echo $@ >> ${DATA_WRITE_DIR}/initctl-output.txt