daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
52b84b
From 2808e53f785e9ca7fdab286678e784b661b4c185 Mon Sep 17 00:00:00 2001
52b84b
From: Zsolt Dollenstein <zsol.zsol@gmail.com>
52b84b
Date: Tue, 3 Jul 2018 12:22:29 -0700
52b84b
Subject: [PATCH] Add support for opening files for appending
52b84b
52b84b
Addresses part of #8983
52b84b
52b84b
(cherry picked from commit 566b7d23eb747e9c5a74e5647693077b52395fc5)
52b84b
52b84b
Resolves: #1809175
52b84b
---
52b84b
 man/systemd.exec.xml                          | 16 ++++++----
52b84b
 src/core/dbus-execute.c                       | 30 ++++++++++++++-----
52b84b
 src/core/execute.c                            | 20 ++++++++++---
52b84b
 src/core/execute.h                            |  1 +
52b84b
 src/core/load-fragment.c                      | 11 +++++++
52b84b
 src/core/main.c                               |  4 +--
52b84b
 src/test/test-execute.c                       | 10 +++++++
52b84b
 test/meson.build                              |  2 ++
52b84b
 .../exec-standardoutput-append.service        | 13 ++++++++
52b84b
 .../exec-standardoutput-file.service          | 13 ++++++++
52b84b
 10 files changed, 101 insertions(+), 19 deletions(-)
52b84b
 create mode 100644 test/test-execute/exec-standardoutput-append.service
52b84b
 create mode 100644 test/test-execute/exec-standardoutput-file.service
52b84b
52b84b
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
52b84b
index bdaed68162..e2a5ede968 100644
52b84b
--- a/man/systemd.exec.xml
52b84b
+++ b/man/systemd.exec.xml
52b84b
@@ -1792,8 +1792,8 @@ SystemCallErrorNumber=EPERM</programlisting>
52b84b
         of <option>inherit</option>, <option>null</option>, <option>tty</option>, <option>journal</option>,
52b84b
         <option>syslog</option>, <option>kmsg</option>, <option>journal+console</option>,
52b84b
         <option>syslog+console</option>, <option>kmsg+console</option>,
52b84b
-        <option>file:<replaceable>path</replaceable></option>, <option>socket</option> or
52b84b
-        <option>fd:<replaceable>name</replaceable></option>.</para>
52b84b
+        <option>file:<replaceable>path</replaceable></option>, <option>append:<replaceable>path</replaceable></option>,
52b84b
+        <option>socket</option> or<option>fd:<replaceable>name</replaceable></option>.</para>
52b84b
 
52b84b
         <para><option>inherit</option> duplicates the file descriptor of standard input for standard output.</para>
52b84b
 
52b84b
@@ -1824,11 +1824,17 @@ SystemCallErrorNumber=EPERM</programlisting>
52b84b
 
52b84b
         <para>The <option>file:<replaceable>path</replaceable></option> option may be used to connect a specific file
52b84b
         system object to standard output. The semantics are similar to the same option of
