Separate systemd-user-helpersubmit/tizen_unified/20170308.100403submit/tizen/20170307.051651accepted/tizen/wearable/20170307.102137accepted/tizen/unified/20170309.031150accepted/tizen/tv/20170307.102119accepted/tizen/mobile/20170307.102059accepted/tizen/ivi/20170307.102153accepted/tizen/common/20170307.133902

For ease of development, systemd-user-helper for
user session launch is moved to separate package, session-utils.

Change-Id: Iac07ab112ee042a9e68c4cbdb6d68c2a95804257
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

5 files changed, 1 insertions, 496 deletions

diff --git a/Makefile.am b/Makefile.am
index 03bd218..a651e89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,8 +149,7 @@ noinst_liblazymount_la_SOURCES = \
 
 # ------------------------------------------------------------------------------
 bin_PROGRAMS = \
-	test_lazymount \
-	systemd_user_helper
+	test_lazymount
 
 test_lazymount_SOURCES = \
 	src/liblazymount/test_lazymount.c
@@ -175,17 +174,6 @@ BASIC_TARGET_WANTS += \
 bin_SCRIPTS = \
 	scripts/mount-user.sh
 
-systemd_user_helper_SOURCES = \
-	src/systemd-user-helper/systemd-user-helper.c
-
-systemd_user_helper_CFLAGS = \
-	$(AM_CFLAGS) \
-	${TZPLATFORMCONF_CFLAGS}
-
-systemd_user_helper_LDADD = \
-	${TZPLATFORMCONF_LIBS} \
-	-ldl
-
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
diff --git a/configure.ac b/configure.ac
index 280e5c1..5f0e9de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,6 @@ AC_SUBST(M4_DEFINES)
 
 # ------------------------------------------------------------------------------
 PKG_CHECK_MODULES(VCONF, vconf)
-PKG_CHECK_MODULES(TZPLATFORMCONF, libtzplatform-config)
 
 # ------------------------------------------------------------------------------
 AC_SUBST([LIBLAZYMOUNT_PC_REQUIRES], "")
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 7ad5065..a19cb7b 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -12,12 +12,10 @@ License:   Apache-2.0
 Source0:   %{name}-%{version}.tar.bz2
 Source1:   %{name}.manifest
 Source2:   liblazymount.manifest
-Source3:   systemd-user-helper.manifest
 
 Requires(post): /usr/bin/systemctl
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 This package provides target specific system configuration files.
@@ -83,13 +81,6 @@ Requires: liblazymount = %{version}
 %description -n liblazymount-devel
 Development library for lazy mount feature.It supports some interface functions.
 
-%package -n systemd-user-helper
-Summary: Systemd user launch helper for supporting Tizen specific feature
-License: Apache-2.0
-
-%description -n systemd-user-helper
-Systemd user launch helper supports Tizen specific feature like directory compatibility and container.
-
 %package profile_ivi
 Summary: ivi specific system configuration files
 Requires: %{name} = %{version}-%{release}
@@ -120,7 +111,6 @@ This package provides the functions for headless device.
 %build
 cp %{SOURCE1} .
 cp %{SOURCE2} .
-cp %{SOURCE3} .
 
 ./autogen.sh
 %reconfigure \
@@ -311,21 +301,6 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
 %{_bindir}/test_lazymount
 %endif
 
-%files -n systemd-user-helper
-%manifest systemd-user-helper.manifest
-%caps(cap_sys_admin,cap_mac_admin,cap_mac_override,cap_dac_override,cap_setgid=ei) %{_bindir}/systemd_user_helper
-
-#TODO: when uninstalling, it should be restored to original file
-%posttrans -n systemd-user-helper
-cp -a /usr/lib/systemd/system/user\@.service /usr/lib/systemd/system/__user@.service
-/usr/bin/sed -i -e 's/Type=\(.*\)/Type=forking/' /usr/lib/systemd/system/user\@.service
-/usr/bin/sed -i -e 's/ExecStart=\(.*\)/ExecStart=\/usr\/bin\/systemd_user_helper start %i/' /usr/lib/systemd/system/user\@.service
-/usr/bin/sed -i -e '/ExecStart=\(.*\)/ a ExecStop=\/usr\/bin\/systemd_user_helper stop %i' /usr/lib/systemd/system/user\@.service
-/usr/bin/sed -i -e '/PIDFile=\(.*\)/d' /usr/lib/systemd/system/user\@.service
-/usr/bin/sed -i -e '/XDG_RUNTIME_DIR/ a Environment=XDG_RUNTIME_EXT_DIR=/run/user_ext/%i' /usr/lib/systemd/system/user\@.service
-echo 'PIDFile=/run/user/%i/.systemd.pid' >> /usr/lib/systemd/system/user\@.service
-echo "d /run/user_ext 0755 root root -" >> /usr/lib/tmpfiles.d/systemd.conf
-
 %files profile_ivi
 %{_prefix}/lib/udev/rules.d/99-usb-ethernet.rules
 %{_bindir}/usb_net_init.sh
