Added a whitelist command line utility to control whitelist plugin

src/libcharon/plugins/whitelist/.gitignore

@@ -0,0 +1 @@
+whitelist

src/libcharon/plugins/whitelist/Makefile.am

@@ -16,3 +16,6 @@ libstrongswan_whitelist_la_SOURCES = whitelist_plugin.h whitelist_plugin.c \
 	whitelist_control.h whitelist_control.c
 
 libstrongswan_whitelist_la_LDFLAGS = -module -avoid-version
+
+ipsec_PROGRAMS = whitelist
+whitelist_SOURCES = whitelist.c

src/libcharon/plugins/whitelist/whitelist.c

@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2011 Martin Willi
+ * Copyright (C) 2011 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 "whitelist_msg.h"
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <errno.h>
+
+/**
+ * Connect to the daemon, return FD
+ */
+static int make_connection()
+{
+	struct sockaddr_un addr;
+	int fd;
+
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, WHITELIST_SOCKET);
+
+	fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
+	if (fd < 0)
+	{
+		fprintf(stderr, "opening socket failed: %s\n", strerror(errno));
+		return -1;
+	}
+	if (connect(fd, (struct sockaddr *)&addr,
+			offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path)) < 0)
+	{
+		fprintf(stderr, "connecting to %s failed: %s\n",
+				WHITELIST_SOCKET, strerror(errno));
+		close(fd);
+		return -1;
+	}
+	return fd;
+}
+
+/**
+ * Send a single message
+ */
+static int send_msg(int type, char *id)
+{
+	whitelist_msg_t msg = {
+		.type = type,
+	};
+	int fd;
+
+	fd = make_connection();
+	if (fd == -1)
+	{
+		return 2;
+	}
+	snprintf(msg.id, sizeof(msg.id), "%s", id);
+	if (send(fd, &msg, sizeof(msg), 0) != sizeof(msg))
+	{
+		fprintf(stderr, "writing to socket failed: %s\n", strerror(errno));
+		close(fd);
+		return 2;
+	}
+	if (type == WHITELIST_LIST)
+	{
+		while (recv(fd, &msg, sizeof(msg), 0) == sizeof(msg))
+		{
+			if (msg.type != WHITELIST_LIST)
+			{
+				break;
+			}
+			printf("%s\n", msg.id);
+		}
+	}
+	close(fd);
+	return 0;
+}
+
+/**
+ * Send a batch of messages, reading identities from a file
+ */
+static int send_batch(int type, char *file)
+{
+	whitelist_msg_t msg = {
+		.type = type,
+	};
+	FILE *f = stdin;
+	int fd, len;
+
+	fd = make_connection();
+	if (fd == -1)
+	{
+		return 2;
+	}
+	if (file)
+	{
+		f = fopen(file, "r");
+		if (f == NULL)
+		{
+			fprintf(stderr, "opening %s failed: %s\n", file, strerror(errno));
+			close(fd);
+			return 3;
+		}
+	}
+	while (fgets(msg.id, sizeof(msg.id), f))
+	{
+		len = strlen(msg.id);
+		if (len == 0)
+		{
+			continue;
+		}
+		if (msg.id[len-1] == '\n')
+		{
+			msg.id[len-1] = '\0';
+		}
+		if (send(fd, &msg, sizeof(msg), 0) != sizeof(msg))
+		{
+			fprintf(stderr, "writing to socket failed: %s\n", strerror(errno));
+			if (f != stdin)
+			{
+				fclose(f);
+			}
+			close(fd);
+			return 2;
+		}
+	}
+	if (f != stdin)
+	{
+		fclose(f);
+	}
+	close(fd);
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	if (argc == 3 && strcmp(argv[1], "add") == 0)
+	{
+		return send_msg(WHITELIST_ADD, argv[2]);
+	}
+	if (argc == 3 && strcmp(argv[1], "remove") == 0)
+	{
+		return send_msg(WHITELIST_REMOVE, argv[2]);
+	}
+	if ((argc == 2 || argc == 3) && strcmp(argv[1], "add-from") == 0)
+	{
+		return send_batch(WHITELIST_ADD, argc == 3 ? argv[2] : NULL);
+	}
+	if ((argc == 2 || argc == 3) && strcmp(argv[1], "remove-from") == 0)
+	{
+		return send_batch(WHITELIST_REMOVE, argc == 3 ? argv[2] : NULL);
+	}
+	if ((argc == 2 || argc == 3) && strcmp(argv[1], "flush") == 0)
+	{
+		return send_msg(WHITELIST_FLUSH, argc == 3 ? argv[2] : "%any");
+	}
+	if ((argc == 2 || argc == 3) && strcmp(argv[1], "list") == 0)
+	{
+		return send_msg(WHITELIST_LIST, argc == 3 ? argv[2] : "%any");
+	}
+	fprintf(stderr, "Usage:\n");
+	fprintf(stderr, "  %s add <identity>\n", argv[0]);
+	fprintf(stderr, "  %s remove <identity>\n", argv[0]);
+	fprintf(stderr, "  %s add-from <file>\n", argv[0]);
+	fprintf(stderr, "  %s remove-from <file>\n", argv[0]);
+	fprintf(stderr, "  %s flush [<pattern>]\n", argv[0]);
+	fprintf(stderr, "  %s list [<pattern>]\n", argv[0]);
+	return 1;
+}