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

do not accept results and recommendation messages from clients

Browse Source
This commit is contained in:
Andreas Steffen
2010-12-10 17:04:11 +01:00
parent 7289f4424a
commit af1e3ff567
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
+29 -10
View File
@@ -382,7 +382,7 @@ static status_t process_tnc_message(private_pb_tnc_batch_t *this)
DBG1(DBG_TNC, "ignore PB-TNC Message with Vendor ID 0x%06x " DBG1(DBG_TNC, "ignore PB-TNC Message with Vendor ID 0x%06x "
" and type 0x%08x", vendor_id, msg_type); " and type 0x%08x", vendor_id, msg_type);
this->offset += msg_len; this->offset += msg_len;
return INVALID_STATE; return SUCCESS;
} }
} }
@@ -391,10 +391,23 @@ static status_t process_tnc_message(private_pb_tnc_batch_t *this)
msg_type == PB_MSG_REMEDIATION_PARAMETERS) && msg_type == PB_MSG_REMEDIATION_PARAMETERS) &&
this->type != PB_BATCH_RESULT) this->type != PB_BATCH_RESULT)
{ {
DBG1(DBG_TNC,"ignore %N Message not received within RESULT batch", if (this->is_server)
pb_tnc_msg_type_names, msg_type); {
this->offset += msg_len; DBG1(DBG_TNC,"reject %N Message received from a PB-TNC Client",
return INVALID_STATE; pb_tnc_msg_type_names, msg_type);
msg = pb_error_message_create(TRUE, IETF_VENDOR_ID,
PB_ERROR_INVALID_PARAMETER);
err_msg = (pb_error_message_t*)msg;
err_msg->set_offset(err_msg, this->offset);
goto fatal;
}
else
{
DBG1(DBG_TNC,"ignore %N Message not received within RESULT batch",
pb_tnc_msg_type_names, msg_type);
this->offset += msg_len;
return SUCCESS;
}
} }
DBG2(DBG_TNC, "processing %N Message (%u bytes)", pb_tnc_msg_type_names, DBG2(DBG_TNC, "processing %N Message (%u bytes)", pb_tnc_msg_type_names,
@@ -425,7 +438,7 @@ METHOD(pb_tnc_batch_t, process, status_t,
status_t status; status_t status;
status = process_batch_header(this, state_machine); status = process_batch_header(this, state_machine);
if (status == FAILED) if (status != SUCCESS)
{ {
return FAILED; return FAILED;
} }
@@ -433,13 +446,19 @@ METHOD(pb_tnc_batch_t, process, status_t,
this->type); this->type);
while (this->offset < this->encoding.len) while (this->offset < this->encoding.len)
{ {
status = process_tnc_message(this); switch (process_tnc_message(this))
if (status == FAILED)
{ {
return FAILED; case FAILED:
return FAILED;
case VERIFY_ERROR:
status = VERIFY_ERROR;
break;
case SUCCESS:
default:
break;
} }
} }
return SUCCESS; return status;
} }
METHOD(pb_tnc_batch_t, create_msg_enumerator, enumerator_t*, METHOD(pb_tnc_batch_t, create_msg_enumerator, enumerator_t*,