X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=89d8bee2a2120a48c1472e3a245df589f111cbd5;hb=1e2579fdeb7608719cb28da0b5061f48ba0efc34;hp=d65451df581913267c44e256986252dca4de7c85;hpb=689b9a22f7fa89686b2b5240b7ee9f449dea5630;p=elogind.git

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d65451df5..89d8bee2a 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -33,6 +33,7 @@
 #include "sd-daemon.h"
 #include "socket-util.h"
 #include "acl-util.h"
+#include "cgroup-util.h"
 
 typedef struct Server {
         int syslog_fd;
@@ -42,6 +43,8 @@ typedef struct Server {
         JournalFile *runtime_journal;
         JournalFile *system_journal;
         Hashmap *user_journals;
+
+        uint64_t seqnum;
 } Server;
 
 static void fix_perms(JournalFile *f, uid_t uid) {
@@ -94,6 +97,8 @@ static JournalFile* find_journal(Server *s, uid_t uid) {
         char *p;
         int r;
         JournalFile *f;
+        char ids[33];
+        sd_id128_t machine;
 
         assert(s);
 
@@ -104,14 +109,18 @@ static JournalFile* find_journal(Server *s, uid_t uid) {
         if (uid <= 0)
                 return s->system_journal;
 
+        r = sd_id128_get_machine(&machine);
+        if (r < 0)
+                return s->system_journal;
+
         f = hashmap_get(s->user_journals, UINT32_TO_PTR(uid));
         if (f)
                 return f;
 
-        if (asprintf(&p, "/var/log/journal/%lu.journal", (unsigned long) uid) < 0)
+        if (asprintf(&p, "/var/log/journal/%s/user-%lu.journal", sd_id128_to_string(machine, ids), (unsigned long) uid) < 0)
                 return s->system_journal;
 
-        r = journal_file_open(p, O_RDWR|O_CREAT, 0640, &f);
+        r = journal_file_open(p, O_RDWR|O_CREAT, 0640, s->system_journal, &f);
         free(p);
 
         if (r < 0)
@@ -134,15 +143,15 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
                 *comm = NULL, *cmdline = NULL, *hostname = NULL,
                 *audit_session = NULL, *audit_loginuid = NULL,
                 *syslog_priority = NULL, *syslog_facility = NULL,
-                *exe = NULL;
-        struct iovec iovec[15];
+                *exe = NULL, *cgroup = NULL;
+        struct iovec iovec[17];
         unsigned n = 0;
         char idbuf[33];
         sd_id128_t id;
         int r;
         char *t;
         int priority = LOG_USER | LOG_INFO;
-        uid_t loginuid = 0;
+        uid_t loginuid = 0, realuid = 0;
         JournalFile *f;
 
         parse_syslog_priority((char**) &buf, &priority);
@@ -160,19 +169,22 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
 
         if (ucred) {
                 uint32_t session;
+                char *path;
+
+                realuid = ucred->uid;
 
-                if (asprintf(&pid, "PID=%lu", (unsigned long) ucred->pid) >= 0)
+                if (asprintf(&pid, "_PID=%lu", (unsigned long) ucred->pid) >= 0)
                         IOVEC_SET_STRING(iovec[n++], pid);
 
-                if (asprintf(&uid, "UID=%lu", (unsigned long) ucred->uid) >= 0)
+                if (asprintf(&uid, "_UID=%lu", (unsigned long) ucred->uid) >= 0)
                         IOVEC_SET_STRING(iovec[n++], uid);
 
-                if (asprintf(&gid, "GID=%lu", (unsigned long) ucred->gid) >= 0)
+                if (asprintf(&gid, "_GID=%lu", (unsigned long) ucred->gid) >= 0)
                         IOVEC_SET_STRING(iovec[n++], gid);
 
                 r = get_process_comm(ucred->pid, &t);
                 if (r >= 0) {
-                        comm = strappend("COMM=", t);
+                        comm = strappend("_COMM=", t);
                         if (comm)
                                 IOVEC_SET_STRING(iovec[n++], comm);
                         free(t);
@@ -180,7 +192,7 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
 
                 r = get_process_exe(ucred->pid, &t);
                 if (r >= 0) {
-                        exe = strappend("EXE=", t);
+                        exe = strappend("_EXE=", t);
                         if (comm)
                                 IOVEC_SET_STRING(iovec[n++], exe);
                         free(t);
@@ -188,7 +200,7 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
 
                 r = get_process_cmdline(ucred->pid, LINE_MAX, false, &t);
                 if (r >= 0) {
-                        cmdline = strappend("CMDLINE=", t);
+                        cmdline = strappend("_CMDLINE=", t);
                         if (cmdline)
                                 IOVEC_SET_STRING(iovec[n++], cmdline);
                         free(t);
@@ -196,44 +208,55 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
 
                 r = audit_session_from_pid(ucred->pid, &session);
                 if (r >= 0)
-                        if (asprintf(&audit_session, "AUDIT_SESSION=%lu", (unsigned long) session) >= 0)
+                        if (asprintf(&audit_session, "_AUDIT_SESSION=%lu", (unsigned long) session) >= 0)
                                 IOVEC_SET_STRING(iovec[n++], audit_session);
 
                 r = audit_loginuid_from_pid(ucred->pid, &loginuid);
                 if (r >= 0)
-                        if (asprintf(&audit_loginuid, "AUDIT_LOGINUID=%lu", (unsigned long) loginuid) >= 0)
+                        if (asprintf(&audit_loginuid, "_AUDIT_LOGINUID=%lu", (unsigned long) loginuid) >= 0)
                                 IOVEC_SET_STRING(iovec[n++], audit_loginuid);
+
+                r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, ucred->pid, &path);
+                if (r >= 0) {
+                        cgroup = strappend("_SYSTEMD_CGROUP=", path);
+                        if (cgroup)
+                                IOVEC_SET_STRING(iovec[n++], cgroup);
+                        free(path);
+                }
         }
 
         if (tv) {
-                if (asprintf(&source_time, "SOURCE_REALTIME_TIMESTAMP=%llu",
+                if (asprintf(&source_time, "_SOURCE_REALTIME_TIMESTAMP=%llu",
                              (unsigned long long) timeval_load(tv)) >= 0)
                         IOVEC_SET_STRING(iovec[n++], source_time);
         }
 
+        /* Note that strictly speaking storing the boot id here is
+         * redundant since the entry includes this in-line
+         * anyway. However, we need this indexed, too. */
         r = sd_id128_get_boot(&id);
         if (r >= 0)
-                if (asprintf(&boot_id, "BOOT_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
+                if (asprintf(&boot_id, "_BOOT_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
                         IOVEC_SET_STRING(iovec[n++], boot_id);
 
         r = sd_id128_get_machine(&id);
         if (r >= 0)
-                if (asprintf(&machine_id, "MACHINE_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
+                if (asprintf(&machine_id, "_MACHINE_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
                         IOVEC_SET_STRING(iovec[n++], machine_id);
 
         t = gethostname_malloc();
         if (t) {
-                hostname = strappend("HOSTNAME=", t);
+                hostname = strappend("_HOSTNAME=", t);
                 if (hostname)
                         IOVEC_SET_STRING(iovec[n++], hostname);
                 free(t);
         }
 
-        f = find_journal(s, loginuid);
+        f = find_journal(s, realuid == 0 ? 0 : loginuid);
         if (!f)
                 log_warning("Dropping message, as we can't find a place to store the data.");
         else {
-                r = journal_file_append_entry(f, NULL, iovec, n, NULL, NULL);
+                r = journal_file_append_entry(f, NULL, iovec, n, &s->seqnum, NULL, NULL);
 
                 if (r < 0)
                         log_error("Failed to write entry, ignoring: %s", strerror(-r));
@@ -244,6 +267,7 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
         free(uid);
         free(gid);
         free(comm);
+        free(exe);
         free(cmdline);
         free(source_time);
         free(boot_id);
@@ -253,6 +277,7 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str
         free(audit_loginuid);
         free(syslog_facility);
         free(syslog_priority);
+        free(cgroup);
 }
 
 static int process_event(Server *s, struct epoll_event *ev) {
@@ -349,6 +374,60 @@ static int process_event(Server *s, struct epoll_event *ev) {
         return 0;
 }
 
+static int system_journal_open(Server *s) {
+        int r;
+        char *fn;
+        sd_id128_t machine;
+        char ids[33];
+
+        r = sd_id128_get_machine(&machine);
+        if (r < 0)
+                return r;
+
+        /* First try to create the machine path, but not the prefix */
+        fn = strappend("/var/log/journal/", sd_id128_to_string(machine, ids));
+        if (!fn)
+                return -ENOMEM;
+        (void) mkdir(fn, 0755);
+        free(fn);
+
+        /* The create the system journal file */
+        fn = join("/var/log/journal/", ids, "/system.journal", NULL);
+        if (!fn)
+                return -ENOMEM;
+
+        r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->system_journal);
+        free(fn);
+
+        if (r >= 0) {
+                fix_perms(s->system_journal, 0);
+                return r;
+        }
+
+        if (r < 0 && r != -ENOENT) {
+                log_error("Failed to open system journal: %s", strerror(-r));
+                return r;
+        }
+
+        /* /var didn't work, so try /run, but this time we
+         * create the prefix too */
+        fn = join("/run/log/journal/", ids, "/system.journal", NULL);
+        if (!fn)
+                return -ENOMEM;
+
+        (void) mkdir_parents(fn, 0755);
+        r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->runtime_journal);
+        free(fn);
+
+        if (r < 0) {
+                log_error("Failed to open runtime journal: %s", strerror(-r));
+                return r;
+        }
+
+        fix_perms(s->runtime_journal, 0);
+        return r;
+}
+
 static int server_init(Server *s) {
         int n, one, r;
         struct epoll_event ev;
@@ -430,21 +509,9 @@ static int server_init(Server *s) {
                 return -ENOMEM;
         }
 
-        r = journal_file_open("/var/log/journal/system.journal", O_RDWR|O_CREAT, 0640, &s->system_journal);
-        if (r >= 0)
-                fix_perms(s->system_journal, 0);
-        else if (r == -ENOENT) {
-                mkdir_p("/run/log/journal", 0755);
-
-                r = journal_file_open("/run/log/journal/system.journal", O_RDWR|O_CREAT, 0640, &s->runtime_journal);
-                if (r >= 0)
-                        fix_perms(s->runtime_journal, 0);
-        }
-
-        if (r < 0 && r != -ENOENT) {
-                log_error("Failed to open journal: %s", strerror(-r));
+        r = system_journal_open(s);
+        if (r < 0)
                 return r;
-        }
 
         assert_se(sigemptyset(&mask) == 0);
         sigset_add_many(&mask, SIGINT, SIGTERM, -1);
@@ -522,7 +589,7 @@ int main(int argc, char *argv[]) {
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing messages...");
-
+#
         for (;;) {
                 struct epoll_event event;