2011-05-23 23:55:06 +02:00
|
|
|
|
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
|
|
|
|
|
|
|
|
/***
|
|
|
|
|
This file is part of systemd.
|
|
|
|
|
|
|
|
|
|
Copyright 2011 Lennart Poettering
|
|
|
|
|
|
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
2012-04-12 00:20:58 +02:00
|
|
|
|
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
|
2011-05-23 23:55:06 +02:00
|
|
|
|
(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
|
2012-04-12 00:20:58 +02:00
|
|
|
|
Lesser General Public License for more details.
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2012-04-12 00:20:58 +02:00
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
2011-05-23 23:55:06 +02:00
|
|
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
***/
|
|
|
|
|
|
2014-03-04 19:20:21 +01:00
|
|
|
|
#include <sys/mount.h>
|
2011-05-23 23:55:06 +02:00
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
|
|
#include "util.h"
|
2012-04-10 21:54:31 +02:00
|
|
|
|
#include "mkdir.h"
|
2015-04-04 11:52:57 +02:00
|
|
|
|
#include "rm-rf.h"
|
2011-05-23 23:55:06 +02:00
|
|
|
|
#include "hashmap.h"
|
2013-02-14 12:26:13 +01:00
|
|
|
|
#include "fileio.h"
|
2014-03-04 19:20:21 +01:00
|
|
|
|
#include "path-util.h"
|
2013-06-20 03:45:08 +02:00
|
|
|
|
#include "special.h"
|
2013-07-02 01:46:30 +02:00
|
|
|
|
#include "unit-name.h"
|
2013-11-05 01:10:21 +01:00
|
|
|
|
#include "bus-util.h"
|
|
|
|
|
#include "bus-error.h"
|
2014-03-04 19:20:21 +01:00
|
|
|
|
#include "conf-parser.h"
|
2014-03-14 01:38:19 +01:00
|
|
|
|
#include "clean-ipc.h"
|
2014-10-09 11:02:47 +02:00
|
|
|
|
#include "smack-util.h"
|
2015-04-10 20:43:52 +02:00
|
|
|
|
#include "formats-util.h"
|
2015-06-17 16:29:03 +02:00
|
|
|
|
#include "label.h"
|
|
|
|
|
#include "logind-user.h"
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) {
|
|
|
|
|
User *u;
|
|
|
|
|
|
|
|
|
|
assert(m);
|
|
|
|
|
assert(name);
|
|
|
|
|
|
2011-05-25 00:55:58 +02:00
|
|
|
|
u = new0(User, 1);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (!u)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
u->name = strdup(name);
|
2013-06-20 03:45:08 +02:00
|
|
|
|
if (!u->name)
|
|
|
|
|
goto fail;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2014-04-25 13:45:15 +02:00
|
|
|
|
if (asprintf(&u->state_file, "/run/systemd/users/"UID_FMT, uid) < 0)
|
2013-06-20 03:45:08 +02:00
|
|
|
|
goto fail;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2015-01-09 16:25:47 +01:00
|
|
|
|
if (hashmap_put(m->users, UID_TO_PTR(uid), u) < 0)
|
2013-06-20 03:45:08 +02:00
|
|
|
|
goto fail;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
u->manager = m;
|
|
|
|
|
u->uid = uid;
|
|
|
|
|
u->gid = gid;
|
|
|
|
|
|
|
|
|
|
return u;
|
2013-06-20 03:45:08 +02:00
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
free(u->state_file);
|
|
|
|
|
free(u->name);
|
|
|
|
|
free(u);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void user_free(User *u) {
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2011-05-25 00:55:58 +02:00
|
|
|
|
if (u->in_gc_queue)
|
2013-10-14 06:10:14 +02:00
|
|
|
|
LIST_REMOVE(gc_queue, u->manager->user_gc_queue, u);
|
2011-05-25 00:55:58 +02:00
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
while (u->sessions)
|
|
|
|
|
session_free(u->sessions);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (u->slice) {
|
|
|
|
|
hashmap_remove(u->manager->user_units, u->slice);
|
|
|
|
|
free(u->slice);
|
2013-06-20 03:45:08 +02:00
|
|
|
|
}
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (u->service) {
|
|
|
|
|
hashmap_remove(u->manager->user_units, u->service);
|
|
|
|
|
free(u->service);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free(u->slice_job);
|
|
|
|
|
free(u->service_job);
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
free(u->runtime_path);
|
|
|
|
|
|
2015-01-09 16:25:47 +01:00
|
|
|
|
hashmap_remove(u->manager->users, UID_TO_PTR(u->uid));
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
free(u->name);
|
2011-05-25 00:58:55 +02:00
|
|
|
|
free(u->state_file);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
free(u);
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-17 17:45:49 +02:00
|
|
|
|
static int user_save_internal(User *u) {
|
2013-06-20 03:45:08 +02:00
|
|
|
|
_cleanup_free_ char *temp_path = NULL;
|
|
|
|
|
_cleanup_fclose_ FILE *f = NULL;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
assert(u->state_file);
|
|
|
|
|
|
2012-05-31 12:40:20 +02:00
|
|
|
|
r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (r < 0)
|
2015-07-29 20:31:07 +02:00
|
|
|
|
goto fail;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2011-05-25 00:55:58 +02:00
|
|
|
|
r = fopen_temporary(u->state_file, &f, &temp_path);
|
|
|
|
|
if (r < 0)
|
2015-07-29 20:31:07 +02:00
|
|
|
|
goto fail;
|
2011-05-25 00:55:58 +02:00
|
|
|
|
|
|
|
|
|
fchmod(fileno(f), 0644);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
fprintf(f,
|
2011-05-25 00:55:58 +02:00
|
|
|
|
"# This is private data. Do not parse.\n"
|
2011-05-23 23:55:06 +02:00
|
|
|
|
"NAME=%s\n"
|
|
|
|
|
"STATE=%s\n",
|
|
|
|
|
u->name,
|
|
|
|
|
user_state_to_string(user_get_state(u)));
|
|
|
|
|
|
|
|
|
|
if (u->runtime_path)
|
2013-06-20 03:45:08 +02:00
|
|
|
|
fprintf(f, "RUNTIME=%s\n", u->runtime_path);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
if (u->service)
|
2013-06-20 03:45:08 +02:00
|
|
|
|
fprintf(f, "SERVICE=%s\n", u->service);
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (u->service_job)
|
|
|
|
|
fprintf(f, "SERVICE_JOB=%s\n", u->service_job);
|
2013-06-20 03:45:08 +02:00
|
|
|
|
|
|
|
|
|
if (u->slice)
|
|
|
|
|
fprintf(f, "SLICE=%s\n", u->slice);
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (u->slice_job)
|
|
|
|
|
fprintf(f, "SLICE_JOB=%s\n", u->slice_job);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
if (u->display)
|
2013-06-20 03:45:08 +02:00
|
|
|
|
fprintf(f, "DISPLAY=%s\n", u->display->id);
|
|
|
|
|
|
|
|
|
|
if (dual_timestamp_is_set(&u->timestamp))
|
2011-05-23 23:55:06 +02:00
|
|
|
|
fprintf(f,
|
2014-02-04 01:31:53 +01:00
|
|
|
|
"REALTIME="USEC_FMT"\n"
|
|
|
|
|
"MONOTONIC="USEC_FMT"\n",
|
|
|
|
|
u->timestamp.realtime,
|
|
|
|
|
u->timestamp.monotonic);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2011-07-22 21:01:15 +02:00
|
|
|
|
if (u->sessions) {
|
|
|
|
|
Session *i;
|
2012-05-22 16:46:11 +02:00
|
|
|
|
bool first;
|
2011-07-22 21:01:15 +02:00
|
|
|
|
|
|
|
|
|
fputs("SESSIONS=", f);
|
2012-05-22 16:46:11 +02:00
|
|
|
|
first = true;
|
2011-07-22 21:01:15 +02:00
|
|
|
|
LIST_FOREACH(sessions_by_user, i, u->sessions) {
|
2012-05-22 16:46:11 +02:00
|
|
|
|
if (first)
|
|
|
|
|
first = false;
|
|
|
|
|
else
|
|
|
|
|
fputc(' ', f);
|
|
|
|
|
|
|
|
|
|
fputs(i->id, f);
|
2011-07-22 21:01:15 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-22 16:46:11 +02:00
|
|
|
|
fputs("\nSEATS=", f);
|
|
|
|
|
first = true;
|
2011-07-22 21:01:15 +02:00
|
|
|
|
LIST_FOREACH(sessions_by_user, i, u->sessions) {
|
2012-05-22 16:46:11 +02:00
|
|
|
|
if (!i->seat)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
|
first = false;
|
|
|
|
|
else
|
|
|
|
|
fputc(' ', f);
|
|
|
|
|
|
|
|
|
|
fputs(i->seat->id, f);
|
2011-07-22 21:01:15 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-22 16:46:11 +02:00
|
|
|
|
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(i->id, f);
|
|
|
|
|
}
|
2011-07-22 21:01:15 +02:00
|
|
|
|
|
2012-09-04 00:57:58 +02:00
|
|
|
|
fputs("\nONLINE_SESSIONS=", f);
|
|
|
|
|
first = true;
|
|
|
|
|
LIST_FOREACH(sessions_by_user, i, u->sessions) {
|
|
|
|
|
if (session_get_state(i) == SESSION_CLOSING)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
|
first = false;
|
|
|
|
|
else
|
|
|
|
|
fputc(' ', f);
|
|
|
|
|
|
|
|
|
|
fputs(i->id, f);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-22 16:46:11 +02:00
|
|
|
|
fputs("\nACTIVE_SEATS=", f);
|
|
|
|
|
first = true;
|
2011-07-22 21:01:15 +02:00
|
|
|
|
LIST_FOREACH(sessions_by_user, i, u->sessions) {
|
2012-05-22 16:46:11 +02:00
|
|
|
|
if (!session_is_active(i) || !i->seat)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
|
first = false;
|
|
|
|
|
else
|
2012-09-04 00:47:02 +02:00
|
|
|
|
fputc(' ', f);
|
|
|
|
|
|
|
|
|
|
fputs(i->seat->id, f);
|
2011-07-22 21:01:15 +02:00
|
|
|
|
}
|
2012-09-04 00:57:58 +02:00
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
2012-05-22 16:46:11 +02:00
|
|
|
|
fputc('\n', f);
|
2011-07-22 21:01:15 +02:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-29 20:31:07 +02:00
|
|
|
|
r = fflush_and_check(f);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
goto fail;
|
2011-05-25 00:55:58 +02:00
|
|
|
|
|
2015-07-29 20:31:07 +02:00
|
|
|
|
if (rename(temp_path, u->state_file) < 0) {
|
2011-05-23 23:55:06 +02:00
|
|
|
|
r = -errno;
|
2015-07-29 20:31:07 +02:00
|
|
|
|
goto fail;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-29 20:31:07 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
(void) unlink(u->state_file);
|
|
|
|
|
|
|
|
|
|
if (temp_path)
|
|
|
|
|
(void) unlink(temp_path);
|
2011-05-25 00:55:58 +02:00
|
|
|
|
|
2015-07-29 20:31:07 +02:00
|
|
|
|
return log_error_errno(r, "Failed to save user data %s: %m", u->state_file);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2015-06-17 17:45:49 +02:00
|
|
|
|
int user_save(User *u) {
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
if (!u->started)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return user_save_internal (u);
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
int user_load(User *u) {
|
2013-06-20 03:45:08 +02:00
|
|
|
|
_cleanup_free_ char *display = NULL, *realtime = NULL, *monotonic = NULL;
|
2011-06-24 18:50:50 +02:00
|
|
|
|
Session *s = NULL;
|
2013-06-20 03:45:08 +02:00
|
|
|
|
int r;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2011-06-17 15:59:18 +02:00
|
|
|
|
r = parse_env_file(u->state_file, NEWLINE,
|
2013-07-02 01:46:30 +02:00
|
|
|
|
"RUNTIME", &u->runtime_path,
|
|
|
|
|
"SERVICE", &u->service,
|
|
|
|
|
"SERVICE_JOB", &u->service_job,
|
|
|
|
|
"SLICE", &u->slice,
|
|
|
|
|
"SLICE_JOB", &u->slice_job,
|
|
|
|
|
"DISPLAY", &display,
|
|
|
|
|
"REALTIME", &realtime,
|
|
|
|
|
"MONOTONIC", &monotonic,
|
2011-05-23 23:55:06 +02:00
|
|
|
|
NULL);
|
|
|
|
|
if (r < 0) {
|
|
|
|
|
if (r == -ENOENT)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2014-11-28 13:19:16 +01:00
|
|
|
|
log_error_errno(r, "Failed to read %s: %m", u->state_file);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-20 03:45:08 +02:00
|
|
|
|
if (display)
|
2011-06-24 18:50:50 +02:00
|
|
|
|
s = hashmap_get(u->manager->sessions, display);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2011-06-27 22:44:12 +02:00
|
|
|
|
if (s && s->display && display_is_local(s->display))
|
2011-05-23 23:55:06 +02:00
|
|
|
|
u->display = s;
|
|
|
|
|
|
2013-06-20 03:45:08 +02:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int user_mkdir_runtime_path(User *u) {
|
|
|
|
|
char *p;
|
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2012-05-31 12:40:20 +02:00
|
|
|
|
r = mkdir_safe_label("/run/user", 0755, 0, 0);
|
2014-11-28 18:50:43 +01:00
|
|
|
|
if (r < 0)
|
|
|
|
|
return log_error_errno(r, "Failed to create /run/user: %m");
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
if (!u->runtime_path) {
|
2014-03-04 19:20:21 +01:00
|
|
|
|
if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0)
|
2012-07-25 23:55:59 +02:00
|
|
|
|
return log_oom();
|
2011-05-23 23:55:06 +02:00
|
|
|
|
} else
|
|
|
|
|
p = u->runtime_path;
|
|
|
|
|
|
2015-05-29 17:13:12 +02:00
|
|
|
|
if (path_is_mount_point(p, 0) <= 0) {
|
2014-03-04 19:20:21 +01:00
|
|
|
|
_cleanup_free_ char *t = NULL;
|
|
|
|
|
|
2015-06-17 16:29:03 +02:00
|
|
|
|
(void) mkdir_label(p, 0700);
|
2014-03-04 19:20:21 +01:00
|
|
|
|
|
2014-10-23 17:34:30 +02:00
|
|
|
|
if (mac_smack_use())
|
2014-10-09 11:02:47 +02:00
|
|
|
|
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) {
|
2014-03-04 19:20:21 +01:00
|
|
|
|
r = log_oom();
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t);
|
|
|
|
|
if (r < 0) {
|
2015-01-27 18:58:40 +01:00
|
|
|
|
if (errno != EPERM) {
|
|
|
|
|
r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", p);
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Lacking permissions, maybe
|
|
|
|
|
* CAP_SYS_ADMIN-less container? In this case,
|
|
|
|
|
* just use a normal directory. */
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
2014-03-04 19:20:21 +01:00
|
|
|
|
}
|
2015-06-17 16:29:03 +02:00
|
|
|
|
|
|
|
|
|
r = label_fix(p, false, false);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
u->runtime_path = p;
|
|
|
|
|
return 0;
|
2014-03-04 19:20:21 +01:00
|
|
|
|
|
|
|
|
|
fail:
|
2015-01-23 15:26:18 +01:00
|
|
|
|
if (p) {
|
|
|
|
|
/* Try to clean up, but ignore errors */
|
|
|
|
|
(void) rmdir(p);
|
|
|
|
|
free(p);
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-04 19:20:21 +01:00
|
|
|
|
u->runtime_path = NULL;
|
|
|
|
|
return r;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
static int user_start_slice(User *u) {
|
|
|
|
|
char *job;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (!u->slice) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
|
2014-04-25 13:45:15 +02:00
|
|
|
|
char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice;
|
|
|
|
|
sprintf(lu, UID_FMT, u->uid);
|
2013-04-23 04:10:13 +02:00
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
|
r = slice_build_subslice(SPECIAL_USER_SLICE, lu, &slice);
|
2013-06-20 03:45:08 +02:00
|
|
|
|
if (r < 0)
|
|
|
|
|
return r;
|
|
|
|
|
|
2013-07-02 17:17:35 +02:00
|
|
|
|
r = manager_start_unit(u->manager, slice, &error, &job);
|
|
|
|
|
if (r < 0) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
log_error("Failed to start user slice: %s", bus_error_message(&error, r));
|
2013-07-02 17:17:35 +02:00
|
|
|
|
free(slice);
|
|
|
|
|
} else {
|
|
|
|
|
u->slice = slice;
|
|
|
|
|
|
|
|
|
|
free(u->slice_job);
|
|
|
|
|
u->slice_job = job;
|
|
|
|
|
}
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-07-02 17:17:35 +02:00
|
|
|
|
if (u->slice)
|
|
|
|
|
hashmap_put(u->manager->user_units, u->slice, u);
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int user_start_service(User *u) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
|
2013-07-02 01:46:30 +02:00
|
|
|
|
char *job;
|
|
|
|
|
int r;
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
assert(u);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (!u->service) {
|
2014-04-25 13:45:15 +02:00
|
|
|
|
char lu[DECIMAL_STR_MAX(uid_t) + 1], *service;
|
|
|
|
|
sprintf(lu, UID_FMT, u->uid);
|
2013-07-02 01:46:30 +02:00
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
|
r = unit_name_build("user", lu, ".service", &service);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
return log_error_errno(r, "Failed to build service name: %m");
|
2013-07-02 01:46:30 +02:00
|
|
|
|
|
2013-07-02 17:17:35 +02:00
|
|
|
|
r = manager_start_unit(u->manager, service, &error, &job);
|
|
|
|
|
if (r < 0) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
log_error("Failed to start user service: %s", bus_error_message(&error, r));
|
2013-07-02 17:17:35 +02:00
|
|
|
|
free(service);
|
|
|
|
|
} else {
|
|
|
|
|
u->service = service;
|
|
|
|
|
|
|
|
|
|
free(u->service_job);
|
|
|
|
|
u->service_job = job;
|
|
|
|
|
}
|
2013-07-02 01:46:30 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-07-02 17:17:35 +02:00
|
|
|
|
if (u->service)
|
|
|
|
|
hashmap_put(u->manager->user_units, u->service, u);
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int user_start(User *u) {
|
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2011-06-21 21:46:13 +02:00
|
|
|
|
if (u->started)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2012-01-16 13:18:17 +01:00
|
|
|
|
log_debug("New user %s logged in.", u->name);
|
2011-06-24 19:42:45 +02:00
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
/* Make XDG_RUNTIME_DIR */
|
|
|
|
|
r = user_mkdir_runtime_path(u);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
return r;
|
|
|
|
|
|
|
|
|
|
/* Create cgroup */
|
2013-07-02 01:46:30 +02:00
|
|
|
|
r = user_start_slice(u);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (r < 0)
|
|
|
|
|
return r;
|
|
|
|
|
|
2015-06-17 17:45:49 +02:00
|
|
|
|
/* 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);
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
/* Spawn user systemd */
|
|
|
|
|
r = user_start_service(u);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
return r;
|
|
|
|
|
|
2013-06-20 03:45:08 +02:00
|
|
|
|
if (!dual_timestamp_is_set(&u->timestamp))
|
|
|
|
|
dual_timestamp_get(&u->timestamp);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2011-06-21 21:46:13 +02:00
|
|
|
|
u->started = true;
|
|
|
|
|
|
2011-06-28 03:52:22 +02:00
|
|
|
|
/* Save new user data */
|
|
|
|
|
user_save(u);
|
|
|
|
|
|
2011-06-21 20:43:34 +02:00
|
|
|
|
user_send_signal(u, true);
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
static int user_stop_slice(User *u) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
|
2013-07-02 01:46:30 +02:00
|
|
|
|
char *job;
|
|
|
|
|
int r;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (!u->slice)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
r = manager_stop_unit(u->manager, u->slice, &error, &job);
|
|
|
|
|
if (r < 0) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
log_error("Failed to stop user slice: %s", bus_error_message(&error, r));
|
2013-07-02 01:46:30 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
2011-06-24 19:42:45 +02:00
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
free(u->slice_job);
|
|
|
|
|
u->slice_job = job;
|
2011-06-24 19:42:45 +02:00
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
return r;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
static int user_stop_service(User *u) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
|
2013-07-02 01:46:30 +02:00
|
|
|
|
char *job;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (!u->service)
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
r = manager_stop_unit(u->manager, u->service, &error, &job);
|
|
|
|
|
if (r < 0) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
log_error("Failed to stop user service: %s", bus_error_message(&error, r));
|
2013-07-02 01:46:30 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
free(u->service_job);
|
|
|
|
|
u->service_job = job;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
static int user_remove_runtime_path(User *u) {
|
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
if (!u->runtime_path)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2015-04-04 11:52:57 +02:00
|
|
|
|
r = rm_rf(u->runtime_path, 0);
|
2014-03-04 19:20:21 +01:00
|
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
|
log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
|
2014-03-04 19:20:21 +01:00
|
|
|
|
|
2015-01-27 18:58:40 +01:00
|
|
|
|
/* 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)
|
2014-11-28 19:29:59 +01:00
|
|
|
|
log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path);
|
2014-03-04 19:20:21 +01:00
|
|
|
|
|
2015-04-04 11:52:57 +02:00
|
|
|
|
r = rm_rf(u->runtime_path, REMOVE_ROOT);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (r < 0)
|
2014-11-28 13:19:16 +01:00
|
|
|
|
log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2015-09-08 18:43:11 +02:00
|
|
|
|
u->runtime_path = mfree(u->runtime_path);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-09 02:29:56 +01:00
|
|
|
|
int user_stop(User *u, bool force) {
|
2011-05-23 23:55:06 +02:00
|
|
|
|
Session *s;
|
|
|
|
|
int r = 0, k;
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2014-02-13 18:31:43 +01:00
|
|
|
|
/* Stop jobs have already been queued */
|
|
|
|
|
if (u->stopping) {
|
|
|
|
|
user_save(u);
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
LIST_FOREACH(sessions_by_user, s, u->sessions) {
|
2014-02-09 02:29:56 +01:00
|
|
|
|
k = session_stop(s, force);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Kill systemd */
|
|
|
|
|
k = user_stop_service(u);
|
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
|
|
|
|
|
/* Kill cgroup */
|
2013-07-02 01:46:30 +02:00
|
|
|
|
k = user_stop_slice(u);
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
|
2014-02-06 18:32:14 +01:00
|
|
|
|
u->stopping = true;
|
|
|
|
|
|
2013-08-13 17:59:28 +02:00
|
|
|
|
user_save(u);
|
|
|
|
|
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int user_finalize(User *u) {
|
|
|
|
|
Session *s;
|
|
|
|
|
int r = 0, k;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
if (u->started)
|
|
|
|
|
log_debug("User %s logged out.", u->name);
|
|
|
|
|
|
|
|
|
|
LIST_FOREACH(sessions_by_user, s, u->sessions) {
|
|
|
|
|
k = session_finalize(s);
|
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
/* Kill XDG_RUNTIME_DIR */
|
|
|
|
|
k = user_remove_runtime_path(u);
|
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
|
2014-03-14 01:38:19 +01:00
|
|
|
|
/* Clean SysV + POSIX IPC objects */
|
|
|
|
|
if (u->manager->remove_ipc) {
|
|
|
|
|
k = clean_ipc(u->uid);
|
|
|
|
|
if (k < 0)
|
|
|
|
|
r = k;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-25 00:58:55 +02:00
|
|
|
|
unlink(u->state_file);
|
|
|
|
|
user_add_to_gc_queue(u);
|
|
|
|
|
|
2013-08-13 17:59:28 +02:00
|
|
|
|
if (u->started) {
|
2011-06-24 19:42:45 +02:00
|
|
|
|
user_send_signal(u, false);
|
2013-08-13 17:59:28 +02:00
|
|
|
|
u->started = false;
|
|
|
|
|
}
|
2011-06-21 21:46:13 +02:00
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2011-06-17 15:59:18 +02:00
|
|
|
|
int user_get_idle_hint(User *u, dual_timestamp *t) {
|
|
|
|
|
Session *s;
|
|
|
|
|
bool idle_hint = true;
|
2015-06-16 01:08:12 +02:00
|
|
|
|
dual_timestamp ts = DUAL_TIMESTAMP_NULL;
|
2011-06-17 15:59:18 +02:00
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
LIST_FOREACH(sessions_by_user, s, u->sessions) {
|
|
|
|
|
dual_timestamp k;
|
|
|
|
|
int ih;
|
|
|
|
|
|
|
|
|
|
ih = session_get_idle_hint(s, &k);
|
|
|
|
|
if (ih < 0)
|
|
|
|
|
return ih;
|
|
|
|
|
|
|
|
|
|
if (!ih) {
|
|
|
|
|
if (!idle_hint) {
|
|
|
|
|
if (k.monotonic < ts.monotonic)
|
|
|
|
|
ts = k;
|
|
|
|
|
} else {
|
|
|
|
|
idle_hint = false;
|
|
|
|
|
ts = k;
|
|
|
|
|
}
|
|
|
|
|
} else if (idle_hint) {
|
|
|
|
|
|
|
|
|
|
if (k.monotonic > ts.monotonic)
|
|
|
|
|
ts = k;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (t)
|
|
|
|
|
*t = ts;
|
|
|
|
|
|
|
|
|
|
return idle_hint;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-05 01:27:27 +01:00
|
|
|
|
int user_check_linger_file(User *u) {
|
2013-11-05 01:10:21 +01:00
|
|
|
|
_cleanup_free_ char *cc = NULL;
|
|
|
|
|
char *p = NULL;
|
2012-05-31 19:47:52 +02:00
|
|
|
|
|
2013-11-05 01:10:21 +01:00
|
|
|
|
cc = cescape(u->name);
|
|
|
|
|
if (!cc)
|
2012-05-31 19:47:52 +02:00
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
2015-02-03 02:05:59 +01:00
|
|
|
|
p = strjoina("/var/lib/systemd/linger/", cc);
|
2012-05-31 19:47:52 +02:00
|
|
|
|
|
2013-11-05 01:10:21 +01:00
|
|
|
|
return access(p, F_OK) >= 0;
|
2012-05-31 19:47:52 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-11-05 01:10:21 +01:00
|
|
|
|
bool user_check_gc(User *u, bool drop_not_started) {
|
2011-05-23 23:55:06 +02:00
|
|
|
|
assert(u);
|
|
|
|
|
|
2011-06-29 03:48:16 +02:00
|
|
|
|
if (drop_not_started && !u->started)
|
2013-11-05 01:10:21 +01:00
|
|
|
|
return false;
|
2011-06-29 00:06:04 +02:00
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
if (u->sessions)
|
2013-11-05 01:10:21 +01:00
|
|
|
|
return true;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2012-05-31 19:47:52 +02:00
|
|
|
|
if (user_check_linger_file(u) > 0)
|
2013-11-05 01:10:21 +01:00
|
|
|
|
return true;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2013-11-05 01:10:21 +01:00
|
|
|
|
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;
|
2013-08-13 17:59:28 +02:00
|
|
|
|
|
2013-11-05 01:10:21 +01:00
|
|
|
|
return false;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-25 00:55:58 +02:00
|
|
|
|
void user_add_to_gc_queue(User *u) {
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
if (u->in_gc_queue)
|
|
|
|
|
return;
|
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
|
LIST_PREPEND(gc_queue, u->manager->user_gc_queue, u);
|
2011-05-25 00:55:58 +02:00
|
|
|
|
u->in_gc_queue = true;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
UserState user_get_state(User *u) {
|
|
|
|
|
Session *i;
|
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2014-02-06 18:32:14 +01:00
|
|
|
|
if (u->stopping)
|
|
|
|
|
return USER_CLOSING;
|
|
|
|
|
|
2015-06-17 17:45:49 +02:00
|
|
|
|
if (!u->started || u->slice_job || u->service_job)
|
2013-08-13 17:59:28 +02:00
|
|
|
|
return USER_OPENING;
|
2012-09-04 00:47:01 +02:00
|
|
|
|
|
2014-02-06 18:32:14 +01:00
|
|
|
|
if (u->sessions) {
|
|
|
|
|
bool all_closing = true;
|
|
|
|
|
|
|
|
|
|
LIST_FOREACH(sessions_by_user, i, u->sessions) {
|
2014-02-08 20:51:57 +01:00
|
|
|
|
SessionState state;
|
|
|
|
|
|
|
|
|
|
state = session_get_state(i);
|
|
|
|
|
if (state == SESSION_ACTIVE)
|
2014-02-06 18:32:14 +01:00
|
|
|
|
return USER_ACTIVE;
|
2014-02-08 20:51:57 +01:00
|
|
|
|
if (state != SESSION_CLOSING)
|
2014-02-06 18:32:14 +01:00
|
|
|
|
all_closing = false;
|
|
|
|
|
}
|
2011-05-23 23:55:06 +02:00
|
|
|
|
|
2012-09-04 00:47:01 +02:00
|
|
|
|
return all_closing ? USER_CLOSING : USER_ONLINE;
|
2014-02-06 18:32:14 +01:00
|
|
|
|
}
|
2012-05-31 19:47:52 +02:00
|
|
|
|
|
|
|
|
|
if (user_check_linger_file(u) > 0)
|
|
|
|
|
return USER_LINGERING;
|
|
|
|
|
|
|
|
|
|
return USER_CLOSING;
|
2011-05-23 23:55:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-07-13 19:58:35 +02:00
|
|
|
|
int user_kill(User *u, int signo) {
|
|
|
|
|
assert(u);
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
if (!u->slice)
|
2011-07-13 19:58:35 +02:00
|
|
|
|
return -ESRCH;
|
|
|
|
|
|
2013-07-02 01:46:30 +02:00
|
|
|
|
return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL);
|
2011-07-13 19:58:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2015-06-10 01:27:32 +02:00
|
|
|
|
static bool elect_display_filter(Session *s) {
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
/* Return true if the session is a candidate for the user’s ‘primary
|
|
|
|
|
* session’ or ‘display’. */
|
|
|
|
|
assert(s);
|
|
|
|
|
|
|
|
|
|
return (s->class == SESSION_USER && !s->stopping);
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-10 01:27:32 +02:00
|
|
|
|
static int elect_display_compare(Session *s1, Session *s2) {
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
/* Indexed by SessionType. Lower numbers mean more preferred. */
|
|
|
|
|
const int type_ranks[_SESSION_TYPE_MAX] = {
|
|
|
|
|
[SESSION_UNSPECIFIED] = 0,
|
|
|
|
|
[SESSION_TTY] = -2,
|
|
|
|
|
[SESSION_X11] = -3,
|
|
|
|
|
[SESSION_WAYLAND] = -3,
|
|
|
|
|
[SESSION_MIR] = -3,
|
|
|
|
|
[SESSION_WEB] = -1,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Calculate the partial order relationship between s1 and s2,
|
|
|
|
|
* returning < 0 if s1 is preferred as the user’s ‘primary session’,
|
|
|
|
|
* 0 if s1 and s2 are equally preferred or incomparable, or > 0 if s2
|
|
|
|
|
* is preferred.
|
|
|
|
|
*
|
|
|
|
|
* s1 or s2 may be NULL. */
|
2015-06-12 11:37:11 +02:00
|
|
|
|
if (!s1 && !s2)
|
|
|
|
|
return 0;
|
|
|
|
|
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
if ((s1 == NULL) != (s2 == NULL))
|
|
|
|
|
return (s1 == NULL) - (s2 == NULL);
|
|
|
|
|
|
|
|
|
|
if (s1->stopping != s2->stopping)
|
|
|
|
|
return s1->stopping - s2->stopping;
|
|
|
|
|
|
|
|
|
|
if ((s1->class != SESSION_USER) != (s2->class != SESSION_USER))
|
|
|
|
|
return (s1->class != SESSION_USER) - (s2->class != SESSION_USER);
|
|
|
|
|
|
|
|
|
|
if ((s1->type == _SESSION_TYPE_INVALID) != (s2->type == _SESSION_TYPE_INVALID))
|
|
|
|
|
return (s1->type == _SESSION_TYPE_INVALID) - (s2->type == _SESSION_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
if (s1->type != s2->type)
|
|
|
|
|
return type_ranks[s1->type] - type_ranks[s2->type];
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-19 02:03:20 +02:00
|
|
|
|
void user_elect_display(User *u) {
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
Session *s;
|
2014-05-19 02:03:20 +02:00
|
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
log_debug("Electing new display for user %s", u->name);
|
2014-05-19 02:03:20 +02:00
|
|
|
|
|
|
|
|
|
LIST_FOREACH(sessions_by_user, s, u->sessions) {
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
if (!elect_display_filter(s)) {
|
|
|
|
|
log_debug("Ignoring session %s", s->id);
|
2014-05-19 02:03:20 +02:00
|
|
|
|
continue;
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
}
|
2014-05-19 02:03:20 +02:00
|
|
|
|
|
logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).
If another session is started, on a different VT, the sessions_by_user
list becomes:
c1, type = SESSION_X11, !stopping, class = SESSION_USER
c2, type = SESSION_TTY, !stopping, class = SESSION_USER
In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.
Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.
https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-05-29 11:49:21 +02:00
|
|
|
|
if (elect_display_compare(s, u->display) < 0) {
|
|
|
|
|
log_debug("Choosing session %s in preference to %s", s->id, u->display ? u->display->id : "-");
|
|
|
|
|
u->display = s;
|
|
|
|
|
}
|
2014-08-14 02:59:02 +02:00
|
|
|
|
}
|
2014-05-19 02:03:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-23 23:55:06 +02:00
|
|
|
|
static const char* const user_state_table[_USER_STATE_MAX] = {
|
|
|
|
|
[USER_OFFLINE] = "offline",
|
2013-07-02 01:46:30 +02:00
|
|
|
|
[USER_OPENING] = "opening",
|
2011-05-23 23:55:06 +02:00
|
|
|
|
[USER_LINGERING] = "lingering",
|
|
|
|
|
[USER_ONLINE] = "online",
|
2012-05-31 19:47:52 +02:00
|
|
|
|
[USER_ACTIVE] = "active",
|
|
|
|
|
[USER_CLOSING] = "closing"
|
2011-05-23 23:55:06 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
DEFINE_STRING_TABLE_LOOKUP(user_state, UserState);
|
2014-03-04 19:20:21 +01:00
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|