52b84b
-        <varname>StandardInput=</varname>, see above. If standard input and output are directed to the same file path,
52b84b
-        it is opened only once, for reading as well as writing and duplicated. This is particular useful when the
52b84b
-        specified path refers to an <constant>AF_UNIX</constant> socket in the file system, as in that case only a
52b84b
+        <varname>StandardInput=</varname>, see above. If <replaceable>path</replaceable> refers to a regular file
52b84b
+        on the filesystem, it is opened (created if it doesn't exist yet) for writing at the beginning of the file,
52b84b
+        but without truncating it.
52b84b
+        If standard input and output are directed to the same file path, it is opened only once, for reading as well
52b84b
+        as writing and duplicated. This is particularly useful when the specified path refers to an
52b84b
+        <constant>AF_UNIX</constant> socket in the file system, as in that case only a
52b84b
         single stream connection is created for both input and output.</para>
52b84b
 
52b84b
+        <para><option>append:<replaceable>path</replaceable></option> is similar to <option>file:<replaceable>path
52b84b
+        </replaceable></option> above, but it opens the file in append mode.</para>
52b84b
+
52b84b
         <para><option>socket</option> connects standard output to a socket acquired via socket activation. The
52b84b
         semantics are similar to the same option of <varname>StandardInput=</varname>, see above.</para>
52b84b
 
52b84b
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
52b84b
index e7c0b893d1..f9527e56b2 100644
52b84b
--- a/src/core/dbus-execute.c
52b84b
+++ b/src/core/dbus-execute.c
52b84b
@@ -1772,7 +1772,10 @@ int bus_exec_context_set_transient_property(
52b84b
 
52b84b
                 return 1;
52b84b
 
52b84b
-        } else if (STR_IN_SET(name, "StandardInputFile", "StandardOutputFile", "StandardErrorFile")) {
52b84b
+        } else if (STR_IN_SET(name,
52b84b
+                              "StandardInputFile",
52b84b
+                              "StandardOutputFile", "StandardOutputFileToCreate", "StandardOutputFileToAppend",
52b84b
+                              "StandardErrorFile", "StandardErrorFileToCreate", "StandardErrorFileToAppend")) {
52b84b
                 const char *s;
52b84b
 
52b84b
                 r = sd_bus_message_read(message, "s", &s);
52b84b
@@ -1796,23 +1799,34 @@ int bus_exec_context_set_transient_property(
52b84b
                                 c->std_input = EXEC_INPUT_FILE;
52b84b
                                 unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardInput=file:%s", s);
52b84b
 
52b84b
-                        } else if (streq(name, "StandardOutputFile")) {
52b84b
+                        } else if (STR_IN_SET(name, "StandardOutputFile", "StandardOutputFileToAppend")) {
52b84b
                                 r = free_and_strdup(&c->stdio_file[STDOUT_FILENO], empty_to_null(s));
52b84b
                                 if (r < 0)
52b84b
                                         return r;
52b84b
 
52b84b
-                                c->std_output = EXEC_OUTPUT_FILE;
52b84b
-                                unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardOutput=file:%s", s);
52b84b
-
52b84b
+                                if (streq(name, "StandardOutputFile")) {
52b84b
+                                        c->std_output = EXEC_OUTPUT_FILE;
52b84b
+                                        unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardOutput=file:%s", s);
52b84b
+                                } else {
52b84b
+                                        assert(streq(name, "StandardOutputFileToAppend"));
52b84b
+                                        c->std_output = EXEC_OUTPUT_FILE_APPEND;
52b84b
+                                        unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardOutput=append:%s", s);
52b84b
+                                }
52b84b
                         } else {
52b84b
-                                assert(streq(name, "StandardErrorFile"));
52b84b
+                                assert(STR_IN_SET(name, "StandardErrorFile", "StandardErrorFileToAppend"));
52b84b
 
52b84b
                                 r = free_and_strdup(&c->stdio_file[STDERR_FILENO], empty_to_null(s));
52b84b
                                 if (r < 0)
52b84b
                                         return r;
52b84b
 
52b84b
-                                c->std_error = EXEC_OUTPUT_FILE;
52b84b
-                                unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardError=file:%s", s);
52b84b
+                                if (streq(name, "StandardErrorFile")) {
52b84b
+                                        c->std_error = EXEC_OUTPUT_FILE;
52b84b
+                                        unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardOutput=file:%s", s);
52b84b
+                                } else {
52b84b
+                                      assert(streq(name, "StandardErrorFileToAppend"));
52b84b
+                                      c->std_error = EXEC_OUTPUT_FILE_APPEND;
52b84b
+                                      unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "StandardOutput=append:%s", s);
52b84b
+                                }
52b84b
                         }
52b84b
                 }
52b84b
 
