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=94261f676350d6834b53d9ce222c975a4decb462;hpb=250d54b5bee6a46fe1c1626211e3a7e238eda628;p=elogind.git diff --git a/src/journal/journald.c b/src/journal/journald.c index 94261f676..89d8bee2a 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -43,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) { @@ -95,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); @@ -105,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) @@ -136,14 +144,14 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str *audit_session = NULL, *audit_loginuid = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *exe = NULL, *cgroup = NULL; - struct iovec iovec[16]; + 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); @@ -163,18 +171,20 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str uint32_t session; char *path; - if (asprintf(&pid, "PID=%lu", (unsigned long) ucred->pid) >= 0) + realuid = ucred->uid; + + 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); @@ -182,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); @@ -190,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); @@ -198,17 +208,17 @@ 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); + cgroup = strappend("_SYSTEMD_CGROUP=", path); if (cgroup) IOVEC_SET_STRING(iovec[n++], cgroup); free(path); @@ -216,7 +226,7 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str } 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); } @@ -226,27 +236,27 @@ static void process_message(Server *s, const char *buf, struct ucred *ucred, str * 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)); @@ -386,7 +396,7 @@ static int system_journal_open(Server *s) { if (!fn) return -ENOMEM; - r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, &s->system_journal); + r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->system_journal); free(fn); if (r >= 0) { @@ -401,17 +411,12 @@ static int system_journal_open(Server *s) { /* /var didn't work, so try /run, but this time we * create the prefix too */ - fn = strappend("/run/log/journal/", ids); - if (!fn) - return -ENOMEM; - (void) mkdir_p(fn, 0755); - free(fn); - - /* Then create the runtime journal file */ fn = join("/run/log/journal/", ids, "/system.journal", NULL); if (!fn) return -ENOMEM; - r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, &s->runtime_journal); + + (void) mkdir_parents(fn, 0755); + r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->runtime_journal); free(fn); if (r < 0) { @@ -584,7 +589,7 @@ int main(int argc, char *argv[]) { sd_notify(false, "READY=1\n" "STATUS=Processing messages..."); - +# for (;;) { struct epoll_event event;