denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ikev1: Queue INFORMATIONAL messages during XAuth

Browse Source 
Some peers send an INITIAL_CONTACT notify after they received our XAuth
username.  The XAuth task waiting for the third XAuth message handles
this incorrectly and closes the IKE_SA as no configuration payloads are
contained in the message.  We queue the INFORMATIONAL until the XAuth
exchange is complete to avoid this issue.

Fixes #1434.
This commit is contained in:
Tobias Brunner
2016-06-06 13:52:58 +02:00
parent a366fa365e
commit 1b4e7fe1e8
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+12 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007-2015 Tobias Brunner * Copyright (C) 2007-2016 Tobias Brunner
* Copyright (C) 2007-2011 Martin Willi * Copyright (C) 2007-2011 Martin Willi
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
@@ -935,9 +935,9 @@ static bool have_quick_mode_task(private_task_manager_t *this, uint32_t mid)
} }
/** /**
* Check if we still have an aggressive mode task queued * Check if we still have a specific task queued
*/ */
static bool have_aggressive_mode_task(private_task_manager_t *this) static bool have_task_queued(private_task_manager_t *this, task_type_t type)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
task_t *task; task_t *task;
@@ -946,7 +946,7 @@ static bool have_aggressive_mode_task(private_task_manager_t *this)
enumerator = this->passive_tasks->create_enumerator(this->passive_tasks); enumerator = this->passive_tasks->create_enumerator(this->passive_tasks);
while (enumerator->enumerate(enumerator, &task)) while (enumerator->enumerate(enumerator, &task))
{ {
if (task->get_type(task) == TASK_AGGRESSIVE_MODE) if (task->get_type(task) == type)
{ {
found = TRUE; found = TRUE;
break; break;
@@ -1405,7 +1405,7 @@ METHOD(task_manager_t, process_message, status_t,
/* drop XAuth/Mode Config/Quick Mode messages until we received the last /* drop XAuth/Mode Config/Quick Mode messages until we received the last
* Aggressive Mode message. since Informational messages are not * Aggressive Mode message. since Informational messages are not
* retransmitted we queue them. */ * retransmitted we queue them. */
if (have_aggressive_mode_task(this)) if (have_task_queued(this, TASK_AGGRESSIVE_MODE))
{ {
if (msg->get_exchange_type(msg) == INFORMATIONAL_V1) if (msg->get_exchange_type(msg) == INFORMATIONAL_V1)
{ {
@@ -1427,6 +1427,13 @@ METHOD(task_manager_t, process_message, status_t,
return queue_message(this, msg); return queue_message(this, msg);
} }
/* some peers send INITIAL_CONTACT notifies during XAuth, cache it */
if (have_task_queued(this, TASK_XAUTH) &&
msg->get_exchange_type(msg) == INFORMATIONAL_V1)
{
return queue_message(this, msg);
}
msg->set_request(msg, TRUE); msg->set_request(msg, TRUE);
charon->bus->message(charon->bus, msg, TRUE, FALSE); charon->bus->message(charon->bus, msg, TRUE, FALSE);
status = parse_message(this, msg); status = parse_message(this, msg);