IKEv1 XAUTH: Added ability to configure XAUTH+PSK. Added task to handle XAUTH requests. Modified task_manager_v1 to enable it to initiate new tasks immediately after finishing a response.
This commit is contained in:
Clavister OpenSource
@@ -49,6 +49,10 @@ static chunk_t strongswan_vid = chunk_from_chars(
|
||||
0x22,0x51,0x61,0x3b,0x2e,0xbe,0x5b,0xeb
|
||||
);
|
||||
|
||||
static chunk_t xauth6_vid = chunk_from_chars(
|
||||
0x09,0x00,0x26,0x89,0xdf,0xd6,0xb7,0x12
|
||||
);
|
||||
|
||||
METHOD(task_t, build, status_t,
|
||||
private_ike_vendor_t *this, message_t *message)
|
||||
{
|
||||
@@ -60,6 +64,11 @@ METHOD(task_t, build, status_t,
|
||||
vid = vendor_id_payload_create_data(VENDOR_ID,
|
||||
chunk_clone(strongswan_vid));
|
||||
message->add_payload(message, &vid->payload_interface);
|
||||
|
||||
vid = vendor_id_payload_create_data(VENDOR_ID,
|
||||
chunk_clone(xauth6_vid));
|
||||
message->add_payload(message, &vid->payload_interface);
|
||||
|
||||
}
|
||||
|
||||
return this->initiator ? NEED_MORE : SUCCESS;
|
||||
@@ -92,6 +101,25 @@ METHOD(task_t, process, status_t,
|
||||
DBG1(DBG_ENC, "received unknown vendor id: %#B", &data);
|
||||
}
|
||||
}
|
||||
|
||||
if (payload->get_type(payload) == VENDOR_ID_V1)
|
||||
{
|
||||
vendor_id_payload_t *vid;
|
||||
chunk_t data;
|
||||
|
||||
vid = (vendor_id_payload_t*)payload;
|
||||
data = vid->get_data(vid);
|
||||
|
||||
if (chunk_equals(data, xauth6_vid))
|
||||
{
|
||||
DBG1(DBG_IKE, "received XAuth vendor id");
|
||||
this->ike_sa->enable_extension(this->ike_sa, EXT_XAUTH);
|
||||
}
|
||||
else
|
||||
{
|
||||
DBG1(DBG_ENC, "received unknown vendor id: %#B", &data);
|
||||
}
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
|
||||
|
||||
@@ -73,6 +73,8 @@ enum task_type_t {
|
||||
TASK_MAIN_MODE,
|
||||
/** IKEv1 quick mode */
|
||||
TASK_QUICK_MODE,
|
||||
/** Request the user/pass with XAUTH */
|
||||
TASK_XAUTH_REQUEST,
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
|
||||
#include "xauth_request.h"
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <encoding/payloads/attribute_payload_v1.h>
|
||||
#include <encoding/payloads/data_attribute_v1.h>
|
||||
#include <encoding/payloads/hash_payload.h>
|
||||
#include <encoding/generator.h>
|
||||
|
||||
typedef struct private_xauth_request_t private_xauth_request_t;
|
||||
|
||||
/**
|
||||
* Private members of a xauth_request_t task.
|
||||
*/
|
||||
struct private_xauth_request_t {
|
||||
|
||||
/**
|
||||
* Public methods and task_t interface.
|
||||
*/
|
||||
xauth_request_t public;
|
||||
|
||||
/**
|
||||
* Assigned IKE_SA.
|
||||
*/
|
||||
ike_sa_t *ike_sa;
|
||||
|
||||
/**
|
||||
* Are we the initiator?
|
||||
*/
|
||||
bool initiator;
|
||||
|
||||
/**
|
||||
* virtual ip
|
||||
*/
|
||||
host_t *virtual_ip;
|
||||
|
||||
/**
|
||||
* list of attributes requested and its handler, entry_t
|
||||
*/
|
||||
linked_list_t *requested;
|
||||
};
|
||||
|
||||
/**
|
||||
* Entry for a requested attribute and the requesting handler
|
||||
*/
|
||||
typedef struct {
|
||||
/** attribute requested */
|
||||
configuration_attribute_type_t type;
|
||||
/** handler requesting this attribute */
|
||||
attribute_handler_t *handler;
|
||||
} entry_t;
|
||||
|
||||
/**
|
||||
* Scan for configuration payloads and attributes
|
||||
*/
|
||||
static void process_payloads(private_xauth_request_t *this, message_t *message)
|
||||
{
|
||||
}
|
||||
|
||||
METHOD(task_t, build_i, status_t,
|
||||
private_xauth_request_t *this, message_t *message)
|
||||
{
|
||||
attribute_payload_v1_t *ap = NULL;
|
||||
chunk_t chunk = chunk_empty;
|
||||
data_attribute_v1_t *da = NULL;
|
||||
hash_payload_t *hash_payload = NULL;
|
||||
generator_t *generator;
|
||||
chunk_t attr_chunk;
|
||||
chunk_t mid_chunk;
|
||||
u_int32_t *lenpos;
|
||||
u_int32_t message_id;
|
||||
keymat_t *keymat;
|
||||
prf_t *prf;
|
||||
chunk_t hash_in, hash_out;
|
||||
|
||||
DBG1(DBG_IKE, "BUILDING XAUTH REQUEST PACKET");
|
||||
/* TODO1: Create ATTR payload */
|
||||
ap = attribute_payload_v1_create();
|
||||
|
||||
da = data_attribute_v1_create_value(XAUTH_USER_NAME, chunk);
|
||||
ap->add_attribute(ap, da);
|
||||
|
||||
da = data_attribute_v1_create_value(XAUTH_USER_PASSWORD, chunk);
|
||||
ap->add_attribute(ap, da);
|
||||
|
||||
/* Create HASH payload */
|
||||
hash_payload = hash_payload_create();
|
||||
/* TODO1: Add data into the hash */
|
||||
|
||||
/* Calculate the chunk for the ATTR payload */
|
||||
generator = generator_create();
|
||||
ap->payload_interface.set_next_type(&ap->payload_interface, NO_PAYLOAD);
|
||||
generator->generate_payload(generator, (payload_t *)ap);
|
||||
attr_chunk = generator->get_chunk(generator, &lenpos);
|
||||
|
||||
/* Get the message ID in network order */
|
||||
htoun32(&message_id, message->get_message_id(message));
|
||||
mid_chunk = chunk_from_thing(message_id);
|
||||
|
||||
/* Get the hashed data */
|
||||
hash_in = chunk_cat("cc", mid_chunk, attr_chunk);
|
||||
|
||||
message->add_payload(message, (payload_t *)hash_payload);
|
||||
message->add_payload(message, (payload_t *)ap);
|
||||
|
||||
return NEED_MORE;
|
||||
}
|
||||
|
||||
METHOD(task_t, process_r, status_t,
|
||||
private_xauth_request_t *this, message_t *message)
|
||||
{
|
||||
return NEED_MORE;
|
||||
}
|
||||
|
||||
METHOD(task_t, build_r, status_t,
|
||||
private_xauth_request_t *this, message_t *message)
|
||||
{
|
||||
return NEED_MORE;
|
||||
}
|
||||
|
||||
METHOD(task_t, process_i, status_t,
|
||||
private_xauth_request_t *this, message_t *message)
|
||||
{
|
||||
return NEED_MORE;
|
||||
}
|
||||
|
||||
METHOD(task_t, get_type, task_type_t,
|
||||
private_xauth_request_t *this)
|
||||
{
|
||||
return TASK_XAUTH_REQUEST;
|
||||
}
|
||||
|
||||
METHOD(task_t, migrate, void,
|
||||
private_xauth_request_t *this, ike_sa_t *ike_sa)
|
||||
{
|
||||
DESTROY_IF(this->virtual_ip);
|
||||
|
||||
this->ike_sa = ike_sa;
|
||||
this->virtual_ip = NULL;
|
||||
this->requested->destroy_function(this->requested, free);
|
||||
this->requested = linked_list_create();
|
||||
}
|
||||
|
||||
METHOD(task_t, destroy, void,
|
||||
private_xauth_request_t *this)
|
||||
{
|
||||
DESTROY_IF(this->virtual_ip);
|
||||
this->requested->destroy_function(this->requested, free);
|
||||
free(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* Described in header.
|
||||
*/
|
||||
xauth_request_t *xauth_request_create(ike_sa_t *ike_sa, bool initiator)
|
||||
{
|
||||
private_xauth_request_t *this;
|
||||
|
||||
INIT(this,
|
||||
.public = {
|
||||
.task = {
|
||||
.get_type = _get_type,
|
||||
.migrate = _migrate,
|
||||
.destroy = _destroy,
|
||||
},
|
||||
},
|
||||
.initiator = initiator,
|
||||
.ike_sa = ike_sa,
|
||||
.requested = linked_list_create(),
|
||||
);
|
||||
|
||||
if (initiator)
|
||||
{
|
||||
this->public.task.build = _build_i;
|
||||
this->public.task.process = _process_i;
|
||||
}
|
||||
else
|
||||
{
|
||||
this->public.task.build = _build_r;
|
||||
this->public.task.process = _process_r;
|
||||
}
|
||||
|
||||
return &this->public;
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
|
||||
/**
|
||||
* @defgroup xauth_request xauth_request
|
||||
* @{ @ingroup tasks
|
||||
*/
|
||||
|
||||
#ifndef XAUTH_REQUEST_H_
|
||||
#define XAUTH_REQUEST_H_
|
||||
|
||||
typedef struct xauth_request_t xauth_request_t;
|
||||
|
||||
#include <library.h>
|
||||
#include <sa/ike_sa.h>
|
||||
#include <sa/tasks/task.h>
|
||||
|
||||
/**
|
||||
* Task of type XAUTH_REQUEST, gets the username and password from the ISAKMP_SA
|
||||
* initializer.
|
||||
*/
|
||||
struct xauth_request_t {
|
||||
|
||||
/**
|
||||
* Implements the task_t interface
|
||||
*/
|
||||
task_t task;
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a new xauth_request task.
|
||||
*
|
||||
* @param ike_sa IKE_SA this task works for
|
||||
* @param initiator TRUE for initiator
|
||||
* @return ike_config task to handle by the task_manager
|
||||
*/
|
||||
xauth_request_t *xauth_request_create(ike_sa_t *ike_sa, bool initiator);
|
||||
|
||||
#endif /** XAUTH_REQUEST_H_ @}*/
|
||||
Reference in New Issue
Block a user