swanctl: Add a command to (re-)load credentials

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index c6b71c8b269913fbc970ec5962c475956314132b..dbe1354c612ab68cbad64dc5f01e4f1e06f111b3 100644 (file)
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -9,6 +9,7 @@ swanctl_SOURCES = \
        commands/list_sas.c \
        commands/list_pols.c \
        commands/load_conns.c \
+       commands/load_creds.c \
        swanctl.c swanctl.h
 
 swanctl_LDADD = \

diff --git a/src/swanctl/commands/load_creds.c b/src/swanctl/commands/load_creds.c
new file mode 100644 (file)
index 0000000..83f2923
--- /dev/null
+++ b/src/swanctl/commands/load_creds.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2014 Martin Willi
+ * Copyright (C) 2014 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program 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 General Public License
+ * for more details.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "command.h"
+#include "swanctl.h"
+
+/**
+ * Load a single certificate over vici
+ */
+static bool load_cert(vici_conn_t *conn, bool raw, char *dir,
+                                         char *type, chunk_t data)
+{
+       vici_req_t *req;
+       vici_res_t *res;
+       bool ret = TRUE;
+
+       req = vici_begin("load-cert");
+
+       vici_add_key_valuef(req, "type", "%s", type);
+       vici_add_key_value(req, "data", data.ptr, data.len);
+
+       res = vici_submit(req, conn);
+       if (!res)
+       {
+               fprintf(stderr, "load-cert request failed: %s\n", strerror(errno));
+               return FALSE;
+       }
+       if (raw)
+       {
+               vici_dump(res, "load-cert reply", stdout);
+       }
+       else if (!streq(vici_find_str(res, "no", "success"), "yes"))
+       {
+               fprintf(stderr, "loading '%s' failed: %s\n",
+                               dir, vici_find_str(res, "", "errmsg"));
+               ret = FALSE;
+       }
+       vici_free_res(res);
+       return ret;
+}
+
+/**
+ * Load certficiates from a directory
+ */
+static void load_certs(vici_conn_t *conn, bool raw, char *type, char *dir)
+{
+       enumerator_t *enumerator;
+       struct stat st;
+       chunk_t *map;
+       char *path;
+
+       enumerator = enumerator_create_directory(dir);
+       if (enumerator)
+       {
+               while (enumerator->enumerate(enumerator, NULL, &path, &st))
+               {
+                       if (S_ISREG(st.st_mode))
+                       {
+                               map = chunk_map(path, FALSE);
+                               if (map)
+                               {
+                                       load_cert(conn, raw, path, type, *map);
+                                       chunk_unmap(map);
+                               }
+                               else
+                               {
+                                       fprintf(stderr, "mapping '%s' failed: %s, skipped\n",
+                                                       path, strerror(errno));
+                               }
+                       }
+               }
+               enumerator->destroy(enumerator);
+       }
+}
+
+/**
+ * Clear all currently loaded credentials
+ */
+static bool clear_creds(vici_conn_t *conn, bool raw)
+{
+       vici_res_t *res;
+
+       res = vici_submit(vici_begin("clear-creds"), conn);
+       if (!res)
+       {
+               fprintf(stderr, "clear-creds request failed: %s\n", strerror(errno));
+               return FALSE;
+       }
+       if (raw)
+       {
+               vici_dump(res, "clear-creds reply", stdout);
+       }
+       vici_free_res(res);
+       return TRUE;
+}
+
+static int load_creds(vici_conn_t *conn)
+{
+       bool raw = FALSE, clear = FALSE;
+       char *arg;
+
+       while (TRUE)
+       {
+               switch (command_getopt(&arg))
+               {
+                       case 'h':
+                               return command_usage(NULL);
+                       case 'c':
+                               clear = TRUE;
+                               continue;
+                       case 'r':
+                               raw = TRUE;
+                               continue;
+                       case EOF:
+                               break;
+                       default:
+                               return command_usage("invalid --load-creds option");
+               }
+               break;
+       }
+
+       if (clear)
+       {
+               if (!clear_creds(conn, raw))
+               {
+                       return ECONNREFUSED;
+               }
+       }
+
+       load_certs(conn, raw, "x509", SWANCTL_X509DIR);
+       load_certs(conn, raw, "x509ca", SWANCTL_X509CADIR);
+       load_certs(conn, raw, "x509aa", SWANCTL_X509AADIR);
+       load_certs(conn, raw, "x509crl", SWANCTL_X509CRLDIR);
+       load_certs(conn, raw, "x509ac", SWANCTL_X509ACDIR);
+
+       return 0;
+}
+
+/**
+ * Register the command.
+ */
+static void __attribute__ ((constructor))reg()
+{
+       command_register((command_t) {
+               load_creds, 's', "load-creds", "(re-)load credentials",
+               {"[--raw]"},
+               {
+                       {"help",                'h', 0, "show usage information"},
+                       {"clear",               'c', 0, "clear previously loaded credentials"},
+                       {"raw",                 'r', 0, "dump raw response message"},
+               }
+       });
+}

diff --git a/src/swanctl/swanctl.h b/src/swanctl/swanctl.h
index 8497f230bcc70decd86f103dc181b8a988e1ca61..f8469a79aa0c1be70680d804cb21567b827591ff 100644 (file)
--- a/src/swanctl/swanctl.h
+++ b/src/swanctl/swanctl.h
@@ -26,4 +26,30 @@
  */
 #define SWANCTL_CONF SWANCTLDIR "/swanctl.conf"
 
+/**
+ * Directory for X.509 end entity certs
+ */
+#define SWANCTL_X509DIR SWANCTLDIR "/x509"
+
+/**
+ * Directory for X.509 CA certs
+ */
+#define SWANCTL_X509CADIR SWANCTLDIR "/x509ca"
+
+/**
+ * Directory for X.509 Attribute Authority certs
+ */
+#define SWANCTL_X509AADIR SWANCTLDIR "/x509aa"
+
+/**
+ * Directory for X.509 CRLs
+ */
+#define SWANCTL_X509CRLDIR SWANCTLDIR "/x509crl"
+
+/**
+ * Directory for X.509 Attribute certificates
+ */
+#define SWANCTL_X509ACDIR SWANCTLDIR "/x509ac"
+
+
 #endif /** SWANCTL_H_ @}*/