X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind-session.c;h=0d34037b5d8cc024c17649b0dec8561d385ade80;hb=bef422ae1e7cbe77ad72dcbfe44798b0fe5e2931;hp=9af99d054a788f416c296a8db8aea2b00814545d;hpb=202630822f52e06dce8404633407329c38099278;p=elogind.git diff --git a/src/logind-session.c b/src/logind-session.c index 9af99d054..0d34037b5 100644 --- a/src/logind-session.c +++ b/src/logind-session.c @@ -23,18 +23,20 @@ #include #include -#include "logind.h" +#include "logind-session.h" #include "strv.h" #include "util.h" #include "cgroup-util.h" +#define IDLE_THRESHOLD_USEC (5*USEC_PER_MINUTE) + Session* session_new(Manager *m, User *u, const char *id) { Session *s; assert(m); assert(id); - s = new(Session, 1); + s = new0(Session, 1); if (!s) return NULL; @@ -56,7 +58,7 @@ Session* session_new(Manager *m, User *u, const char *id) { s->pipe_fd = -1; s->user = u; - dual_timestamp_get(&s->timestamp); + LIST_PREPEND(Session, sessions_by_user, u->sessions, s); return s; } @@ -64,6 +66,9 @@ Session* session_new(Manager *m, User *u, const char *id) { void session_free(Session *s) { assert(s); + if (s->in_gc_queue) + LIST_REMOVE(Session, gc_queue, s->manager->session_gc_queue, s); + if (s->user) { LIST_REMOVE(Session, sessions_by_user, s->user->sessions, s); @@ -80,6 +85,7 @@ void session_free(Session *s) { free(s->tty); free(s->display); free(s->remote_host); + free(s->remote_user); hashmap_remove(s->manager->sessions, s->id); @@ -90,19 +96,22 @@ void session_free(Session *s) { int session_save(Session *s) { FILE *f; int r = 0; + char *temp_path; assert(s); r = safe_mkdir("/run/systemd/session", 0755, 0, 0); if (r < 0) - return r; + goto finish; - f = fopen(s->state_file, "we"); - if (!f) - return -errno; + r = fopen_temporary(s->state_file, &f, &temp_path); + if (r < 0) + goto finish; assert(s->user); + fchmod(fileno(f), 0644); + fprintf(f, "# This is private data. Do not parse.\n" "UID=%lu\n" @@ -141,7 +150,12 @@ int session_save(Session *s) { "REMOTE_HOST=%s\n", s->remote_host); - if (s->seat && s->seat->manager->vtconsole == s->seat) + if (s->remote_user) + fprintf(f, + "REMOTE_USER=%s\n", + s->remote_user); + + if (s->seat && seat_is_vtconsole(s->seat)) fprintf(f, "VTNR=%i\n", s->vtnr); @@ -157,23 +171,110 @@ int session_save(Session *s) { (unsigned long long) s->audit_id); fflush(f); - if (ferror(f)) { + + if (ferror(f) || rename(temp_path, s->state_file) < 0) { r = -errno; unlink(s->state_file); + unlink(temp_path); } fclose(f); + free(temp_path); + +finish: + if (r < 0) + log_error("Failed to save session data for %s: %s", s->id, strerror(-r)); + return r; } int session_load(Session *s) { + char *remote = NULL, + *kill_processes = NULL, + *seat = NULL, + *vtnr = NULL, + *leader = NULL, + *audit_id = NULL; + + int k, r; + assert(s); - return 0; + r = parse_env_file(s->state_file, NEWLINE, + "REMOTE", &remote, + "KILL_PROCESSES", &kill_processes, + "CGROUP", &s->cgroup_path, + "SEAT", &seat, + "TTY", &s->tty, + "DISPLAY", &s->display, + "REMOTE_HOST", &s->remote_host, + "REMOTE_USER", &s->remote_user, + "VTNR", &vtnr, + "LEADER", &leader, + "AUDIT_ID", &audit_id, + NULL); + + if (r < 0) + goto finish; + + if (remote) { + k = parse_boolean(remote); + if (k >= 0) + s->remote = k; + } + + if (kill_processes) { + k = parse_boolean(kill_processes); + if (k >= 0) + s->kill_processes = k; + } + + if (seat) { + Seat *o; + + o = hashmap_get(s->manager->seats, seat); + if (o) + seat_attach_session(o, s); + } + + if (vtnr && s->seat && seat_is_vtconsole(s->seat)) { + int v; + + k = safe_atoi(vtnr, &v); + if (k >= 0 && v >= 1) + s->vtnr = v; + } + + if (leader) { + pid_t pid; + + k = parse_pid(leader, &pid); + if (k >= 0 && pid >= 1) + s->leader = pid; + } + + if (audit_id) { + uint32_t l; + + k = safe_atou32(audit_id, &l); + if (k >= 0 && l >= l) + s->audit_id = l; + } + +finish: + free(remote); + free(kill_processes); + free(seat); + free(vtnr); + free(leader); + free(audit_id); + + return r; } int session_activate(Session *s) { int r; + Session *old_active; assert(s); @@ -186,15 +287,16 @@ int session_activate(Session *s) { if (s->seat->active == s) return 0; - assert(s->manager->vtconsole == s->seat); + assert(seat_is_vtconsole(s->seat)); r = chvt(s->vtnr); if (r < 0) return r; + old_active = s->seat->active; s->seat->active = s; - return seat_apply_acls(s->seat); + return seat_apply_acls(s->seat, old_active); } bool x11_display_is_local(const char *display) { @@ -328,11 +430,6 @@ int session_start(Session *s) { assert(s); assert(s->user); - /* Create user first */ - r = user_start(s->user); - if (r < 0) - return r; - /* Create cgroup */ r = session_create_cgroup(s); if (r < 0) @@ -340,6 +437,12 @@ int session_start(Session *s) { /* Create X11 symlink */ session_link_x11_socket(s); + + /* Save session data */ + session_save(s); + + dual_timestamp_get(&s->timestamp); + return 0; } @@ -424,6 +527,9 @@ int session_stop(Session *s) { /* Remove X11 symlink */ session_unlink_x11_socket(s); + unlink(s->state_file); + session_add_to_gc_queue(s); + return r; } @@ -436,6 +542,69 @@ bool session_is_active(Session *s) { return s->seat->active == s; } +int session_get_idle_hint(Session *s, dual_timestamp *t) { + char *p; + struct stat st; + usec_t u, n; + bool b; + int k; + + assert(s); + + if (s->idle_hint) { + if (t) + *t = s->idle_hint_timestamp; + + return s->idle_hint; + } + + if (isempty(s->tty)) + goto dont_know; + + if (s->tty[0] != '/') { + p = strappend("/dev/", s->tty); + if (!p) + return -ENOMEM; + } else + p = NULL; + + if (!startswith(p ? p : s->tty, "/dev/")) { + free(p); + goto dont_know; + } + + k = lstat(p ? p : s->tty, &st); + free(p); + + if (k < 0) + goto dont_know; + + u = timespec_load(&st.st_atim); + n = now(CLOCK_REALTIME); + b = u + IDLE_THRESHOLD_USEC < n; + + if (t) + dual_timestamp_from_realtime(t, u + b ? IDLE_THRESHOLD_USEC : 0); + + return b; + +dont_know: + if (t) + *t = s->idle_hint_timestamp; + + return 0; +} + +void session_set_idle_hint(Session *s, bool b) { + assert(s); + + if (s->idle_hint == b) + return; + + s->idle_hint = b; + dual_timestamp_get(&s->idle_hint_timestamp); +} + int session_check_gc(Session *s) { int r; @@ -447,7 +616,7 @@ int session_check_gc(Session *s) { if (r < 0) return r; - if (r <= 0) + if (r == 0) return 1; } @@ -464,8 +633,18 @@ int session_check_gc(Session *s) { return 0; } +void session_add_to_gc_queue(Session *s) { + assert(s); + + if (s->in_gc_queue) + return; + + LIST_PREPEND(Session, gc_queue, s->manager->session_gc_queue, s); + s->in_gc_queue = true; +} + static const char* const session_type_table[_SESSION_TYPE_MAX] = { - [SESSION_TERMINAL] = "terminal", + [SESSION_TTY] = "tty", [SESSION_X11] = "x11" };