52b84b
diff --git a/src/core/execute.c b/src/core/execute.c
52b84b
index f012023224..3c54ac1110 100644
52b84b
--- a/src/core/execute.c
52b84b
+++ b/src/core/execute.c
52b84b
@@ -89,6 +89,7 @@
52b84b
 #include "strv.h"
52b84b
 #include "syslog-util.h"
52b84b
 #include "terminal-util.h"
52b84b
+#include "umask-util.h"
52b84b
 #include "unit.h"
52b84b
 #include "user-util.h"
52b84b
 #include "util.h"
52b84b
@@ -675,9 +676,10 @@ static int setup_output(
52b84b
                 (void) fd_nonblock(named_iofds[fileno], false);
52b84b
                 return dup2(named_iofds[fileno], fileno) < 0 ? -errno : fileno;
52b84b
 
52b84b
-        case EXEC_OUTPUT_FILE: {
52b84b
+        case EXEC_OUTPUT_FILE:
52b84b
+        case EXEC_OUTPUT_FILE_APPEND: {
52b84b
                 bool rw;
52b84b
-                int fd;
52b84b
+                int fd, flags;
52b84b
 
52b84b
                 assert(context->stdio_file[fileno]);
52b84b
 
52b84b
@@ -687,11 +689,16 @@ static int setup_output(
52b84b
                 if (rw)
52b84b
                         return dup2(STDIN_FILENO, fileno) < 0 ? -errno : fileno;
52b84b
 
52b84b
-                fd = acquire_path(context->stdio_file[fileno], O_WRONLY, 0666 & ~context->umask);
52b84b
+                flags = O_WRONLY;
52b84b
+                if (o == EXEC_OUTPUT_FILE_APPEND)
52b84b
+                        flags |= O_APPEND;
52b84b
+
52b84b
+                fd = acquire_path(context->stdio_file[fileno], flags, 0666 & ~context->umask);
52b84b
+
52b84b
                 if (fd < 0)
52b84b
                         return fd;
52b84b
 
52b84b
-                return move_fd(fd, fileno, false);
52b84b
+                return move_fd(fd, fileno, 0);
52b84b
         }
52b84b
 
52b84b
         default:
52b84b
@@ -4168,8 +4175,12 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
52b84b
                 fprintf(f, "%sStandardInputFile: %s\n", prefix, c->stdio_file[STDIN_FILENO]);
52b84b
         if (c->std_output == EXEC_OUTPUT_FILE)
52b84b
                 fprintf(f, "%sStandardOutputFile: %s\n", prefix, c->stdio_file[STDOUT_FILENO]);
52b84b
+        if (c->std_output == EXEC_OUTPUT_FILE_APPEND)
52b84b
+                fprintf(f, "%sStandardOutputFileToAppend: %s\n", prefix, c->stdio_file[STDOUT_FILENO]);
52b84b
         if (c->std_error == EXEC_OUTPUT_FILE)
52b84b
                 fprintf(f, "%sStandardErrorFile: %s\n", prefix, c->stdio_file[STDERR_FILENO]);
52b84b
+        if (c->std_error == EXEC_OUTPUT_FILE_APPEND)
52b84b
+                fprintf(f, "%sStandardErrorFileToAppend: %s\n", prefix, c->stdio_file[STDERR_FILENO]);
52b84b
 
52b84b
         if (c->tty_path)
52b84b
                 fprintf(f,
52b84b
@@ -5111,6 +5122,7 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
52b84b
         [EXEC_OUTPUT_SOCKET] = "socket",
52b84b
         [EXEC_OUTPUT_NAMED_FD] = "fd",
52b84b
         [EXEC_OUTPUT_FILE] = "file",
52b84b
+        [EXEC_OUTPUT_FILE_APPEND] = "append",
52b84b
 };
52b84b
 
52b84b
 DEFINE_STRING_TABLE_LOOKUP(exec_output, ExecOutput);
52b84b
diff --git a/src/core/execute.h b/src/core/execute.h
52b84b
index 2266355962..86c1cee84c 100644
52b84b
--- a/src/core/execute.h
52b84b
+++ b/src/core/execute.h
52b84b
@@ -57,6 +57,7 @@ typedef enum ExecOutput {
52b84b
         EXEC_OUTPUT_SOCKET,
52b84b
         EXEC_OUTPUT_NAMED_FD,
52b84b
         EXEC_OUTPUT_FILE,
52b84b
+        EXEC_OUTPUT_FILE_APPEND,
52b84b
         _EXEC_OUTPUT_MAX,
52b84b
         _EXEC_OUTPUT_INVALID = -1
52b84b
 } ExecOutput;
52b84b
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
52b84b
index 2082166afb..9b2724307d 100644
52b84b
--- a/src/core/load-fragment.c
52b84b
+++ b/src/core/load-fragment.c
52b84b
@@ -1016,6 +1016,17 @@ int config_parse_exec_output(
52b84b
 
52b84b
                 eo = EXEC_OUTPUT_FILE;
52b84b
 
52b84b
+        } else if ((n = startswith(rvalue, "append:"))) {
52b84b
+
52b84b
+                r = unit_full_printf(u, n, &resolved);
52b84b
+                if (r < 0)
52b84b
+                        return log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", n);
52b84b
+
52b84b
+                r = path_simplify_and_warn(resolved, PATH_CHECK_ABSOLUTE | PATH_CHECK_FATAL, unit, filename, line, lvalue);
52b84b
+                if (r < 0)
52b84b
+                        return -ENOEXEC;
52b84b
+
52b84b
+                eo = EXEC_OUTPUT_FILE_APPEND;
52b84b
         } else {
52b84b
                 eo = exec_output_from_string(rvalue);
52b84b
                 if (eo < 0) {
52b84b
diff --git a/src/core/main.c b/src/core/main.c
52b84b
index 9f238a8430..25536054b3 100644
52b84b
--- a/src/core/main.c
52b84b
+++ b/src/core/main.c
52b84b
@@ -620,8 +620,8 @@ static int config_parse_output_restricted(
52b84b
                 return 0;
52b84b
         }
52b84b
 
52b84b
-        if (IN_SET(t, EXEC_OUTPUT_SOCKET, EXEC_OUTPUT_NAMED_FD, EXEC_OUTPUT_FILE)) {
52b84b
-                log_syntax(unit, LOG_ERR, filename, line, 0, "Standard output types socket, fd:, file: are not supported as defaults, ignoring: %s", rvalue);
52b84b
+        if (IN_SET(t, EXEC_OUTPUT_SOCKET, EXEC_OUTPUT_NAMED_FD, EXEC_OUTPUT_FILE, EXEC_OUTPUT_FILE_APPEND)) {
52b84b
+                log_syntax(unit, LOG_ERR, filename, line, 0, "Standard output types socket, fd:, file:, append: are not supported as defaults, ignoring: %s", rvalue);
52b84b
                 return 0;
52b84b
         }
52b84b
 
52b84b
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
52b84b
index 637ffe96bb..0f8dc883b1 100644
52b84b
--- a/src/test/test-execute.c
52b84b
+++ b/src/test/test-execute.c
52b84b
@@ -651,6 +651,14 @@ static void test_exec_standardinput(Manager *m) {
52b84b
         test(m, "exec-standardinput-file.service", 0, CLD_EXITED);
52b84b
 }
52b84b
 
52b84b
+static void test_exec_standardoutput(Manager *m) {
52b84b
+        test(m, "exec-standardoutput-file.service", 0, CLD_EXITED);
52b84b
+}
52b84b
+
52b84b
+static void test_exec_standardoutput_append(Manager *m) {
52b84b
+        test(m, "exec-standardoutput-append.service", 0, CLD_EXITED);
52b84b
+}
52b84b
+
52b84b
 static int run_tests(UnitFileScope scope, const test_function_t *tests) {
52b84b
         const test_function_t *test = NULL;
52b84b
         _cleanup_(manager_freep) Manager *m = NULL;
52b84b
@@ -698,6 +706,8 @@ int main(int argc, char *argv[]) {
52b84b
                 test_exec_restrictnamespaces,
52b84b
                 test_exec_runtimedirectory,
52b84b
                 test_exec_standardinput,
52b84b
+                test_exec_standardoutput,
52b84b
+                test_exec_standardoutput_append,
52b84b
                 test_exec_supplementarygroups,
52b84b
                 test_exec_systemcallerrornumber,
52b84b
                 test_exec_systemcallfilter,
52b84b
diff --git a/test/meson.build b/test/meson.build
52b84b
index fb9f2cdb9b..4d1c51048c 100644
52b84b
--- a/test/meson.build
52b84b
+++ b/test/meson.build
52b84b
@@ -115,6 +115,8 @@ test_data_files = '''
52b84b
         test-execute/exec-specifier@.service
52b84b
         test-execute/exec-standardinput-data.service
52b84b
         test-execute/exec-standardinput-file.service
52b84b
+        test-execute/exec-standardoutput-file.service
52b84b
+        test-execute/exec-standardoutput-append.service
52b84b
         test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service
52b84b
         test-execute/exec-supplementarygroups-multiple-groups-withgid.service
52b84b
         test-execute/exec-supplementarygroups-multiple-groups-withuid.service
52b84b
diff --git a/test/test-execute/exec-standardoutput-append.service b/test/test-execute/exec-standardoutput-append.service
52b84b
new file mode 100644
52b84b
index 0000000000..8983bb056b
52b84b
--- /dev/null
52b84b
+++ b/test/test-execute/exec-standardoutput-append.service
52b84b
@@ -0,0 +1,13 @@
52b84b
+[Unit]
52b84b
+Description=Test for StandardOutput=append:
52b84b
+
52b84b
+[Service]
52b84b
+ExecStartPre=sh -c 'printf "hello\n" > /tmp/test-exec-standardoutput-output'
52b84b
+ExecStartPre=sh -c 'printf "hello\nhello\n" > /tmp/test-exec-standardoutput-expected'
52b84b
+StandardInput=data
52b84b
+StandardInputText=hello
52b84b
+StandardOutput=append:/tmp/test-exec-standardoutput-output
52b84b
+StandardError=null
52b84b
+ExecStart=cat
52b84b
+ExecStart=cmp /tmp/test-exec-standardoutput-output /tmp/test-exec-standardoutput-expected
52b84b
+Type=oneshot
52b84b
diff --git a/test/test-execute/exec-standardoutput-file.service b/test/test-execute/exec-standardoutput-file.service
52b84b
new file mode 100644
52b84b
index 0000000000..71e2604b94
52b84b
--- /dev/null
52b84b
+++ b/test/test-execute/exec-standardoutput-file.service
52b84b
@@ -0,0 +1,13 @@
52b84b
+[Unit]
52b84b
+Description=Test for StandardOutput=file:
52b84b
+
52b84b
+[Service]
52b84b
+ExecStartPre=sh -c 'printf "nooo\nhello\n" > /tmp/test-exec-standardoutput-output'
52b84b
+ExecStartPre=sh -c 'printf "hello\nello\n" > /tmp/test-exec-standardoutput-expected'
52b84b
+StandardInput=data
52b84b
+StandardInputText=hello
52b84b
+StandardOutput=file:/tmp/test-exec-standardoutput-output
52b84b
+StandardError=null
52b84b
+ExecStart=cat
52b84b
+ExecStart=cmp /tmp/test-exec-standardoutput-expected /tmp/test-exec-standardoutput-output
52b84b
+Type=oneshot