swanctl: Implement a load-conn command to load connections from a file

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index 45b8dad13a7a75f04625e6a98a47a7c35e1ccb9f..58995cddab420e0890e5ce57f662653cc1a24a99 100644 (file)
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -1,5 +1,7 @@
 sbin_PROGRAMS = swanctl
 
+conffile = `dirname $(strongswan_conf)`/strongswan.d/swanctl.conf
+
 swanctl_SOURCES = \
        command.c command.h \
        commands/initiate.c \
@@ -8,6 +10,7 @@ swanctl_SOURCES = \
        commands/version.c \
        commands/list_sas.c \
        commands/list_pols.c \
+       commands/load_conns.c \
        swanctl.c
 
 swanctl_LDADD = \
@@ -19,4 +22,5 @@ swanctl.o :           $(top_builddir)/config.status
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libcharon/plugins/vici \
+       -DCONF_FILE=\""${conffile}\"" \
        -DPLUGINS=\""${s_plugins}\""

diff --git a/src/swanctl/commands/load_conns.c b/src/swanctl/commands/load_conns.c
new file mode 100644 (file)
index 0000000..b6842e0
--- /dev/null
+++ b/src/swanctl/commands/load_conns.c
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ */
+
+#include "command.h"
+
+#include <errno.h>
+
+/**
+ * Check if we should handle a key as a list of comma separated values
+ */
+static bool is_list_key(char *key)
+{
+       char *keys[] = {
+               "local_addrs",
+               "remote_addrs",
+               "proposals",
+               "esp_proposals",
+               "ah_proposals",
+               "local_ts",
+               "remote_ts",
+               "vips",
+       };
+       int i;
+
+       for (i = 0; i < countof(keys); i++)
+       {
+               if (strcaseeq(keys[i], key))
+               {
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
+/**
+ * Add a vici list from a comma separated string value
+ */
+static void add_list_key(vici_req_t *req, char *key, char *value)
+{
+       enumerator_t *enumerator;
+       char *token;
+
+       vici_begin_list(req, key);
+       enumerator = enumerator_create_token(value, ",", " ");
+       while (enumerator->enumerate(enumerator, &token))
+       {
+               vici_add_list_itemf(req, "%s", token);
+       }
+       enumerator->destroy(enumerator);
+       vici_end_list(req);
+}
+
+/**
+ * Translate setting key/values from a section into vici key-values/lists
+ */
+static void add_key_values(vici_req_t *req, settings_t *cfg, char *section)
+{
+       enumerator_t *enumerator;
+       char *key, *value;
+
+       enumerator = cfg->create_key_value_enumerator(cfg, section);
+       while (enumerator->enumerate(enumerator, &key, &value))
+       {
+               if (is_list_key(key))
+               {
+                       add_list_key(req, key, value);
+               }
+               else
+               {
+                       vici_add_key_valuef(req, key, "%s", value);
+               }
+       }
+       enumerator->destroy(enumerator);
+}
+
+/**
+ * Translate a settings section to a vici section
+ */
+static void add_sections(vici_req_t *req, settings_t *cfg, char *section)
+{
+       enumerator_t *enumerator;
+       char *name, buf[256];
+
+       enumerator = cfg->create_section_enumerator(cfg, section);
+       while (enumerator->enumerate(enumerator, &name))
+       {
+               vici_begin_section(req, name);
+               snprintf(buf, sizeof(buf), "%s.%s", section, name);
+               add_key_values(req, cfg, buf);
+               add_sections(req, cfg, buf);
+               vici_end_section(req);
+       }
+       enumerator->destroy(enumerator);
+}
+
+/**
+ * Load an IKE_SA config with CHILD_SA configs from a section
+ */
+static bool load_conn(vici_conn_t *conn, settings_t *cfg,
+                                         char *section, bool raw)
+{
+       vici_req_t *req;
+       vici_res_t *res;
+       bool ret = TRUE;
+       char buf[128];
+
+       snprintf(buf, sizeof(buf), "%s.%s", "connections", section);
+
+       req = vici_begin("load-conn");
+
+       vici_begin_section(req, section);
+       add_key_values(req, cfg, buf);
+       add_sections(req, cfg, buf);
+       vici_end_section(req);
+
+       res = vici_submit(req, conn);
+       if (!res)
+       {
+               fprintf(stderr, "load-conn request failed: %s\n", strerror(errno));
+               return FALSE;
+       }
+       if (raw)
+       {
+               vici_dump(res, "load-conn reply", stdout);
+       }
+       else if (!streq(vici_find_str(res, "no", "success"), "yes"))
+       {
+               fprintf(stderr, "loading connection '%s' failed: %s\n",
+                               section, vici_find_str(res, "", "errmsg"));
+               ret = FALSE;
+       }
+       vici_free_res(res);
+       return ret;
+}
+
+static int load_conns(vici_conn_t *conn)
+{
+       bool raw = FALSE;
+       u_int found = 0, loaded = 0;
+       char *arg, *section;
+       enumerator_t *enumerator;
+       settings_t *cfg;
+
+       while (TRUE)
+       {
+               switch (command_getopt(&arg))
+               {
+                       case 'h':
+                               return command_usage(NULL);
+                       case 'r':
+                               raw = TRUE;
+                               continue;
+                       case EOF:
+                               break;
+                       default:
+                               return command_usage("invalid --load-conns option");
+               }
+               break;
+       }
+
+       cfg = settings_create(CONF_FILE);
+       if (!cfg)
+       {
+               fprintf(stderr, "parsing '%s' failed\n", CONF_FILE);
+               return EINVAL;
+       }
+
+       enumerator = cfg->create_section_enumerator(cfg, "connections");
+       while (enumerator->enumerate(enumerator, &section))
+       {
+               found++;
+               if (load_conn(conn, cfg, section, raw))
+               {
+                       loaded++;
+               }
+       }
+       enumerator->destroy(enumerator);
+
+       cfg->destroy(cfg);
+
+       if (raw)
+       {
+               return 0;
+       }
+       if (found == 0)
+       {
+               printf("no connections found\n");
+               return 0;
+       }
+       if (loaded == found)
+       {
+               printf("successfully loaded %u connections\n", loaded);
+               return 0;
+       }
+       fprintf(stderr, "loaded %u of %u connections, %u failed to load\n",
+                       loaded, found, found - loaded);
+       return EINVAL;
+}
+
+/**
+ * Register the command.
+ */
+static void __attribute__ ((constructor))reg()
+{
+       command_register((command_t) {
+               load_conns, 'c', "load-conns", "(re-)load connection configuration",
+               {"[--raw]"},
+               {
+                       {"help",                'h', 0, "show usage information"},
+                       {"raw",                 'r', 0, "dump raw response message"},
+               }
+       });
+}