diff options
-rw-r--r-- | Makefile.plugins | 34 | ||||
-rwxr-xr-x | bootstrap-configure | 1 | ||||
-rw-r--r-- | configure.ac | 17 | ||||
-rw-r--r-- | plugins/openvpn.c | 239 | ||||
-rw-r--r-- | scripts/openvpn-script.c | 123 |
5 files changed, 412 insertions, 2 deletions
diff --git a/Makefile.plugins b/Makefile.plugins index f4b46303..da0c12d3 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -109,7 +109,7 @@ endif if OPENCONNECT if OPENCONNECT_BUILTIN builtin_modules += openconnect -builtin_sources += plugins/vpn.c plugins/openconnect.c plugins/vpn.h +builtin_sources += plugins/openconnect.c builtin_cflags += -DOPENCONNECT=\"@OPENCONNECT@\" else plugin_LTLIBRARIES += plugins/openconnect.la @@ -123,6 +123,31 @@ plugins_openconnect_la_LDFLAGS = $(plugin_ldflags) endif endif +if OPENVPN +if OPENVPN_BUILTIN +builtin_modules += openvpn +builtin_sources += plugins/openvpn.c +builtin_cflags += -DOPENVPN=\"@OPENVPN@\" +else +plugin_LTLIBRARIES += plugins/openvpn.la +plugin_objects += $(plugins_openvpn_la_OBJECTS) +plugins_openvpn_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/openvpn.c +plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ + -DSTATEDIR=\""$(statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +plugins_openvpn_la_LDFLAGS = $(plugin_ldflags) +endif +endif + +if OPENCONNECT_BUILTIN +builtin_sources += plugins/vpn.c plugins/vpn.h +else +if OPENVPN_BUILTIN +builtin_sources += plugins/vpn.c plugins/vpn.h +endif +endif + if PORTAL if PORTAL_BUILTIN builtin_modules += portal @@ -224,13 +249,18 @@ plugins_fake_la_CFLAGS = $(plugin_cflags) plugins_fake_la_LDFLAGS = $(plugin_ldflags) endif - if OPENCONNECT script_PROGRAMS += scripts/openconnect-script scripts_openconnect_script_LDADD = @DBUS_LIBS@ endif +if OPENVPN +script_PROGRAMS += scripts/openvpn-script + +scripts_openvpn_script_LDADD = @DBUS_LIBS@ +endif + if DHCLIENT script_DATA += scripts/dhclient.conf script_PROGRAMS += scripts/dhclient-script diff --git a/bootstrap-configure b/bootstrap-configure index bda97086..3bce9474 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -23,6 +23,7 @@ fi --enable-ofono=builtin \ --enable-dhclient=builtin \ --enable-openconnect=builtin \ + --enable-openvpn=builtin \ --enable-pacrunner=builtin \ --enable-dnsproxy=builtin \ --enable-google=builtin \ diff --git a/configure.ac b/configure.ac index 886c7ae2..94211dc0 100644 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,23 @@ AC_ARG_ENABLE(portal, AM_CONDITIONAL(PORTAL, test "${enable_portal}" != "no") AM_CONDITIONAL(PORTAL_BUILTIN, test "${enable_portal}" = "builtin") +AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn=PROGRAM], + [specify location of openvpn binary]), [path_openvpn=${withval}]) + +AC_ARG_ENABLE(openvpn, + AC_HELP_STRING([--enable-openvpn], [enable openvpn support]), + [enable_openvpn=${enableval}], [enable_openvpn="no"]) +if (test "${enable_openvpn}" != "no"); then + if (test -z "${path_openvpn}"); then + AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin) + else + OPENVPN="${path_openvpn}" + AC_SUBST(OPENVPN) + fi +fi +AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no") +AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin") + AC_ARG_ENABLE(loopback, AC_HELP_STRING([--enable-loopback], [enable loopback support]), [enable_loopback=${enableval}], [enable_loopback="no"]) diff --git a/plugins/openvpn.c b/plugins/openvpn.c new file mode 100644 index 00000000..0da6c740 --- /dev/null +++ b/plugins/openvpn.c @@ -0,0 +1,239 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2010 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <stdio.h> +#include <net/if.h> + +#include <glib.h> + +#define CONNMAN_API_SUBJECT_TO_CHANGE +#include <connman/plugin.h> +#include <connman/provider.h> +#include <connman/log.h> +#include <connman/task.h> +#include <connman/dbus.h> + +#include "vpn.h" + +static DBusConnection *connection; + +static int ov_notify(DBusMessage *msg, struct connman_provider *provider) +{ + DBusMessageIter iter, dict; + const char *reason, *key, *value; + const char *domain = NULL; + char *dns_entries = NULL; + + dbus_message_iter_init(msg, &iter); + + dbus_message_iter_get_basic(&iter, &reason); + dbus_message_iter_next(&iter); + + dbus_message_iter_init(msg, &iter); + + dbus_message_iter_get_basic(&iter, &reason); + dbus_message_iter_next(&iter); + + if (!provider) { + connman_error("No provider found"); + return VPN_STATE_FAILURE; + } + + if (strcmp(reason, "up")) + return VPN_STATE_DISCONNECT; + + domain = connman_provider_get_string(provider, "VPN.Domain"); + + dbus_message_iter_recurse(&iter, &dict); + + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry; + + dbus_message_iter_recurse(&dict, &entry); + dbus_message_iter_get_basic(&entry, &key); + dbus_message_iter_next(&entry); + dbus_message_iter_get_basic(&entry, &value); + + DBG("%s = %s", key, value); + + if (!strcmp(key, "trusted_ip")) + connman_provider_set_string(provider, "Gateway", value); + + if (!strcmp(key, "ifconfig_local")) + connman_provider_set_string(provider, "Address", value); + + if (!strcmp(key, "route_vpn_gateway")) + connman_provider_set_string(provider, "Peer", value); + + if (g_str_has_prefix(key, "foreign_option_")) { + gchar **options; + + options = g_strsplit(value, " ", 3); + if (options[0] != NULL && + !strcmp(options[0], "dhcp-option") && + options[1] != NULL && + !strcmp(options[1], "DNS") && + options[2] != NULL) { + + if (dns_entries != NULL) { + char *tmp; + + tmp = g_strjoin(" ", dns_entries, + options[2], NULL); + g_free(dns_entries); + dns_entries = tmp; + } else { + dns_entries = g_strdup(options[2]); + } + } + + g_strfreev(options); + } + + dbus_message_iter_next(&dict); + } + + if (dns_entries != NULL) { + connman_provider_set_string(provider, "DNS", dns_entries); + g_free(dns_entries); + } + + return VPN_STATE_CONNECT; +} + +static int ov_connect(struct connman_provider *provider, + struct connman_task *task, const char *if_name) +{ + const char *vpnhost, *cafile, *mtu, *certfile, *keyfile; + int err, fd; + + vpnhost = connman_provider_get_string(provider, "Host"); + if (!vpnhost) { + connman_error("Host not set; cannot enable VPN"); + return -EINVAL; + } + + cafile = connman_provider_get_string(provider, "OpenVPN.CACert"); + certfile = connman_provider_get_string(provider, "OpenVPN.Cert"); + keyfile = connman_provider_get_string(provider, "OpenVPN.Key"); + mtu = connman_provider_get_string(provider, "VPN.MTU"); + + if (mtu) + connman_task_add_argument(task, "--mtu", (char *)mtu); + + connman_task_add_argument(task, "--syslog", NULL); + + connman_task_add_argument(task, "--script-security", "2"); + + connman_task_add_argument(task, "--up", + SCRIPTDIR "/openvpn-script"); + connman_task_add_argument(task, "--up-restart", NULL); + + connman_task_add_argument(task, "--setenv", NULL); + connman_task_add_argument(task, "CONNMAN_BUSNAME", + dbus_bus_get_unique_name(connection)); + + connman_task_add_argument(task, "--setenv", NULL); + connman_task_add_argument(task, "CONNMAN_INTERFACE", + CONNMAN_TASK_INTERFACE); + + connman_task_add_argument(task, "--setenv", NULL); + connman_task_add_argument(task, "CONNMAN_PATH", + connman_task_get_path(task)); + + connman_task_add_argument(task, "--dev", if_name); + connman_task_add_argument(task, "--dev-type", "tun"); + + connman_task_add_argument(task, "--tls-client", NULL); + connman_task_add_argument(task, "--remote", (char *)vpnhost); + connman_task_add_argument(task, "--nobind", NULL); + connman_task_add_argument(task, "--persist-key", NULL); + connman_task_add_argument(task, "--persist-tun", NULL); + + connman_task_add_argument(task, "--route-noexec", NULL); + connman_task_add_argument(task, "--ifconfig-noexec", NULL); + + /* + * Disable client restarts because we can't handle this at the + * moment. The problem is that when OpenVPN decides to switch + * from CONNECTED state to RECONNECTING and then to RESOLVE, + * it is not possible to do a DNS lookup. The DNS server is + * not accessable through the tunnel anymore and so we end up + * trying to resolve the OpenVPN servers address. + */ + connman_task_add_argument(task, "--ping-restart", "0"); + + connman_task_add_argument(task, "--client", NULL); + + if (cafile) { + connman_task_add_argument(task, "--ca", + (char *)cafile); + } + + if (certfile) { + connman_task_add_argument(task, "--cert", + (char *)certfile); + } + + if (keyfile) { + connman_task_add_argument(task, "--key", + (char *)keyfile); + } + + fd = fileno(stderr); + err = connman_task_run(task, vpn_died, provider, + NULL, &fd, &fd); + if (err < 0) { + connman_error("openvpn failed to start"); + return -EIO; + } + + return 0; +} + +static struct vpn_driver vpn_driver = { + .notify = ov_notify, + .connect = ov_connect, +}; + +static int openvpn_init(void) +{ + connection = connman_dbus_get_connection(); + + return vpn_register("openvpn", &vpn_driver, OPENVPN); +} + +static void openvpn_exit(void) +{ + vpn_unregister("openvpn"); + + dbus_connection_unref(connection); +} + +CONNMAN_PLUGIN_DEFINE(openvpn, "OpenVPN plugin", VERSION, + CONNMAN_PLUGIN_PRIORITY_DEFAULT, openvpn_init, openvpn_exit) diff --git a/scripts/openvpn-script.c b/scripts/openvpn-script.c new file mode 100644 index 00000000..8d2c3ff0 --- /dev/null +++ b/scripts/openvpn-script.c @@ -0,0 +1,123 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2010 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <dbus/dbus.h> + +extern char **environ; + +static void append(DBusMessageIter *dict, const char *pattern) +{ + DBusMessageIter entry; + const char *key, *value; + char *delim; + + delim = strchr(pattern, '='); + *delim = '\0'; + + key = pattern; + value = delim + 1; + + dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, + NULL, &entry); + + dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + + dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &value); + + dbus_message_iter_close_container(dict, &entry); +} + +int main(int argc, char *argv[]) +{ + DBusConnection *conn; + DBusError error; + DBusMessage *msg; + DBusMessageIter iter, dict; + char **envp, *busname, *interface, *path, *reason; + + busname = getenv("CONNMAN_BUSNAME"); + interface = getenv("CONNMAN_INTERFACE"); + path = getenv("CONNMAN_PATH"); + + reason = getenv("script_type"); + + if (!busname || !interface || !path || !reason) { + fprintf(stderr, "Required environment variables not set\n"); + return 1; + } + dbus_error_init(&error); + + conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + if (conn == NULL) { + if (dbus_error_is_set(&error) == TRUE) { + fprintf(stderr, "%s\n", error.message); + dbus_error_free(&error); + } else + fprintf(stderr, "Failed to get on system bus\n"); + return 0; + } + + msg = dbus_message_new_method_call(busname, path, + interface, "notify"); + if (msg == NULL) { + dbus_connection_unref(conn); + fprintf(stderr, "Failed to allocate method call\n"); + return 0; + } + + dbus_message_set_no_reply(msg, TRUE); + + dbus_message_append_args(msg, + DBUS_TYPE_STRING, &reason, + DBUS_TYPE_INVALID); + + dbus_message_iter_init_append(msg, &iter); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_STRING_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + + for (envp = environ; envp && *envp; envp++) + append(&dict, *envp); + + dbus_message_iter_close_container(&iter, &dict); + + if (dbus_connection_send(conn, msg, NULL) == FALSE) + fprintf(stderr, "Failed to send message\n"); + + dbus_connection_flush(conn); + + dbus_message_unref(msg); + + dbus_connection_unref(conn); + + return 0; +} |