diff --git a/packaging/systemd-user-helper.manifest b/packaging/systemd-user-helper.manifest
deleted file mode 100644
index 90334b8..0000000
--- a/packaging/systemd-user-helper.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest>
-  <request>
-    <domain name="_"/>
-  </request>
-  <assign>
-    <filesystem path="/usr/bin/systemd_user_helper" label="_" exec_label="System::Privileged" />
-  </assign>
-</manifest>
diff --git a/src/systemd-user-helper/systemd-user-helper.c b/src/systemd-user-helper/systemd-user-helper.c
deleted file mode 100644
index 5fb1057..0000000
--- a/src/systemd-user-helper/systemd-user-helper.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <dlfcn.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/stat.h>
-
-#include <sched.h>
-#include <sys/mount.h>
-
-#include <tzplatform_config.h>
-
-#include <sys/types.h>
-#include <grp.h>
-#include <string.h>
-
-#define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0]))
-#define PIDFILE_PATH ".systemd.pid"
-
-// For compatibility, Using hard-coded path
-#define LEGACY_CONTENTS_DIR "/opt/usr/media"
-#define LEGACY_APPS_DIR "/opt/usr/apps"
-
-#define LAZYMOUNT_LIB LIBDIR"/liblazymount.so.0"
-#define CONTAINER_LIB LIBDIR"/security/pam_krate.so"
-
-#define LOAD_SYMBOL(handle, sym, name) \
-	do { \
-		sym = dlsym(handle, name); \
-		if (!sym) { \
-			fprintf(stderr, "dlsym %s error\n", name); \
-			dlclose(handle); \
-			return -1; \
-		} \
-	} while (0);
-
-#define MOUNT_SIZE  "10000k"
-#define MAX_GRP_BUF_SIZE (1024 * 4)
-#define GRP_NAME_SYSTEM_SHARE    "system_share"
-
-static void *container_handle = NULL;
-
-static const char *systemd_arg[] = {
-	"/usr/lib/systemd/systemd",
-	"--user",
-	NULL
-};
-
-int mac_smack_use(void) {
-        static int cached_use = -1;
-
-        if (cached_use < 0)
-                cached_use = access("/sys/fs/smackfs/", F_OK) >= 0;
-
-        return cached_use;
-}
-
-static int mount_user_ext(char *username)
-{
-	char *mount_point = NULL;
-	char *mount_option = NULL;
-	uid_t mnt_uid;
-	gid_t mnt_gid;
-	struct group *p_grp = NULL, grp_buf;
-	char buf[MAX_GRP_BUF_SIZE];
-	int r;
-
-	mnt_uid = atoi(username);
-	if(mnt_uid <= 0)
-		return -1;
-
-	r = asprintf(&mount_point, "/run/user_ext/%s", username);
-	if (r < 0) {
-		fprintf(stderr, "Failed to set mount point for user_ext\n");
-		return r;
-	}
-
-	(void) mkdir(mount_point, 0750);
-
-	r = getgrnam_r(GRP_NAME_SYSTEM_SHARE, &grp_buf, buf, sizeof(buf), &p_grp);
-	if( r == 0 && p_grp != NULL)
-	{
-		mnt_gid = p_grp->gr_gid;
-	}
-	else
-	{
-		free(mount_point);
-		return -2;
-	}
-
-	if (mac_smack_use())
-		r = asprintf(&mount_option, "mode=0750,smackfsroot=*,uid=%d,gid=%d,size=%s", mnt_uid, mnt_gid, MOUNT_SIZE);
-	else
-		r = asprintf(&mount_option, "mode=0750,uid=%d,gid=%d,size=%s", mnt_uid, mnt_gid, MOUNT_SIZE);
-
-	if (r < 0) {
-		fprintf(stderr, "Failed to set mount option for user_ext\n");
-		free(mount_point);
-		return r;
-	}
-
-	r = mount("tmpfs", mount_point, "tmpfs", MS_NODEV|MS_NOSUID|MS_NOEXEC, mount_option);
-	free(mount_point);
-	free(mount_option);
-
-	if (r < 0) {
-		fprintf(stderr, "Failed to mount user_ext\n");
-		return r;
-	}
-	return 0;
-}
-
-static int umount_user_ext(char *username)
-{
-	int r;
-	char *mount_point = NULL;
-
-	r = asprintf(&mount_point, "/run/user_ext/%s", username);
-	if (r < 0) {
-		fprintf(stderr, "Failed to set mount point for user_ext\n");
-		return r;
-	}
-	r = umount2(mount_point, MNT_DETACH);
-	if (r < 0) {
-		fprintf(stderr, "Failed to umount user_ext\n");
-		free(mount_point);
-		return r;
-	}
-	r = rmdir(mount_point);
-	if (r < 0) {
-		fprintf(stderr, "Failed to rmdir user_ext\n");
-		free(mount_point);
-		return r;
-	}
-	free(mount_point);
-	return 0;
-}
-
-static int stop_process(char *username)
-{
-	int r;
-
-	(void)umount_user_ext(username);
-	r = umount2(tzplatform_getenv(TZ_USER_CONTENT), MNT_DETACH);
-	if (r < 0) {
-		fprintf(stderr, "Warning : Failed to umount user content\n");
-	}
-
-	r = umount2(tzplatform_getenv(TZ_USER_APP), MNT_DETACH);
-	if (r < 0) {
-		fprintf(stderr, "Warning : Failed to umount application content\n");
-	}
-	return 0;
-}
-
-static int normal_user_preprocess(char *username)
-{
-	int r;
-
-	r = unshare(CLONE_NEWNS);
-	if (r < 0) {
-		fprintf(stderr, "unshare failed\n");
-		return r;
-	}
-
-	r = mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL);
-	if (r < 0) {
-		fprintf(stderr, "Failed to change the propagation type of root to SLAVE\n");
-		return r;
-	}
-
-	return 0;
-}
-
-static int normal_user_postprocess(char *username)
-{
-	int r;
-	r = mount(tzplatform_getenv(TZ_USER_CONTENT),
-			LEGACY_CONTENTS_DIR, NULL, MS_BIND, NULL);
-	if (r < 0) {
-		fprintf(stderr, "user content bind mount failed - %d\n", errno);
-		return r;
-	}
-
-	r = mount(tzplatform_getenv(TZ_USER_APP),
-			LEGACY_APPS_DIR, NULL, MS_BIND, NULL);
-	if (r < 0) {
-		fprintf(stderr, "user app bind mount failed - %d\n", errno);
-		return r;
-	}
-
-	return 0;
-}
-
-static int container_open(void)
-{
-	if (container_handle)
-		return 0;
-
-	container_handle = dlopen(CONTAINER_LIB, RTLD_LAZY);
-	if (!container_handle) {
-		fprintf(stderr, "container module dlopen error\n");
-		return -1;
-	}
-	return 0;
-}
-
-static int container_preprocess(char *username)
-{
-	int r;
-	int (*handle_preprocess)(char *);
-
-	r = container_open();
-	if (r < 0)
-		return r;
-
-	LOAD_SYMBOL(container_handle, handle_preprocess, "container_preprocess");
-
-	r = handle_preprocess(username);
-	if (r < 0) {
-		fprintf(stderr, "container module preprocess error\n");
-		return r;
-	}
-
-	return 0;
-}
-
-static int container_postprocess(char *username)
-{
-	int r;
-	int (*handle_postprocess)(char *);
-
-	r = container_open();
-	if (r < 0)
-		return r;
-
-	LOAD_SYMBOL(container_handle, handle_postprocess, "container_postprocess");
-
-	r = handle_postprocess(username);
-	if (r < 0) {
-		fprintf(stderr, "container module postprocess error\n");
-		return r;
-	}
-
-	return 0;
-}
-
-static int wait_condition(void)
-{
-	int r;
-	void *h;
-
-	int (*wait_mount_user)(void);
-
-	r = access(LAZYMOUNT_LIB, F_OK);
-	if (r < 0) {
-		fprintf(stderr, "cannot find lazymount module - No support lazymount\n");
-		return 0;
-	}
-
-	h = dlopen(LAZYMOUNT_LIB, RTLD_LAZY);
-	if (!h) {
-		fprintf(stderr, "lazymount module dlopen error\n");
-		return -1;
-	}
-
-	LOAD_SYMBOL(h, wait_mount_user, "wait_mount_user");
-
-	r = wait_mount_user();
-	if (r < 0) {
-		fprintf(stderr, "wait_mout_user failed\n");
-		dlclose(h);
-		return r;
-	}
-
-	dlclose(h);
-	return 0;
-}
-
-static int make_pid_file(int pid, char* user_id)
-{
-	FILE *fp;
-	char pidpath[PATH_MAX];
-	int r = 0;
-
-	snprintf(pidpath, PATH_MAX, "/run/user/%s/%s", user_id, PIDFILE_PATH);
-
-	fp = fopen(pidpath, "w+");
-	if (fp != NULL) {
-		fprintf(fp, "%d", pid);
-		fclose(fp);
-	} else
-		r = -1;
-
-	return r;
-}
-
-static int change_smack_for_user_session()
-{
-	FILE *fp;
-	int r = 0;
-
-	fp = fopen("/proc/self/attr/current", "w");
-
-	if(fp == NULL)
-	{
-		r = -errno;
-		return r;
-	}
-	r = fputs("User", fp);
-	if(r == EOF)
-	{
-		fclose(fp);
-		r = -errno;
-		return r;
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-int run_child(int argc, const char *argv[], char* user_id)
-{
-	pid_t pid;
-	int r = 0;
-	int i;
-
-	if (!argv)
-		return -EINVAL;
-
-	pid = fork();
-
-	if (pid < 0) {
-		fprintf(stderr, "failed to fork");
-		r = -errno;
-	} else if (pid == 0) {
-		for (i = 0; i < _NSIG; ++i)
-			signal(i, SIG_DFL);
-
-		r = execv(argv[0], (char **)argv);
-		/* NOT REACH */
-	} else{
-		make_pid_file(pid, user_id);
-		r = pid;
-	}
-
-	return r;
-}
-
-int main(int argc, char *argv[])
-{
-	int r = 0;
-	int support_container = 0;
-	char *operation;
-	char *username;
-
-	if (argc < 3) {
-		fprintf(stderr, "require user argument\n");
-		return -1;
-	}
-	operation = argv[1];
-	username = argv[2];
-
-	if (strcmp(operation,"stop") == 0) {
-		return stop_process(username);
-	} else if (strcmp(operation, "start") == 0) {
-	} else {
-		fprintf(stderr, "option is invalid(%s)\n", operation);
-		return -2;
-	}
-
-	r = mount_user_ext(username);
-	if (r < 0) {
-		fprintf(stderr, "mount user_ext failed\n");
-		return r;
-	}
-	r = change_smack_for_user_session();
-	if(r != 0)
-	{
-		fprintf(stderr, "failed to change smack\n");
-		return r;
-	}
-
-	/* pre-processing */
-	r = normal_user_preprocess(username);
-	if (r < 0) {
-		fprintf(stderr, "normal user preprocess failed\n");
-		return r;
-	}
-
-	/* If container supports below funcs, below line should be enabled. */
-	support_container = (access(CONTAINER_LIB, F_OK) == 0) ? 1 : 0;
-	if (support_container) {
-		r = container_preprocess(username);
-		if (r < 0) {
-			fprintf(stderr, "container preprocess failed\n");
-			return r;
-		}
-	}
-
-	r = run_child(ARRAY_SIZE(systemd_arg), systemd_arg, username);
-	if (r < 0) {
-		fprintf(stderr, "systemd user execution failed\n");
-		return r;
-	} else{
-		fprintf(stderr, "success = pid = %d\n", r);
-	}
-
-	/* sync-style since there is no need to process other signal */
-	wait_condition();
-
-	/* post-processing */
-	r = normal_user_postprocess(username);
-	if (r < 0) {
-		fprintf(stderr, "normal user postprocess failed\n");
-		return r;
-	}
-
-	if (support_container) {
-		r = container_postprocess(username);
-		if (r < 0) {
-			fprintf(stderr, "container postprocess failed\n");
-			return r;
-		}
-	}
-
-	return 0;
-}
-
-