X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=27f73700008ccbc8f6fc3fdd4fca56cdb8a1739a;hp=6720899def35326046503295c152f49b2fab27ad;hb=2c0a91fedc150195f54d91bf75515e4bfff0d753;hpb=f97a438ab62bd1ea07c4574eac48d7b8fc4d7387 diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 6720899de..27f737000 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -30,15 +30,16 @@ #include "hashmap.h" #include "fileio.h" #include "path-util.h" -#include "special.h" +// #include "special.h" #include "unit-name.h" #include "bus-util.h" #include "bus-error.h" #include "conf-parser.h" #include "clean-ipc.h" -#include "logind-user.h" #include "smack-util.h" #include "formats-util.h" +#include "label.h" +#include "logind-user.h" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { User *u; @@ -93,8 +94,11 @@ void user_free(User *u) { free(u->service); } +/// elogind does not support slice and service jobs +#if 0 free(u->slice_job); free(u->service_job); +#endif // 0 free(u->runtime_path); @@ -105,7 +109,7 @@ void user_free(User *u) { free(u); } -int user_save(User *u) { +static int user_save_internal(User *u) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; int r; @@ -113,16 +117,13 @@ int user_save(User *u) { assert(u); assert(u->state_file); - if (!u->started) - return 0; - r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0); if (r < 0) - goto finish; + goto fail; r = fopen_temporary(u->state_file, &f, &temp_path); if (r < 0) - goto finish; + goto fail; fchmod(fileno(f), 0644); @@ -138,13 +139,19 @@ int user_save(User *u) { if (u->service) fprintf(f, "SERVICE=%s\n", u->service); +/// elogind does not support service jobs +#if 0 if (u->service_job) fprintf(f, "SERVICE_JOB=%s\n", u->service_job); +#endif // 0 if (u->slice) fprintf(f, "SLICE=%s\n", u->slice); +/// elogind does not support slice jobs +#if 0 if (u->slice_job) fprintf(f, "SLICE_JOB=%s\n", u->slice_job); +#endif // 0 if (u->display) fprintf(f, "DISPLAY=%s\n", u->display->id); @@ -243,19 +250,33 @@ int user_save(User *u) { fputc('\n', f); } - fflush(f); + r = fflush_and_check(f); + if (r < 0) + goto fail; - if (ferror(f) || rename(temp_path, u->state_file) < 0) { + if (rename(temp_path, u->state_file) < 0) { r = -errno; - unlink(u->state_file); - unlink(temp_path); + goto fail; } -finish: - if (r < 0) - log_error_errno(r, "Failed to save user data %s: %m", u->state_file); + return 0; - return r; +fail: + (void) unlink(u->state_file); + + if (temp_path) + (void) unlink(temp_path); + + return log_error_errno(r, "Failed to save user data %s: %m", u->state_file); +} + +int user_save(User *u) { + assert(u); + + if (!u->started) + return 0; + + return user_save_internal (u); } int user_load(User *u) { @@ -268,9 +289,15 @@ int user_load(User *u) { r = parse_env_file(u->state_file, NEWLINE, "RUNTIME", &u->runtime_path, "SERVICE", &u->service, +/// elogind does not support service jobs +#if 0 "SERVICE_JOB", &u->service_job, +#endif // 0 "SLICE", &u->slice, +/// elogind does not support slice jobs +#if 0 "SLICE_JOB", &u->slice_job, +#endif // 0 "DISPLAY", &display, "REALTIME", &realtime, "MONOTONIC", &monotonic, @@ -323,7 +350,7 @@ static int user_mkdir_runtime_path(User *u) { if (path_is_mount_point(p, 0) <= 0) { _cleanup_free_ char *t = NULL; - (void) mkdir(p, 0700); + (void) mkdir_label(p, 0700); if (mac_smack_use()) r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); @@ -351,6 +378,10 @@ static int user_mkdir_runtime_path(User *u) { goto fail; } } + + r = label_fix(p, false, false); + if (r < 0) + log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p); } u->runtime_path = p; @@ -368,7 +399,7 @@ fail: } static int user_start_slice(User *u) { - char *job; + // char *job; int r; assert(u); @@ -378,20 +409,26 @@ static int user_start_slice(User *u) { char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice; sprintf(lu, UID_FMT, u->uid); - r = slice_build_subslice(SPECIAL_USER_SLICE, lu, &slice); + r = slice_build_subslice("user.slice", lu, &slice); if (r < 0) return r; +/// elogind : Do not try to use dbus to ask systemd +#if 0 r = manager_start_unit(u->manager, slice, &error, &job); if (r < 0) { log_error("Failed to start user slice: %s", bus_error_message(&error, r)); free(slice); } else { +#endif // 0 u->slice = slice; +/// elogind does not support slice jobs +#if 0 free(u->slice_job); u->slice_job = job; } +#endif // 0 } if (u->slice) @@ -402,7 +439,7 @@ static int user_start_slice(User *u) { static int user_start_service(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; + // char *job; int r; assert(u); @@ -415,15 +452,21 @@ static int user_start_service(User *u) { if (r < 0) return log_error_errno(r, "Failed to build service name: %m"); +/// elogind : Do not try to use dbus to ask systemd +#if 0 r = manager_start_unit(u->manager, service, &error, &job); +#endif // 0 if (r < 0) { log_error("Failed to start user service: %s", bus_error_message(&error, r)); free(service); } else { u->service = service; +/// elogind does not support service jobs +#if 0 free(u->service_job); u->service_job = job; +#endif // 0 } } @@ -438,43 +481,68 @@ int user_start(User *u) { assert(u); - if (u->started) + if (u->started && !u->stopping) return 0; - log_debug("New user %s logged in.", u->name); - - /* Make XDG_RUNTIME_DIR */ - r = user_mkdir_runtime_path(u); - if (r < 0) - return r; + /* + * If u->stopping is set, the user is marked for removal and the slice + * and service stop-jobs are queued. We have to clear that flag before + * queing the start-jobs again. If they succeed, the user object can be + * re-used just fine (pid1 takes care of job-ordering and proper + * restart), but if they fail, we want to force another user_stop() so + * possibly pending units are stopped. + * Note that we don't clear u->started, as we have no clue what state + * the user is in on failure here. Hence, we pretend the user is + * running so it will be properly taken down by GC. However, we clearly + * return an error from user_start() in that case, so no further + * reference to the user is taken. + */ + u->stopping = false; + + if (!u->started) { + log_debug("New user %s logged in.", u->name); + + /* Make XDG_RUNTIME_DIR */ + r = user_mkdir_runtime_path(u); + if (r < 0) + return r; + } /* Create cgroup */ r = user_start_slice(u); if (r < 0) return r; + /* Save the user data so far, because pam_systemd will read the + * XDG_RUNTIME_DIR out of it while starting up systemd --user. + * We need to do user_save_internal() because we have not + * "officially" started yet. */ + user_save_internal(u); + /* Spawn user systemd */ r = user_start_service(u); if (r < 0) return r; - if (!dual_timestamp_is_set(&u->timestamp)) - dual_timestamp_get(&u->timestamp); - - u->started = true; + if (!u->started) { + if (!dual_timestamp_is_set(&u->timestamp)) + dual_timestamp_get(&u->timestamp); + user_send_signal(u, true); + u->started = true; + } /* Save new user data */ user_save(u); - user_send_signal(u, true); - return 0; } +/// UNNEEDED by elogind +#if 0 static int user_stop_slice(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; - int r; + // char *job; + int r = 0; assert(u); @@ -495,8 +563,8 @@ static int user_stop_slice(User *u) { static int user_stop_service(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; - int r; + // char *job; + int r = 0; assert(u); @@ -514,6 +582,7 @@ static int user_stop_service(User *u) { return r; } +#endif // 0 static int user_remove_runtime_path(User *u) { int r; @@ -538,8 +607,7 @@ static int user_remove_runtime_path(User *u) { if (r < 0) log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); - free(u->runtime_path); - u->runtime_path = NULL; + u->runtime_path = mfree(u->runtime_path); return r; } @@ -562,6 +630,8 @@ int user_stop(User *u, bool force) { } /* Kill systemd */ +/// elogind does not support service or slice jobs +#if 0 k = user_stop_service(u); if (k < 0) r = k; @@ -570,6 +640,7 @@ int user_stop(User *u, bool force) { k = user_stop_slice(u); if (k < 0) r = k; +#endif // 0 u->stopping = true; @@ -677,11 +748,14 @@ bool user_check_gc(User *u, bool drop_not_started) { if (user_check_linger_file(u) > 0) return true; +/// elogind does not support systemd services and slices +#if 0 if (u->slice_job && manager_job_is_active(u->manager, u->slice_job)) return true; if (u->service_job && manager_job_is_active(u->manager, u->service_job)) return true; +#endif // 0 return false; } @@ -704,7 +778,12 @@ UserState user_get_state(User *u) { if (u->stopping) return USER_CLOSING; - if (u->slice_job || u->service_job) +/// elogind does not support slice and service jobs +#if 0 + if (!u->started || u->slice_job || u->service_job) +#else + if (!u->started) +#endif // 0 return USER_OPENING; if (u->sessions) { @@ -730,12 +809,28 @@ UserState user_get_state(User *u) { } int user_kill(User *u, int signo) { +/// Without systemd unit support, elogind has to rely on its session system +#if 0 assert(u); if (!u->slice) return -ESRCH; return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL); +#else + Session *s; + int res = 0; + + assert(u); + + LIST_FOREACH(sessions_by_user, s, u->sessions) { + int r = session_kill(s, KILL_ALL, signo); + if (res == 0 && r < 0) + res = r; + } + + return res; +#endif // 0 } static bool elect_display_filter(Session *s) { @@ -847,26 +942,26 @@ int config_parse_tmpfs_size( errno = 0; ul = strtoul(rvalue, &f, 10); if (errno != 0 || f != e) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Failed to parse percentage value, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, errno, "Failed to parse percentage value, ignoring: %s", rvalue); return 0; } if (ul <= 0 || ul >= 100) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Percentage value out of range, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, 0, "Percentage value out of range, ignoring: %s", rvalue); return 0; } *sz = PAGE_ALIGN((size_t) ((physical_memory() * (uint64_t) ul) / (uint64_t) 100)); } else { - off_t o; + uint64_t k; - r = parse_size(rvalue, 1024, &o); - if (r < 0 || (off_t) (size_t) o != o) { - log_syntax(unit, LOG_ERR, filename, line, r < 0 ? -r : ERANGE, "Failed to parse size value, ignoring: %s", rvalue); + r = parse_size(rvalue, 1024, &k); + if (r < 0 || (uint64_t) (size_t) k != k) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue); return 0; } - *sz = PAGE_ALIGN((size_t) o); + *sz = PAGE_ALIGN((size_t) k); } return 0;