ike-redirect: Add task to redirect active IKE_SAs
authorTobias Brunner <tobias@strongswan.org>
Tue, 28 Apr 2015 12:10:43 +0000 (14:10 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 4 Mar 2016 15:02:59 +0000 (16:02 +0100)
src/libcharon/Android.mk
src/libcharon/Makefile.am
src/libcharon/sa/ikev2/task_manager_v2.c
src/libcharon/sa/ikev2/tasks/ike_redirect.c [new file with mode: 0644]
src/libcharon/sa/ikev2/tasks/ike_redirect.h [new file with mode: 0644]
src/libcharon/sa/task.c
src/libcharon/sa/task.h

index 6fe682e..cd78e28 100644 (file)
@@ -108,6 +108,7 @@ sa/ikev2/tasks/ike_mobike.c sa/ikev2/tasks/ike_mobike.h \
 sa/ikev2/tasks/ike_rekey.c sa/ikev2/tasks/ike_rekey.h \
 sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
 sa/ikev2/tasks/ike_reauth_complete.c sa/ikev2/tasks/ike_reauth_complete.h \
+sa/ikev2/tasks/ike_redirect.c sa/ikev2/tasks/ike_redirect.h \
 sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
 sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h
 
index 3458767..71ceed3 100644 (file)
@@ -108,6 +108,7 @@ sa/ikev2/tasks/ike_mobike.c sa/ikev2/tasks/ike_mobike.h \
 sa/ikev2/tasks/ike_rekey.c sa/ikev2/tasks/ike_rekey.h \
 sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
 sa/ikev2/tasks/ike_reauth_complete.c sa/ikev2/tasks/ike_reauth_complete.h \
+sa/ikev2/tasks/ike_redirect.c sa/ikev2/tasks/ike_redirect.h \
 sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
 sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h
 endif
index 4676867..feddada 100644 (file)
@@ -30,6 +30,7 @@
 #include <sa/ikev2/tasks/ike_rekey.h>
 #include <sa/ikev2/tasks/ike_reauth.h>
 #include <sa/ikev2/tasks/ike_reauth_complete.h>
+#include <sa/ikev2/tasks/ike_redirect.h>
 #include <sa/ikev2/tasks/ike_delete.h>
 #include <sa/ikev2/tasks/ike_config.h>
 #include <sa/ikev2/tasks/ike_dpd.h>
@@ -474,6 +475,11 @@ METHOD(task_manager_t, initiate, status_t,
                                        exchange = INFORMATIONAL;
                                        break;
                                }
+                               if (activate_task(this, TASK_IKE_REDIRECT))
+                               {
+                                       exchange = INFORMATIONAL;
+                                       break;
+                               }
                                if (activate_task(this, TASK_CHILD_DELETE))
                                {
                                        exchange = INFORMATIONAL;
@@ -992,6 +998,11 @@ static status_t process_request(private_task_manager_t *this,
                                                                         * invokes all the required hooks. */
                                                                        task = (task_t*)ike_delete_create(
                                                                                                                this->ike_sa, FALSE);
+                                                                       break;
+                                                               case REDIRECT:
+                                                                       task = (task_t*)ike_redirect_create(
+                                                                                                                       this->ike_sa, NULL);
+                                                                       break;
                                                                default:
                                                                        break;
                                                        }
diff --git a/src/libcharon/sa/ikev2/tasks/ike_redirect.c b/src/libcharon/sa/ikev2/tasks/ike_redirect.c
new file mode 100644 (file)
index 0000000..f82c80f
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2015 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * 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 "ike_redirect.h"
+
+#include <daemon.h>
+#include <processing/jobs/delete_ike_sa_job.h>
+
+typedef struct private_ike_redirect_t private_ike_redirect_t;
+
+/**
+ * Private members
+ */
+struct private_ike_redirect_t {
+
+       /**
+        * Public interface
+        */
+       ike_redirect_t public;
+
+       /**
+        * Assigned IKE_SA
+        */
+       ike_sa_t *ike_sa;
+
+       /**
+        * Gateway ID to redirect to
+        */
+       identification_t *gateway;
+};
+
+METHOD(task_t, build_i, status_t,
+       private_ike_redirect_t *this, message_t *message)
+{
+       chunk_t data;
+
+       DBG1(DBG_IKE, "redirecting peer to %Y", this->gateway);
+       data = redirect_data_create(this->gateway, chunk_empty);
+       message->add_notify(message, FALSE, REDIRECT, data);
+       chunk_free(&data);
+       this->ike_sa->set_condition(this->ike_sa, COND_REDIRECTED, TRUE);
+       return NEED_MORE;
+}
+
+METHOD(task_t, process_r, status_t,
+       private_ike_redirect_t *this, message_t *message)
+{
+       notify_payload_t *notify;
+       identification_t *to;
+
+       notify = message->get_notify(message, REDIRECT);
+       if (!notify)
+       {
+               return SUCCESS;
+       }
+
+       to = redirect_data_parse(notify->get_notification_data(notify), NULL);
+       if (!to)
+       {
+               DBG1(DBG_IKE, "received invalid REDIRECT notify");
+       }
+       else
+       {
+               this->ike_sa->handle_redirect(this->ike_sa, to);
+               to->destroy(to);
+       }
+       return SUCCESS;
+}
+
+METHOD(task_t, build_r, status_t,
+       private_ike_redirect_t *this, message_t *message)
+{
+       /* not called because SUCCESS is returned above */
+       return SUCCESS;
+}
+
+METHOD(task_t, process_i, status_t,
+       private_ike_redirect_t *this, message_t *message)
+{
+       delete_ike_sa_job_t *job;
+
+       /* if the peer does not delete the SA we do so after a while */
+       job = delete_ike_sa_job_create(this->ike_sa->get_id(this->ike_sa), TRUE);
+       lib->scheduler->schedule_job(lib->scheduler, (job_t*)job,
+                                       lib->settings->get_int(lib->settings,
+                                                       "%s.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT,
+                                                       lib->ns));
+       return SUCCESS;
+}
+
+METHOD(task_t, get_type, task_type_t,
+       private_ike_redirect_t *this)
+{
+       return TASK_IKE_REDIRECT;
+}
+
+METHOD(task_t, migrate, void,
+       private_ike_redirect_t *this, ike_sa_t *ike_sa)
+{
+       this->ike_sa = ike_sa;
+}
+
+METHOD(task_t, destroy, void,
+       private_ike_redirect_t *this)
+{
+       DESTROY_IF(this->gateway);
+       free(this);
+}
+
+/*
+ * Described in header.
+ */
+ike_redirect_t *ike_redirect_create(ike_sa_t *ike_sa, identification_t *to)
+{
+       private_ike_redirect_t *this;
+
+       INIT(this,
+               .public = {
+                       .task = {
+                               .get_type = _get_type,
+                               .build = _build_r,
+                               .process = _process_r,
+                               .migrate = _migrate,
+                               .destroy = _destroy,
+                       },
+               },
+               .ike_sa = ike_sa,
+       );
+
+       if (to)
+       {
+               this->gateway = to->clone(to);
+               this->public.task.build = _build_i;
+               this->public.task.process = _process_i;
+       }
+
+       return &this->public;
+}
diff --git a/src/libcharon/sa/ikev2/tasks/ike_redirect.h b/src/libcharon/sa/ikev2/tasks/ike_redirect.h
new file mode 100644 (file)
index 0000000..afa00ce
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup ike_redirect ike_redirect
+ * @{ @ingroup tasks_v2
+ */
+
+#ifndef IKE_REDIRECT_H_
+#define IKE_REDIRECT_H_
+
+typedef struct ike_redirect_t ike_redirect_t;
+
+#include <library.h>
+#include <sa/ike_sa.h>
+#include <sa/task.h>
+
+/**
+ * Task that handles redirection requests for established SAs.
+ */
+struct ike_redirect_t {
+
+       /**
+        * Implements the task_t interface
+        */
+       task_t task;
+};
+
+/**
+ * Create a new ike_redirect_t task.
+ *
+ * As initiator (i.e. original responder) pass the ID of the target gateway,
+ * as responder (i.e. original initiator) this argument is NULL.
+ *
+ * @param ike_sa               IKE_SA this task works for
+ * @param to                   gateway ID (gets cloned), or NULL as responder
+ * @return                             task instance
+ */
+ike_redirect_t *ike_redirect_create(ike_sa_t *ike_sa,
+                                                                       identification_t *to);
+
+#endif /** IKE_REDIRECT_H_ @}*/
index b35b581..4bd2ba2 100644 (file)
@@ -28,6 +28,7 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_ISAKMP_CERT_POST,
        "IKE_REKEY",
        "IKE_REAUTH",
        "IKE_REAUTH_COMPLETE",
+       "IKE_REDIRECT",
        "IKE_DELETE",
        "IKE_DPD",
        "IKE_VENDOR",
index 7bd3da1..ae42607 100644 (file)
@@ -57,6 +57,8 @@ enum task_type_t {
        TASK_IKE_REAUTH,
        /** completion task for make-before-break IKE_SA re-authentication */
        TASK_IKE_REAUTH_COMPLETE,
+       /** redirect an active IKE_SA */
+       TASK_IKE_REDIRECT,
        /** delete an IKE_SA */
        TASK_IKE_DELETE,
        /** liveness check */