journal-upload: add config file

diff --git a/Makefile.am b/Makefile.am
index cc1d42352f239d3b538aa81d00190f3e8d282c6c..a492a1f7c009409aafbe439ac2cc3b3ca27e765d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3531,6 +3531,15 @@ nodist_systemunit_DATA += \
 
 EXTRA_DIST += \
        units/systemd-journal-upload.service.in
 
 EXTRA_DIST += \
        units/systemd-journal-upload.service.in

+
+nodist_pkgsysconf_DATA += \
+       src/journal-remote/journal-upload.conf
+
+EXTRA_DIST += \
+       src/journal-remote/journal-upload.conf.in
+
+CLEANFILES += \
+       src/journal-remote/journal-upload.conf

 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS

diff --git a/src/journal-remote/.gitignore b/src/journal-remote/.gitignore
index 8112c3c90f0f4f5ce1fd75e0b6cb2f2d34959d13..06847b65d4ac259994f063de27d3b5a7e847398a 100644 (file)
--- a/src/journal-remote/.gitignore
+++ b/src/journal-remote/.gitignore
@@ -1 +1,2 @@
 /journal-remote.conf
 /journal-remote.conf

+/journal-upload.conf

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index c5a3e1907bc4502addf5682f098276b447ba0bb0..a381ec59bf6834fd07132923c1dbb94e7adc5bbd 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -31,8 +31,13 @@
 #include "util.h"
 #include "build.h"
 #include "fileio.h"
 #include "util.h"
 #include "build.h"
 #include "fileio.h"

+#include "conf-parser.h"

 #include "journal-upload.h"
 
 #include "journal-upload.h"
 

+#define KEY_FILE   CERTIFICATE_ROOT "/private/journal-upload.pem"
+#define CERT_FILE  CERTIFICATE_ROOT "/certs/journal-upload.pem"
+#define TRUST_FILE CERTIFICATE_ROOT "/ca/trusted.pem"
+

 static const char* arg_url;
 
 static void close_fd_input(Uploader *u);
 static const char* arg_url;
 
 static void close_fd_input(Uploader *u);


@@ -214,17 +219,17 @@ int start_upload(Uploader *u,
                             "systemd-journal-upload " PACKAGE_STRING,
                             LOG_WARNING, );
 
                             "systemd-journal-upload " PACKAGE_STRING,
                             LOG_WARNING, );
 

-                if (arg_key) {
+                if (arg_key || startswith(u->url, "https://")) {

                         assert(arg_cert);
 
                         assert(arg_cert);
 

-                        easy_setopt(curl, CURLOPT_SSLKEY, arg_key,
+                        easy_setopt(curl, CURLOPT_SSLKEY, arg_key ?: KEY_FILE,

                                     LOG_ERR, return -EXFULL);
                                     LOG_ERR, return -EXFULL);

-                        easy_setopt(curl, CURLOPT_SSLCERT, arg_cert,
+                        easy_setopt(curl, CURLOPT_SSLCERT, arg_cert ?: CERT_FILE,

                                     LOG_ERR, return -EXFULL);
                 }
 
                                     LOG_ERR, return -EXFULL);
                 }
 

-                if (arg_trust)
-                        easy_setopt(curl, CURLOPT_CAINFO, arg_trust,
+                if (arg_trust || startswith(u->url, "https://"))
+                        easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE,

                                     LOG_ERR, return -EXFULL);
 
                 if (arg_key || arg_trust)
                                     LOG_ERR, return -EXFULL);
 
                 if (arg_key || arg_trust)


@@ -483,6 +488,25 @@ static int perform_upload(Uploader *u) {
         return update_cursor_state(u);
 }
 
         return update_cursor_state(u);
 }
 

+static int parse_config(void) {
+        const ConfigTableItem items[] = {
+                { "Upload",  "URL",                    config_parse_string, 0, &arg_url    },
+                { "Upload",  "ServerKeyFile",          config_parse_path,   0, &arg_key    },
+                { "Upload",  "ServerCertificateFile",  config_parse_path,   0, &arg_cert   },
+                { "Upload",  "TrustedCertificateFile", config_parse_path,   0, &arg_trust  },
+                {}};
+        int r;
+
+        r = config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
+                         "Upload\0",
+                         config_item_table_lookup, items,
+                         false, false, NULL);
+        if (r < 0)
+                log_error("Failed to parse configuration file: %s", strerror(-r));
+
+        return r;
+}
+

 static void help(void) {
         printf("%s -u URL {FILE|-}...\n\n"
                "Upload journal events to a remote server.\n\n"
 static void help(void) {
         printf("%s -u URL {FILE|-}...\n\n"
                "Upload journal events to a remote server.\n\n"


@@ -723,6 +747,10 @@ int main(int argc, char **argv) {
         log_show_color(true);
         log_parse_environment();
 
         log_show_color(true);
         log_parse_environment();
 

+        r = parse_config();
+        if (r <= 0)
+                goto finish;
+

         r = parse_argv(argc, argv);
         if (r <= 0)
                 goto finish;
         r = parse_argv(argc, argv);
         if (r <= 0)
                 goto finish;

diff --git a/src/journal-remote/journal-upload.conf.in b/src/journal-remote/journal-upload.conf.in
new file mode 100644 (file)
index 0000000..c567068
--- /dev/null
+++ b/src/journal-remote/journal-upload.conf.in
@@ -0,0 +1,5 @@
+[Upload]
+# URL=
+# ServerKeyFile=@CERTIFICATEROOT@/private/journal-upload.pem
+# ServerCertificateFile=@CERTIFICATEROOT@/certs/journal-upload.pem
+# TrustedCertificateFile=@CERTIFICATEROOT@/ca/trusted.pem