Start user units at the system level

When service name end with @ it means that the user
UID must be provided.

Change-Id: I6707df0151b7cab985cfc53a81fccf6a7150c9a3
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

3 files changed, 35 insertions, 7 deletions

diff --git a/src/afm-udb.c b/src/afm-udb.c
index e3d5d77..0a48810 100644
--- a/src/afm-udb.c
+++ b/src/afm-udb.c
@@ -17,6 +17,7 @@
 */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
@@ -224,6 +225,8 @@ static int addunit(
 {
 	struct json_object *priv, *pub, *id;
 	const char *strid;
+	char *un = NULL;
+	size_t len;
 
 	/* create the application structure */
 	priv = json_object_new_object();
@@ -234,12 +237,30 @@ static int addunit(
 	if (!pub)
 		goto error;
 
+	/* make the unit name */
+	len = strlen(unitname);
+	assert(len >= (sizeof service_extension - 1));
+	assert(!memcmp(&unitname[len - (sizeof service_extension - 1)], service_extension, sizeof service_extension));
+	if (unitname[len - sizeof service_extension] == '@') {
+		char buffer[40];
+		size_t l = (size_t)snprintf(buffer, sizeof buffer, "%d", (int)getuid());
+		un = malloc(len + l + 1);
+		if (!un)
+			goto error;
+		memcpy(&un[0], unitname, len - (sizeof service_extension - 1));
+		if (l)
+			memcpy(&un[len - (sizeof service_extension - 1)], buffer, l);
+		memcpy(&un[len - (sizeof service_extension - 1) + l], service_extension, sizeof service_extension);
+	}
+
 	/* adds the values */
 	if (add_fields_of_content(priv, pub, content, length)
 	 || add_field(priv, pub, key_unit_path, unitpath)
-	 || add_field(priv, pub, key_unit_name, unitname)
+	 || add_field(priv, pub, key_unit_name, un ? : unitname)
 	 || add_field(priv, pub, key_unit_scope, isuser ? scope_user : scope_system))
 		goto error;
+	free(un);
+	un = NULL;
 
 	/* get the id */
 	if (!json_object_object_get_ex(pub, key_id, &id)) {
@@ -258,6 +279,7 @@ static int addunit(
 	return 0;
 
 error:
+	free(un);
 	json_object_put(pub);
 	json_object_put(priv);
 	return -1;
diff --git a/src/afm-urun.c b/src/afm-urun.c
index 1814437..5649973 100644
--- a/src/afm-urun.c
+++ b/src/afm-urun.c
@@ -36,6 +36,8 @@
 #include "afm-udb.h"
 #include "afm-urun.h"
 
+static const char key_unit_d_path[] = "-unit-dpath-";
+
 /**************** get appli basis *********************/
 
 static int get_basis(struct json_object *appli, int *isuser, const char **dpath, int load)
@@ -51,7 +53,7 @@ static int get_basis(struct json_object *appli, int *isuser, const char **dpath,
 	*isuser = strcmp(uscope, "system") != 0;
 
 	/* get dpath */
-	if (!j_read_string_at(appli, "-unit-dpath-", dpath)) {
+	if (!j_read_string_at(appli, key_unit_d_path, dpath)) {
 		if (!load) {
 			errno = ENOENT;
 			goto error;
@@ -65,12 +67,12 @@ static int get_basis(struct json_object *appli, int *isuser, const char **dpath,
 			ERROR("Can't load unit of name %s for %s: %m", uname, uscope);
 			goto error;
 		}
-		if (!j_add_string(appli, "-unit-dpath-", dp)) {
+		if (!j_add_string(appli, key_unit_d_path, dp)) {
 			free(dp);
 			goto nomem;
 		}
 		free(dp);
-		j_read_string_at(appli, "-unit-dpath-", dpath);
+		j_read_string_at(appli, key_unit_d_path, dpath);
 	}
 
 	return 0;
@@ -238,6 +240,8 @@ static int not_yet_implemented(const char *what)
 int afm_urun_terminate(int runid)
 {
 	int rc = systemd_unit_stop_pid(1 /* TODO: isuser? */, (unsigned)runid);
+	if (rc < 0)
+		rc = systemd_unit_stop_pid(0 /* TODO: isuser? */, (unsigned)runid);
 	return rc < 0 ? rc : 0;
 }
 
@@ -313,7 +317,7 @@ error:
  */
 struct json_object *afm_urun_state(struct afm_udb *db, int runid)
 {
-	int i, n, isuser, pid;
+	int i, n, isuser, pid, wasuser;
 	char *dpath;
 	const char *udpath;
 	const char *id;
@@ -325,7 +329,9 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid)
 	result = NULL;
 
 	/* get the dpath */
-	dpath = systemd_unit_dpath_by_pid(1 /* TODO: isuser? */, (unsigned)runid);
+	dpath = systemd_unit_dpath_by_pid(wasuser = 1, (unsigned)runid);
+	if (!dpath)
+		dpath = systemd_unit_dpath_by_pid(wasuser = 0, (unsigned)runid);
 	if (!dpath) {
 		errno = EINVAL;
 		WARNING("searched runid %d not found", runid);
diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index 057f23e..ed5f2a2 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -530,7 +530,7 @@ int main(int ac, char **av)
 	srandom((unsigned int)time(NULL));
 
 	/* init database */
-	afudb = afm_udb_create(0, 1, "afm-appli-");
+	afudb = afm_udb_create(1, 1, "afm-appli-");
 	if (!afudb) {
 		ERROR("afm_udb_create failed");
 		return 1;