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

Try all matching XAuth secrets we find, not only the first one

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:32 +01:00
parent 3d86d76b86
commit 462c9a4f72
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/xauth_generic/xauth_generic.c
+23 -11
View File
@@ -100,7 +100,8 @@ METHOD(xauth_method_t, process_server, status_t,
shared_key_t *shared; shared_key_t *shared;
identification_t *id; identification_t *id;
chunk_t user = chunk_empty, pass = chunk_empty; chunk_t user = chunk_empty, pass = chunk_empty;
status_t status = SUCCESS; status_t status = FAILED;
int tried = 0;
enumerator = in->create_attribute_enumerator(in); enumerator = in->create_attribute_enumerator(in);
while (enumerator->enumerate(enumerator, &attr)) while (enumerator->enumerate(enumerator, &attr))
@@ -136,20 +137,31 @@ METHOD(xauth_method_t, process_server, status_t,
this->peer = id; this->peer = id;
} }
shared = lib->credmgr->get_shared(lib->credmgr, SHARED_EAP, enumerator = lib->credmgr->create_shared_enumerator(lib->credmgr,
this->server, this->peer); SHARED_EAP, this->server, this->peer);
if (!shared) while (enumerator->enumerate(enumerator, &shared, NULL, NULL))
{ {
DBG1(DBG_IKE, "no XAuth secret found for '%Y' - '%Y'", if (chunk_equals(shared->get_key(shared), pass))
this->server, this->peer); {
status = FAILED; status = SUCCESS;
break;
}
tried++;
} }
else if (!chunk_equals(shared->get_key(shared), pass)) enumerator->destroy(enumerator);
if (status != SUCCESS)
{ {
DBG1(DBG_IKE, "failed to authenticate '%Y' with XAuth", this->peer); if (!tried)
status = FAILED; {
DBG1(DBG_IKE, "no XAuth secret found for '%Y' - '%Y'",
this->server, this->peer);
}
else
{
DBG1(DBG_IKE, "none of %d found XAuth secrets for '%Y' - '%Y' "
"matched", tried, this->server, this->peer);
}
} }
DESTROY_IF(shared);
return status; return status;
} }