mirror of
https://github.com/systemd/systemd.git
synced 2026-07-25 08:45:56 +00:00
journald: move stream protocol into its own .c file
This commit is contained in:
Lennart Poettering
@@ -2313,6 +2313,8 @@ systemd_journald_SOURCES = \
|
||||
src/journal/journald-kmsg.h \
|
||||
src/journal/journald-syslog.c \
|
||||
src/journal/journald-syslog.h \
|
||||
src/journal/journald-stream.c \
|
||||
src/journal/journald-stream.h \
|
||||
src/journal/journal-rate-limit.c \
|
||||
src/journal/journal-rate-limit.h \
|
||||
src/journal/journal-internal.h
|
||||
|
||||
457
src/journal/journald-stream.c
Normal file
457
src/journal/journald-stream.c
Normal file
@@ -0,0 +1,457 @@
|
||||
/*-*- 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
|
||||
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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/epoll.h>
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
#include <selinux/selinux.h>
|
||||
#endif
|
||||
|
||||
#include "socket-util.h"
|
||||
#include "journald.h"
|
||||
#include "journald-stream.h"
|
||||
#include "journald-syslog.h"
|
||||
#include "journald-kmsg.h"
|
||||
|
||||
#define STDOUT_STREAMS_MAX 4096
|
||||
|
||||
typedef enum StdoutStreamState {
|
||||
STDOUT_STREAM_IDENTIFIER,
|
||||
STDOUT_STREAM_UNIT_ID,
|
||||
STDOUT_STREAM_PRIORITY,
|
||||
STDOUT_STREAM_LEVEL_PREFIX,
|
||||
STDOUT_STREAM_FORWARD_TO_SYSLOG,
|
||||
STDOUT_STREAM_FORWARD_TO_KMSG,
|
||||
STDOUT_STREAM_FORWARD_TO_CONSOLE,
|
||||
STDOUT_STREAM_RUNNING
|
||||
} StdoutStreamState;
|
||||
|
||||
struct StdoutStream {
|
||||
Server *server;
|
||||
StdoutStreamState state;
|
||||
|
||||
int fd;
|
||||
|
||||
struct ucred ucred;
|
||||
#ifdef HAVE_SELINUX
|
||||
security_context_t security_context;
|
||||
#endif
|
||||
|
||||
char *identifier;
|
||||
char *unit_id;
|
||||
int priority;
|
||||
bool level_prefix:1;
|
||||
bool forward_to_syslog:1;
|
||||
bool forward_to_kmsg:1;
|
||||
bool forward_to_console:1;
|
||||
|
||||
char buffer[LINE_MAX+1];
|
||||
size_t length;
|
||||
|
||||
LIST_FIELDS(StdoutStream, stdout_stream);
|
||||
};
|
||||
|
||||
static int stdout_stream_log(StdoutStream *s, const char *p) {
|
||||
struct iovec iovec[N_IOVEC_META_FIELDS + 5];
|
||||
char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
|
||||
unsigned n = 0;
|
||||
int priority;
|
||||
char *label = NULL;
|
||||
size_t label_len = 0;
|
||||
|
||||
assert(s);
|
||||
assert(p);
|
||||
|
||||
if (isempty(p))
|
||||
return 0;
|
||||
|
||||
priority = s->priority;
|
||||
|
||||
if (s->level_prefix)
|
||||
syslog_parse_priority((char**) &p, &priority);
|
||||
|
||||
if (s->forward_to_syslog || s->server->forward_to_syslog)
|
||||
server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL);
|
||||
|
||||
if (s->forward_to_kmsg || s->server->forward_to_kmsg)
|
||||
server_forward_kmsg(s->server, priority, s->identifier, p, &s->ucred);
|
||||
|
||||
if (s->forward_to_console || s->server->forward_to_console)
|
||||
server_forward_console(s->server, priority, s->identifier, p, &s->ucred);
|
||||
|
||||
IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout");
|
||||
|
||||
if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_priority);
|
||||
|
||||
if (priority & LOG_FACMASK)
|
||||
if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_facility);
|
||||
|
||||
if (s->identifier) {
|
||||
syslog_identifier = strappend("SYSLOG_IDENTIFIER=", s->identifier);
|
||||
if (syslog_identifier)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_identifier);
|
||||
}
|
||||
|
||||
message = strappend("MESSAGE=", p);
|
||||
if (message)
|
||||
IOVEC_SET_STRING(iovec[n++], message);
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (s->security_context) {
|
||||
label = (char*) s->security_context;
|
||||
label_len = strlen((char*) s->security_context);
|
||||
}
|
||||
#endif
|
||||
|
||||
server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority);
|
||||
|
||||
free(message);
|
||||
free(syslog_priority);
|
||||
free(syslog_facility);
|
||||
free(syslog_identifier);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stdout_stream_line(StdoutStream *s, char *p) {
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
assert(p);
|
||||
|
||||
p = strstrip(p);
|
||||
|
||||
switch (s->state) {
|
||||
|
||||
case STDOUT_STREAM_IDENTIFIER:
|
||||
if (isempty(p))
|
||||
s->identifier = NULL;
|
||||
else {
|
||||
s->identifier = strdup(p);
|
||||
if (!s->identifier)
|
||||
return log_oom();
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_UNIT_ID;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_UNIT_ID:
|
||||
if (s->ucred.uid == 0) {
|
||||
if (isempty(p))
|
||||
s->unit_id = NULL;
|
||||
else {
|
||||
s->unit_id = strdup(p);
|
||||
if (!s->unit_id)
|
||||
return log_oom();
|
||||
}
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_PRIORITY;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_PRIORITY:
|
||||
r = safe_atoi(p, &s->priority);
|
||||
if (r < 0 || s->priority <= 0 || s->priority >= 999) {
|
||||
log_warning("Failed to parse log priority line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_LEVEL_PREFIX;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_LEVEL_PREFIX:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse level prefix line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->level_prefix = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_SYSLOG:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse forward to syslog line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_syslog = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_KMSG;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_KMSG:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse copy to kmsg line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_kmsg = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_CONSOLE;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_CONSOLE:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse copy to console line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_console = !!r;
|
||||
s->state = STDOUT_STREAM_RUNNING;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_RUNNING:
|
||||
return stdout_stream_log(s, p);
|
||||
}
|
||||
|
||||
assert_not_reached("Unknown stream state");
|
||||
}
|
||||
|
||||
static int stdout_stream_scan(StdoutStream *s, bool force_flush) {
|
||||
char *p;
|
||||
size_t remaining;
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
|
||||
p = s->buffer;
|
||||
remaining = s->length;
|
||||
for (;;) {
|
||||
char *end;
|
||||
size_t skip;
|
||||
|
||||
end = memchr(p, '\n', remaining);
|
||||
if (end)
|
||||
skip = end - p + 1;
|
||||
else if (remaining >= sizeof(s->buffer) - 1) {
|
||||
end = p + sizeof(s->buffer) - 1;
|
||||
skip = remaining;
|
||||
} else
|
||||
break;
|
||||
|
||||
*end = 0;
|
||||
|
||||
r = stdout_stream_line(s, p);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
remaining -= skip;
|
||||
p += skip;
|
||||
}
|
||||
|
||||
if (force_flush && remaining > 0) {
|
||||
p[remaining] = 0;
|
||||
r = stdout_stream_line(s, p);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
p += remaining;
|
||||
remaining = 0;
|
||||
}
|
||||
|
||||
if (p > s->buffer) {
|
||||
memmove(s->buffer, p, remaining);
|
||||
s->length = remaining;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int stdout_stream_process(StdoutStream *s) {
|
||||
ssize_t l;
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
|
||||
l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
|
||||
if (l < 0) {
|
||||
|
||||
if (errno == EAGAIN)
|
||||
return 0;
|
||||
|
||||
log_warning("Failed to read from stream: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (l == 0) {
|
||||
r = stdout_stream_scan(s, true);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->length += l;
|
||||
r = stdout_stream_scan(s, false);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
void stdout_stream_free(StdoutStream *s) {
|
||||
assert(s);
|
||||
|
||||
if (s->server) {
|
||||
assert(s->server->n_stdout_streams > 0);
|
||||
s->server->n_stdout_streams --;
|
||||
LIST_REMOVE(StdoutStream, stdout_stream, s->server->stdout_streams, s);
|
||||
}
|
||||
|
||||
if (s->fd >= 0) {
|
||||
if (s->server)
|
||||
epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL);
|
||||
|
||||
close_nointr_nofail(s->fd);
|
||||
}
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (s->security_context)
|
||||
freecon(s->security_context);
|
||||
#endif
|
||||
|
||||
free(s->identifier);
|
||||
free(s);
|
||||
}
|
||||
|
||||
int stdout_stream_new(Server *s) {
|
||||
StdoutStream *stream;
|
||||
int fd, r;
|
||||
socklen_t len;
|
||||
struct epoll_event ev;
|
||||
|
||||
assert(s);
|
||||
|
||||
fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
if (errno == EAGAIN)
|
||||
return 0;
|
||||
|
||||
log_error("Failed to accept stdout connection: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
|
||||
log_warning("Too many stdout streams, refusing connection.");
|
||||
close_nointr_nofail(fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
stream = new0(StdoutStream, 1);
|
||||
if (!stream) {
|
||||
close_nointr_nofail(fd);
|
||||
return log_oom();
|
||||
}
|
||||
|
||||
stream->fd = fd;
|
||||
|
||||
len = sizeof(stream->ucred);
|
||||
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
|
||||
log_error("Failed to determine peer credentials: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
|
||||
log_error("Failed to determine peer security context: %m");
|
||||
#endif
|
||||
|
||||
if (shutdown(fd, SHUT_WR) < 0) {
|
||||
log_error("Failed to shutdown writing side of socket: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
zero(ev);
|
||||
ev.data.ptr = stream;
|
||||
ev.events = EPOLLIN;
|
||||
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
|
||||
log_error("Failed to add stream to event loop: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
stream->server = s;
|
||||
LIST_PREPEND(StdoutStream, stdout_stream, s->stdout_streams, stream);
|
||||
s->n_stdout_streams ++;
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
stdout_stream_free(stream);
|
||||
return r;
|
||||
}
|
||||
|
||||
int server_open_stdout_socket(Server *s) {
|
||||
union sockaddr_union sa;
|
||||
int r;
|
||||
struct epoll_event ev;
|
||||
|
||||
assert(s);
|
||||
|
||||
if (s->stdout_fd < 0) {
|
||||
|
||||
s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
|
||||
if (s->stdout_fd < 0) {
|
||||
log_error("socket() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
zero(sa);
|
||||
sa.un.sun_family = AF_UNIX;
|
||||
strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
|
||||
|
||||
unlink(sa.un.sun_path);
|
||||
|
||||
r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
|
||||
if (r < 0) {
|
||||
log_error("bind() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
chmod(sa.un.sun_path, 0666);
|
||||
|
||||
if (listen(s->stdout_fd, SOMAXCONN) < 0) {
|
||||
log_error("liste() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
} else
|
||||
fd_nonblock(s->stdout_fd, 1);
|
||||
|
||||
zero(ev);
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.fd = s->stdout_fd;
|
||||
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->stdout_fd, &ev) < 0) {
|
||||
log_error("Failed to add stdout server fd to epoll object: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
30
src/journal/journald-stream.h
Normal file
30
src/journal/journald-stream.h
Normal file
@@ -0,0 +1,30 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2011 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "journald.h"
|
||||
|
||||
int server_open_stdout_socket(Server *s);
|
||||
|
||||
int stdout_stream_new(Server *s);
|
||||
void stdout_stream_free(StdoutStream *s);
|
||||
int stdout_stream_process(StdoutStream *s);
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "journald.h"
|
||||
#include "journald-kmsg.h"
|
||||
#include "journald-syslog.h"
|
||||
#include "journald-stream.h"
|
||||
|
||||
#ifdef HAVE_ACL
|
||||
#include <sys/acl.h>
|
||||
@@ -68,7 +69,6 @@
|
||||
#endif
|
||||
|
||||
#define USER_JOURNALS_MAX 1024
|
||||
#define STDOUT_STREAMS_MAX 4096
|
||||
|
||||
#define DEFAULT_RATE_LIMIT_INTERVAL (10*USEC_PER_SEC)
|
||||
#define DEFAULT_RATE_LIMIT_BURST 200
|
||||
@@ -77,42 +77,6 @@
|
||||
|
||||
#define ENTRY_SIZE_MAX (1024*1024*32)
|
||||
|
||||
typedef enum StdoutStreamState {
|
||||
STDOUT_STREAM_IDENTIFIER,
|
||||
STDOUT_STREAM_UNIT_ID,
|
||||
STDOUT_STREAM_PRIORITY,
|
||||
STDOUT_STREAM_LEVEL_PREFIX,
|
||||
STDOUT_STREAM_FORWARD_TO_SYSLOG,
|
||||
STDOUT_STREAM_FORWARD_TO_KMSG,
|
||||
STDOUT_STREAM_FORWARD_TO_CONSOLE,
|
||||
STDOUT_STREAM_RUNNING
|
||||
} StdoutStreamState;
|
||||
|
||||
struct StdoutStream {
|
||||
Server *server;
|
||||
StdoutStreamState state;
|
||||
|
||||
int fd;
|
||||
|
||||
struct ucred ucred;
|
||||
#ifdef HAVE_SELINUX
|
||||
security_context_t security_context;
|
||||
#endif
|
||||
|
||||
char *identifier;
|
||||
char *unit_id;
|
||||
int priority;
|
||||
bool level_prefix:1;
|
||||
bool forward_to_syslog:1;
|
||||
bool forward_to_kmsg:1;
|
||||
bool forward_to_console:1;
|
||||
|
||||
char buffer[LINE_MAX+1];
|
||||
size_t length;
|
||||
|
||||
LIST_FIELDS(StdoutStream, stdout_stream);
|
||||
};
|
||||
|
||||
static const char* const storage_table[] = {
|
||||
[STORAGE_AUTO] = "auto",
|
||||
[STORAGE_VOLATILE] = "volatile",
|
||||
@@ -1150,344 +1114,6 @@ static void process_native_file(
|
||||
free(p);
|
||||
}
|
||||
|
||||
static int stdout_stream_log(StdoutStream *s, const char *p) {
|
||||
struct iovec iovec[N_IOVEC_META_FIELDS + 5];
|
||||
char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
|
||||
unsigned n = 0;
|
||||
int priority;
|
||||
char *label = NULL;
|
||||
size_t label_len = 0;
|
||||
|
||||
assert(s);
|
||||
assert(p);
|
||||
|
||||
if (isempty(p))
|
||||
return 0;
|
||||
|
||||
priority = s->priority;
|
||||
|
||||
if (s->level_prefix)
|
||||
syslog_parse_priority((char**) &p, &priority);
|
||||
|
||||
if (s->forward_to_syslog || s->server->forward_to_syslog)
|
||||
server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL);
|
||||
|
||||
if (s->forward_to_kmsg || s->server->forward_to_kmsg)
|
||||
server_forward_kmsg(s->server, priority, s->identifier, p, &s->ucred);
|
||||
|
||||
if (s->forward_to_console || s->server->forward_to_console)
|
||||
server_forward_console(s->server, priority, s->identifier, p, &s->ucred);
|
||||
|
||||
IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout");
|
||||
|
||||
if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_priority);
|
||||
|
||||
if (priority & LOG_FACMASK)
|
||||
if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_facility);
|
||||
|
||||
if (s->identifier) {
|
||||
syslog_identifier = strappend("SYSLOG_IDENTIFIER=", s->identifier);
|
||||
if (syslog_identifier)
|
||||
IOVEC_SET_STRING(iovec[n++], syslog_identifier);
|
||||
}
|
||||
|
||||
message = strappend("MESSAGE=", p);
|
||||
if (message)
|
||||
IOVEC_SET_STRING(iovec[n++], message);
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (s->security_context) {
|
||||
label = (char*) s->security_context;
|
||||
label_len = strlen((char*) s->security_context);
|
||||
}
|
||||
#endif
|
||||
|
||||
server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority);
|
||||
|
||||
free(message);
|
||||
free(syslog_priority);
|
||||
free(syslog_facility);
|
||||
free(syslog_identifier);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stdout_stream_line(StdoutStream *s, char *p) {
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
assert(p);
|
||||
|
||||
p = strstrip(p);
|
||||
|
||||
switch (s->state) {
|
||||
|
||||
case STDOUT_STREAM_IDENTIFIER:
|
||||
if (isempty(p))
|
||||
s->identifier = NULL;
|
||||
else {
|
||||
s->identifier = strdup(p);
|
||||
if (!s->identifier)
|
||||
return log_oom();
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_UNIT_ID;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_UNIT_ID:
|
||||
if (s->ucred.uid == 0) {
|
||||
if (isempty(p))
|
||||
s->unit_id = NULL;
|
||||
else {
|
||||
s->unit_id = strdup(p);
|
||||
if (!s->unit_id)
|
||||
return log_oom();
|
||||
}
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_PRIORITY;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_PRIORITY:
|
||||
r = safe_atoi(p, &s->priority);
|
||||
if (r < 0 || s->priority <= 0 || s->priority >= 999) {
|
||||
log_warning("Failed to parse log priority line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->state = STDOUT_STREAM_LEVEL_PREFIX;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_LEVEL_PREFIX:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse level prefix line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->level_prefix = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_SYSLOG:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse forward to syslog line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_syslog = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_KMSG;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_KMSG:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse copy to kmsg line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_kmsg = !!r;
|
||||
s->state = STDOUT_STREAM_FORWARD_TO_CONSOLE;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_FORWARD_TO_CONSOLE:
|
||||
r = parse_boolean(p);
|
||||
if (r < 0) {
|
||||
log_warning("Failed to parse copy to console line.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
s->forward_to_console = !!r;
|
||||
s->state = STDOUT_STREAM_RUNNING;
|
||||
return 0;
|
||||
|
||||
case STDOUT_STREAM_RUNNING:
|
||||
return stdout_stream_log(s, p);
|
||||
}
|
||||
|
||||
assert_not_reached("Unknown stream state");
|
||||
}
|
||||
|
||||
static int stdout_stream_scan(StdoutStream *s, bool force_flush) {
|
||||
char *p;
|
||||
size_t remaining;
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
|
||||
p = s->buffer;
|
||||
remaining = s->length;
|
||||
for (;;) {
|
||||
char *end;
|
||||
size_t skip;
|
||||
|
||||
end = memchr(p, '\n', remaining);
|
||||
if (end)
|
||||
skip = end - p + 1;
|
||||
else if (remaining >= sizeof(s->buffer) - 1) {
|
||||
end = p + sizeof(s->buffer) - 1;
|
||||
skip = remaining;
|
||||
} else
|
||||
break;
|
||||
|
||||
*end = 0;
|
||||
|
||||
r = stdout_stream_line(s, p);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
remaining -= skip;
|
||||
p += skip;
|
||||
}
|
||||
|
||||
if (force_flush && remaining > 0) {
|
||||
p[remaining] = 0;
|
||||
r = stdout_stream_line(s, p);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
p += remaining;
|
||||
remaining = 0;
|
||||
}
|
||||
|
||||
if (p > s->buffer) {
|
||||
memmove(s->buffer, p, remaining);
|
||||
s->length = remaining;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stdout_stream_process(StdoutStream *s) {
|
||||
ssize_t l;
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
|
||||
l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
|
||||
if (l < 0) {
|
||||
|
||||
if (errno == EAGAIN)
|
||||
return 0;
|
||||
|
||||
log_warning("Failed to read from stream: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (l == 0) {
|
||||
r = stdout_stream_scan(s, true);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->length += l;
|
||||
r = stdout_stream_scan(s, false);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
static void stdout_stream_free(StdoutStream *s) {
|
||||
assert(s);
|
||||
|
||||
if (s->server) {
|
||||
assert(s->server->n_stdout_streams > 0);
|
||||
s->server->n_stdout_streams --;
|
||||
LIST_REMOVE(StdoutStream, stdout_stream, s->server->stdout_streams, s);
|
||||
}
|
||||
|
||||
if (s->fd >= 0) {
|
||||
if (s->server)
|
||||
epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL);
|
||||
|
||||
close_nointr_nofail(s->fd);
|
||||
}
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (s->security_context)
|
||||
freecon(s->security_context);
|
||||
#endif
|
||||
|
||||
free(s->identifier);
|
||||
free(s);
|
||||
}
|
||||
|
||||
static int stdout_stream_new(Server *s) {
|
||||
StdoutStream *stream;
|
||||
int fd, r;
|
||||
socklen_t len;
|
||||
struct epoll_event ev;
|
||||
|
||||
assert(s);
|
||||
|
||||
fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
if (errno == EAGAIN)
|
||||
return 0;
|
||||
|
||||
log_error("Failed to accept stdout connection: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
|
||||
log_warning("Too many stdout streams, refusing connection.");
|
||||
close_nointr_nofail(fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
stream = new0(StdoutStream, 1);
|
||||
if (!stream) {
|
||||
close_nointr_nofail(fd);
|
||||
return log_oom();
|
||||
}
|
||||
|
||||
stream->fd = fd;
|
||||
|
||||
len = sizeof(stream->ucred);
|
||||
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
|
||||
log_error("Failed to determine peer credentials: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
#ifdef HAVE_SELINUX
|
||||
if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
|
||||
log_error("Failed to determine peer security context: %m");
|
||||
#endif
|
||||
|
||||
if (shutdown(fd, SHUT_WR) < 0) {
|
||||
log_error("Failed to shutdown writing side of socket: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
zero(ev);
|
||||
ev.data.ptr = stream;
|
||||
ev.events = EPOLLIN;
|
||||
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
|
||||
log_error("Failed to add stream to event loop: %m");
|
||||
r = -errno;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
stream->server = s;
|
||||
LIST_PREPEND(StdoutStream, stdout_stream, s->stdout_streams, stream);
|
||||
s->n_stdout_streams ++;
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
stdout_stream_free(stream);
|
||||
return r;
|
||||
}
|
||||
|
||||
static int system_journal_open(Server *s) {
|
||||
int r;
|
||||
char *fn;
|
||||
@@ -1943,52 +1569,6 @@ static int open_native_socket(Server*s) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int open_stdout_socket(Server *s) {
|
||||
union sockaddr_union sa;
|
||||
int r;
|
||||
struct epoll_event ev;
|
||||
|
||||
assert(s);
|
||||
|
||||
if (s->stdout_fd < 0) {
|
||||
|
||||
s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
|
||||
if (s->stdout_fd < 0) {
|
||||
log_error("socket() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
zero(sa);
|
||||
sa.un.sun_family = AF_UNIX;
|
||||
strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
|
||||
|
||||
unlink(sa.un.sun_path);
|
||||
|
||||
r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
|
||||
if (r < 0) {
|
||||
log_error("bind() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
chmod(sa.un.sun_path, 0666);
|
||||
|
||||
if (listen(s->stdout_fd, SOMAXCONN) < 0) {
|
||||
log_error("liste() failed: %m");
|
||||
return -errno;
|
||||
}
|
||||
} else
|
||||
fd_nonblock(s->stdout_fd, 1);
|
||||
|
||||
zero(ev);
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.fd = s->stdout_fd;
|
||||
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->stdout_fd, &ev) < 0) {
|
||||
log_error("Failed to add stdout server fd to epoll object: %m");
|
||||
return -errno;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int open_signalfd(Server *s) {
|
||||
sigset_t mask;
|
||||
@@ -2189,7 +1769,7 @@ static int server_init(Server *s) {
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = open_stdout_socket(s);
|
||||
r = server_open_stdout_socket(s);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user