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

xauth-generic: honor requested XAuth credential types as a client

Browse Source 
Support requesting of XAuth PINs and print XAuth messages.
This commit is contained in:
Martin Willi
2013-09-03 16:26:19 +02:00
parent 3482cc9cf6
commit 45797bd50b
1 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/xauth_generic/xauth_generic.c
+51 -16
View File
@@ -39,7 +39,6 @@ struct private_xauth_generic_t {
* ID of the peer * ID of the peer
*/ */
identification_t *peer; identification_t *peer;
}; };
METHOD(xauth_method_t, initiate_peer, status_t, METHOD(xauth_method_t, initiate_peer, status_t,
@@ -52,28 +51,64 @@ METHOD(xauth_method_t, initiate_peer, status_t,
METHOD(xauth_method_t, process_peer, status_t, METHOD(xauth_method_t, process_peer, status_t,
private_xauth_generic_t *this, cp_payload_t *in, cp_payload_t **out) private_xauth_generic_t *this, cp_payload_t *in, cp_payload_t **out)
{ {
configuration_attribute_t *attr;
enumerator_t *enumerator;
shared_key_t *shared; shared_key_t *shared;
cp_payload_t *cp; cp_payload_t *cp;
chunk_t user, pass; chunk_t msg;
shared = lib->credmgr->get_shared(lib->credmgr, SHARED_EAP, this->peer, enumerator = in->create_attribute_enumerator(in);
this->server); while (enumerator->enumerate(enumerator, &attr))
if (!shared)
{ {
DBG1(DBG_IKE, "no XAuth secret found for '%Y' - '%Y'", this->peer, if (attr->get_type(attr) == XAUTH_MESSAGE)
this->server); {
return FAILED; chunk_printable(attr->get_chunk(attr), &msg, '?');
DBG1(DBG_CFG, "XAuth message: %.*s", (int)msg.len, msg.ptr);
free(msg.ptr);
}
} }
enumerator->destroy(enumerator);
user = this->peer->get_encoding(this->peer);
pass = shared->get_key(shared);
cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REPLY); cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REPLY);
cp->add_attribute(cp, configuration_attribute_create_chunk(
CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME, user)); enumerator = in->create_attribute_enumerator(in);
cp->add_attribute(cp, configuration_attribute_create_chunk( while (enumerator->enumerate(enumerator, &attr))
CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_PASSWORD, pass)); {
shared->destroy(shared); shared_key_type_t type = SHARED_EAP;
switch (attr->get_type(attr))
{
case XAUTH_USER_NAME:
cp->add_attribute(cp, configuration_attribute_create_chunk(
CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME,
this->peer->get_encoding(this->peer)));
break;
case XAUTH_NEXT_PIN:
type = SHARED_PIN;
/* FALL */
case XAUTH_USER_PASSWORD:
shared = lib->credmgr->get_shared(lib->credmgr, type,
this->peer, this->server);
if (!shared)
{
DBG1(DBG_IKE, "no XAuth %s found for '%Y' - '%Y'",
type == SHARED_EAP ? "password" : "PIN",
this->peer, this->server);
enumerator->destroy(enumerator);
cp->destroy(cp);
return FAILED;
}
cp->add_attribute(cp, configuration_attribute_create_chunk(
CONFIGURATION_ATTRIBUTE_V1, attr->get_type(attr),
shared->get_key(shared)));
shared->destroy(shared);
break;
default:
break;
}
}
enumerator->destroy(enumerator);
*out = cp; *out = cp;
return NEED_MORE; return NEED_MORE;
} }