X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=1f6fffff6bc7bcbd5b63fe95048c47ca3be49270;hp=56c7de4400aa90bbfe67a3eeed81bd9ef4534a21;hb=e777ddfd71f3b2d3217ffe74f287388832915d0b;hpb=4bba9156da3e1df2cee24d10d7cd88c776ef4179 diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 56c7de440..1f6fffff6 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -6,28 +6,38 @@ Copyright 2011 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ +#include #include #include #include -#include "logind-user.h" #include "util.h" -#include "cgroup-util.h" +#include "mkdir.h" +#include "rm-rf.h" #include "hashmap.h" -#include "strv.h" +#include "fileio.h" +#include "path-util.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" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { User *u; @@ -40,46 +50,41 @@ User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { return NULL; u->name = strdup(name); - if (!u->name) { - free(u); - return NULL; - } + if (!u->name) + goto fail; - if (asprintf(&u->state_file, "/run/systemd/users/%lu", (unsigned long) uid) < 0) { - free(u->name); - free(u); - return NULL; - } + if (asprintf(&u->state_file, "/run/systemd/users/"UID_FMT, uid) < 0) + goto fail; - if (hashmap_put(m->users, ULONG_TO_PTR((unsigned long) uid), u) < 0) { - free(u->state_file); - free(u->name); - free(u); - return NULL; - } + if (hashmap_put(m->users, UID_TO_PTR(uid), u) < 0) + goto fail; u->manager = m; u->uid = uid; u->gid = gid; return u; + +fail: + free(u->state_file); + free(u->name); + free(u); + + return NULL; } void user_free(User *u) { assert(u); if (u->in_gc_queue) - LIST_REMOVE(User, gc_queue, u->manager->user_gc_queue, u); + LIST_REMOVE(gc_queue, u->manager->user_gc_queue, u); while (u->sessions) session_free(u->sessions); - free(u->cgroup_path); - - free(u->service); free(u->runtime_path); - hashmap_remove(u->manager->users, ULONG_TO_PTR((unsigned long) u->uid)); + hashmap_remove(u->manager->users, UID_TO_PTR(u->uid)); free(u->name); free(u->state_file); @@ -87,9 +92,9 @@ void user_free(User *u) { } int user_save(User *u) { - FILE *f; + _cleanup_free_ char *temp_path = NULL; + _cleanup_fclose_ FILE *f = NULL; int r; - char *temp_path; assert(u); assert(u->state_file); @@ -97,7 +102,7 @@ int user_save(User *u) { if (!u->started) return 0; - r = safe_mkdir("/run/systemd/users", 0755, 0, 0); + r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0); if (r < 0) goto finish; @@ -114,62 +119,104 @@ int user_save(User *u) { u->name, user_state_to_string(user_get_state(u))); - if (u->cgroup_path) - fprintf(f, - "CGROUP=%s\n", - u->cgroup_path); - if (u->runtime_path) - fprintf(f, - "RUNTIME=%s\n", - u->runtime_path); - - if (u->service) - fprintf(f, - "SERVICE=%s\n", - u->service); + fprintf(f, "RUNTIME=%s\n", u->runtime_path); if (u->display) + fprintf(f, "DISPLAY=%s\n", u->display->id); + + if (dual_timestamp_is_set(&u->timestamp)) fprintf(f, - "DISPLAY=%s\n", - u->display->id); + "REALTIME="USEC_FMT"\n" + "MONOTONIC="USEC_FMT"\n", + u->timestamp.realtime, + u->timestamp.monotonic); if (u->sessions) { Session *i; + bool first; fputs("SESSIONS=", f); + first = true; LIST_FOREACH(sessions_by_user, i, u->sessions) { - fprintf(f, - "%s%c", - i->id, - i->sessions_by_user_next ? ' ' : '\n'); + if (first) + first = false; + else + fputc(' ', f); + + fputs(i->id, f); } - fputs("SEATS=", f); + fputs("\nSEATS=", f); + first = true; LIST_FOREACH(sessions_by_user, i, u->sessions) { - if (i->seat) - fprintf(f, - "%s%c", - i->seat->id, - i->sessions_by_user_next ? ' ' : '\n'); + if (!i->seat) + continue; + + if (first) + first = false; + else + fputc(' ', f); + + fputs(i->seat->id, f); } - fputs("ACTIVE_SESSIONS=", f); - LIST_FOREACH(sessions_by_user, i, u->sessions) - if (session_is_active(i)) - fprintf(f, - "%lu%c", - (unsigned long) i->user->uid, - i->sessions_by_user_next ? ' ' : '\n'); + fputs("\nACTIVE_SESSIONS=", f); + first = true; + LIST_FOREACH(sessions_by_user, i, u->sessions) { + if (!session_is_active(i)) + continue; + + if (first) + first = false; + else + fputc(' ', f); - fputs("ACTIVE_SEATS=", f); + fputs(i->id, f); + } + + fputs("\nONLINE_SESSIONS=", f); + first = true; LIST_FOREACH(sessions_by_user, i, u->sessions) { - if (session_is_active(i) && i->seat) - fprintf(f, - "%s%c", - i->seat->id, - i->sessions_by_user_next ? ' ' : '\n'); + if (session_get_state(i) == SESSION_CLOSING) + continue; + + if (first) + first = false; + else + fputc(' ', f); + + fputs(i->id, f); + } + + fputs("\nACTIVE_SEATS=", f); + first = true; + LIST_FOREACH(sessions_by_user, i, u->sessions) { + if (!session_is_active(i) || !i->seat) + continue; + + if (first) + first = false; + else + fputc(' ', f); + + fputs(i->seat->id, f); + } + + fputs("\nONLINE_SEATS=", f); + first = true; + LIST_FOREACH(sessions_by_user, i, u->sessions) { + if (session_get_state(i) == SESSION_CLOSING || !i->seat) + continue; + + if (first) + first = false; + else + fputc(' ', f); + + fputs(i->seat->id, f); } + fputc('\n', f); } fflush(f); @@ -180,47 +227,52 @@ int user_save(User *u) { unlink(temp_path); } - fclose(f); - free(temp_path); - finish: if (r < 0) - log_error("Failed to save user data for %s: %s", u->name, strerror(-r)); + log_error_errno(r, "Failed to save user data %s: %m", u->state_file); return r; } int user_load(User *u) { - int r; - char *display = NULL; + _cleanup_free_ char *display = NULL, *realtime = NULL, *monotonic = NULL; Session *s = NULL; + int r; assert(u); r = parse_env_file(u->state_file, NEWLINE, - "CGROUP", &u->cgroup_path, - "RUNTIME", &u->runtime_path, - "SERVICE", &u->service, - "DISPLAY", &display, + "RUNTIME", &u->runtime_path, + "DISPLAY", &display, + "REALTIME", &realtime, + "MONOTONIC", &monotonic, NULL); if (r < 0) { - free(display); - if (r == -ENOENT) return 0; - log_error("Failed to read %s: %s", u->state_file, strerror(-r)); + log_error_errno(r, "Failed to read %s: %m", u->state_file); return r; } - if (display) { + if (display) s = hashmap_get(u->manager->sessions, display); - free(display); - } if (s && s->display && display_is_local(s->display)) u->display = s; + if (realtime) { + unsigned long long l; + if (sscanf(realtime, "%llu", &l) > 0) + u->timestamp.realtime = l; + } + + if (monotonic) { + unsigned long long l; + if (sscanf(monotonic, "%llu", &l) > 0) + u->timestamp.monotonic = l; + } + return r; } @@ -230,76 +282,61 @@ static int user_mkdir_runtime_path(User *u) { assert(u); - r = safe_mkdir("/run/user", 0755, 0, 0); - if (r < 0) { - log_error("Failed to create /run/user: %s", strerror(-r)); - return r; - } + r = mkdir_safe_label("/run/user", 0755, 0, 0); + if (r < 0) + return log_error_errno(r, "Failed to create /run/user: %m"); if (!u->runtime_path) { - p = strappend("/run/user/", u->name); - - if (!p) { - log_error("Out of memory"); - return -ENOMEM; - } + if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0) + return log_oom(); } else p = u->runtime_path; - r = safe_mkdir(p, 0700, u->uid, u->gid); - if (r < 0) { - log_error("Failed to create runtime directory %s: %s", p, strerror(-r)); - free(p); - u->runtime_path = NULL; - return r; - } - - u->runtime_path = p; - return 0; -} - -static int user_create_cgroup(User *u) { - char **k; - char *p; - int r; + if (path_is_mount_point(p, false) <= 0) { + _cleanup_free_ char *t = NULL; - assert(u); + (void) mkdir(p, 0700); - if (!u->cgroup_path) { - if (asprintf(&p, "%s/%s", u->manager->cgroup_path, u->name) < 0) { - log_error("Out of memory"); - return -ENOMEM; + 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); + else + r = asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); + if (r < 0) { + r = log_oom(); + goto fail; } - } else - p = u->cgroup_path; - - r = cg_create(SYSTEMD_CGROUP_CONTROLLER, p); - if (r < 0) { - log_error("Failed to create cgroup "SYSTEMD_CGROUP_CONTROLLER":%s: %s", p, strerror(-r)); - free(p); - u->cgroup_path = NULL; - return r; - } - - u->cgroup_path = p; - STRV_FOREACH(k, u->manager->controllers) { + r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t); + if (r < 0) { + if (errno != EPERM) { + r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", p); + goto fail; + } - if (strv_contains(u->manager->reset_controllers, *k)) - continue; + /* Lacking permissions, maybe + * CAP_SYS_ADMIN-less container? In this case, + * just use a normal directory. */ - r = cg_create(*k, p); - if (r < 0) - log_warning("Failed to create cgroup %s:%s: %s", *k, p, strerror(-r)); + r = chmod_and_chown(p, 0700, u->uid, u->gid); + if (r < 0) { + log_error_errno(r, "Failed to change runtime directory ownership and mode: %m"); + goto fail; + } + } } + u->runtime_path = p; return 0; -} -static int user_start_service(User *u) { - assert(u); +fail: + if (p) { + /* Try to clean up, but ignore errors */ + (void) rmdir(p); + free(p); + } - return 0; + u->runtime_path = NULL; + return r; } int user_start(User *u) { @@ -310,24 +347,15 @@ int user_start(User *u) { if (u->started) return 0; - log_info("New user %s logged in.", u->name); + 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_create_cgroup(u); - if (r < 0) - return r; - - /* Spawn user systemd */ - r = user_start_service(u); - if (r < 0) - return r; - - dual_timestamp_get(&u->timestamp); + if (!dual_timestamp_is_set(&u->timestamp)) + dual_timestamp_get(&u->timestamp); u->started = true; @@ -339,122 +367,93 @@ int user_start(User *u) { return 0; } -static int user_stop_service(User *u) { - assert(u); - - if (!u->service) - return 0; - - return 0; -} - -static int user_shall_kill(User *u) { - assert(u); - - if (!u->manager->kill_user_processes) - return false; - - if (strv_contains(u->manager->kill_exclude_users, u->name)) - return false; - - if (strv_isempty(u->manager->kill_only_users)) - return true; - - return strv_contains(u->manager->kill_only_users, u->name); -} - -static int user_terminate_cgroup(User *u) { +static int user_remove_runtime_path(User *u) { int r; - char **k; assert(u); - if (!u->cgroup_path) + if (!u->runtime_path) return 0; - cg_trim(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, false); - - if (user_shall_kill(u)) { + r = rm_rf(u->runtime_path, 0); + if (r < 0) + log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); - r = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true); - if (r < 0) - log_error("Failed to kill user cgroup: %s", strerror(-r)); - } else { + /* Ignore cases where the directory isn't mounted, as that's + * quite possible, if we lacked the permissions to mount + * something */ + r = umount2(u->runtime_path, MNT_DETACH); + if (r < 0 && errno != EINVAL && errno != ENOENT) + log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path); - r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true); - if (r < 0) - log_error("Failed to check user cgroup: %s", strerror(-r)); - else if (r > 0) { - r = cg_delete(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path); - if (r < 0) - log_error("Failed to delete user cgroup: %s", strerror(-r)); - } else - r = -EBUSY; - } - - STRV_FOREACH(k, u->manager->controllers) - cg_trim(*k, u->cgroup_path, true); + r = rm_rf(u->runtime_path, REMOVE_ROOT); + if (r < 0) + log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); - free(u->cgroup_path); - u->cgroup_path = NULL; + free(u->runtime_path); + u->runtime_path = NULL; return r; } -static int user_remove_runtime_path(User *u) { - int r; - +int user_stop(User *u, bool force) { + Session *s; + int r = 0, k; assert(u); - if (!u->runtime_path) - return 0; + /* Stop jobs have already been queued */ + if (u->stopping) { + user_save(u); + return r; + } - r = rm_rf(u->runtime_path, false, true, false); - if (r < 0) - log_error("Failed to remove runtime directory %s: %s", u->runtime_path, strerror(-r)); + LIST_FOREACH(sessions_by_user, s, u->sessions) { + k = session_stop(s, force); + if (k < 0) + r = k; + } - free(u->runtime_path); - u->runtime_path = NULL; + u->stopping = true; + + user_save(u); return r; } -int user_stop(User *u) { +int user_finalize(User *u) { Session *s; int r = 0, k; + assert(u); if (u->started) - log_info("User %s logged out.", u->name); + log_debug("User %s logged out.", u->name); LIST_FOREACH(sessions_by_user, s, u->sessions) { - k = session_stop(s); + k = session_finalize(s); if (k < 0) r = k; } - /* Kill systemd */ - k = user_stop_service(u); - if (k < 0) - r = k; - - /* Kill cgroup */ - k = user_terminate_cgroup(u); - if (k < 0) - r = k; - /* Kill XDG_RUNTIME_DIR */ k = user_remove_runtime_path(u); if (k < 0) r = k; + /* Clean SysV + POSIX IPC objects */ + if (u->manager->remove_ipc) { + k = clean_ipc(u->uid); + if (k < 0) + r = k; + } + unlink(u->state_file); user_add_to_gc_queue(u); - if (u->started) + if (u->started) { user_send_signal(u, false); - - u->started = false; + u->started = false; + } return r; } @@ -495,37 +494,32 @@ int user_get_idle_hint(User *u, dual_timestamp *t) { return idle_hint; } -int user_check_gc(User *u, bool drop_not_started) { - int r; - char *p; +int user_check_linger_file(User *u) { + _cleanup_free_ char *cc = NULL; + char *p = NULL; - assert(u); - - if (drop_not_started && !u->started) - return 0; + cc = cescape(u->name); + if (!cc) + return -ENOMEM; - if (u->sessions) - return 1; + p = strjoina("/var/lib/systemd/linger/", cc); - if (asprintf(&p, "/var/lib/systemd/linger/%s", u->name) < 0) - return -ENOMEM; + return access(p, F_OK) >= 0; +} - r = access(p, F_OK) >= 0; - free(p); +bool user_check_gc(User *u, bool drop_not_started) { + assert(u); - if (r > 0) - return 1; + if (drop_not_started && !u->started) + return false; - if (u->cgroup_path) { - r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, false); - if (r < 0) - return r; + if (u->sessions) + return true; - if (r <= 0) - return 1; - } + if (user_check_linger_file(u) > 0) + return true; - return 0; + return false; } void user_add_to_gc_queue(User *u) { @@ -534,7 +528,7 @@ void user_add_to_gc_queue(User *u) { if (u->in_gc_queue) return; - LIST_PREPEND(User, gc_queue, u->manager->user_gc_queue, u); + LIST_PREPEND(gc_queue, u->manager->user_gc_queue, u); u->in_gc_queue = true; } @@ -543,45 +537,157 @@ UserState user_get_state(User *u) { assert(u); - if (!u->sessions) - return USER_LINGERING; + if (u->stopping) + return USER_CLOSING; + + if (u->sessions) { + bool all_closing = true; + + LIST_FOREACH(sessions_by_user, i, u->sessions) { + SessionState state; + + state = session_get_state(i); + if (state == SESSION_ACTIVE) + return USER_ACTIVE; + if (state != SESSION_CLOSING) + all_closing = false; + } - LIST_FOREACH(sessions_by_user, i, u->sessions) - if (session_is_active(i)) - return USER_ACTIVE; + return all_closing ? USER_CLOSING : USER_ONLINE; + } - return USER_ONLINE; + if (user_check_linger_file(u) > 0) + return USER_LINGERING; + + return USER_CLOSING; } int user_kill(User *u, int signo) { - int r = 0, q; - Set *pid_set = NULL; + Session *s; + int res = 0; assert(u); - if (!u->cgroup_path) - return -ESRCH; + LIST_FOREACH(sessions_by_user, s, u->sessions) { + int r = session_kill(s, KILL_ALL, signo); + if (res == 0 && r < 0) + res = r; + } - pid_set = set_new(trivial_hash_func, trivial_compare_func); - if (!pid_set) - return -ENOMEM; + return res; +} - q = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, signo, false, true, false, pid_set); - if (q < 0) - if (q != -EAGAIN && q != -ESRCH && q != -ENOENT) - r = q; +void user_elect_display(User *u) { + Session *graphical = NULL, *text = NULL, *other = NULL, *s; - if (pid_set) - set_free(pid_set); + assert(u); - return r; + /* This elects a primary session for each user, which we call + * the "display". We try to keep the assignment stable, but we + * "upgrade" to better choices. */ + + LIST_FOREACH(sessions_by_user, s, u->sessions) { + + if (s->class != SESSION_USER) + continue; + + if (s->stopping) + continue; + + if (SESSION_TYPE_IS_GRAPHICAL(s->type)) + graphical = s; + else if (s->type == SESSION_TTY) + text = s; + else + other = s; + } + + if (graphical && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping || + !SESSION_TYPE_IS_GRAPHICAL(u->display->type))) { + u->display = graphical; + return; + } + + if (text && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping || + u->display->type != SESSION_TTY)) { + u->display = text; + return; + } + + if (other && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping)) + u->display = other; } static const char* const user_state_table[_USER_STATE_MAX] = { [USER_OFFLINE] = "offline", + [USER_OPENING] = "opening", [USER_LINGERING] = "lingering", [USER_ONLINE] = "online", - [USER_ACTIVE] = "active" + [USER_ACTIVE] = "active", + [USER_CLOSING] = "closing" }; DEFINE_STRING_TABLE_LOOKUP(user_state, UserState); + +int config_parse_tmpfs_size( + const char* unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + size_t *sz = data; + const char *e; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + e = endswith(rvalue, "%"); + if (e) { + unsigned long ul; + char *f; + + 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); + 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); + return 0; + } + + *sz = PAGE_ALIGN((size_t) ((physical_memory() * (uint64_t) ul) / (uint64_t) 100)); + } else { + off_t o; + + 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); + return 0; + } + + *sz = PAGE_ALIGN((size_t) o); + } + + return 0; +}