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

implemented IETF String Version attribute

Browse Source
This commit is contained in:
Andreas Steffen
2012-10-10 12:30:18 +02:00
parent 7d202f56b9
commit 7174a0a527
8 changed files with 446 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imc_os/imc_os.c
+23 -5
View File
@@ -18,11 +18,12 @@
#include <imc/imc_agent.h>
#include <pa_tnc/pa_tnc_msg.h>
#include <ietf/ietf_attr.h>
#include <ietf/ietf_attr_assess_result.h>
#include <ietf/ietf_attr_attr_request.h>
#include <ietf/ietf_attr_product_info.h>
#include <ietf/ietf_attr_installed_packages.h>
#include <ietf/ietf_attr_pa_tnc_error.h>
#include <ietf/ietf_attr_assess_result.h>
#include <ietf/ietf_attr_product_info.h>
#include <ietf/ietf_attr_string_version.h>
#include <tncif_pa_subtypes.h>
@@ -104,13 +105,26 @@ TNC_Result TNC_IMC_NotifyConnectionChange(TNC_IMCID imc_id,
}
/**
* Add an IETF Product Information attribute to the send queue
* Add IETF Product Information attribute to the send queue
*/
static void add_product_info(linked_list_t *attr_list)
{
pa_tnc_attr_t *attr;
char *os_name = "Ubuntu";
attr = ietf_attr_product_info_create(PEN_IETF, 0, "Ubuntu 12.04 LTS i686");
attr = ietf_attr_product_info_create(PEN_IETF, 0, os_name);
attr_list->insert_last(attr_list, attr);
}
/**
* Add IETF String Version attribute to the send queue
*/
static void add_string_version(linked_list_t *attr_list)
{
pa_tnc_attr_t *attr;
chunk_t os_version = { "12.04", 5};
attr = ietf_attr_string_version_create(os_version, chunk_empty, chunk_empty);
attr_list->insert_last(attr_list, attr);
}
@@ -148,12 +162,13 @@ TNC_Result TNC_IMC_BeginHandshake(TNC_IMCID imc_id,
}
if (lib->settings->get_bool(lib->settings,
"libimcv.plugins.imc-os.send_product_info", TRUE))
"libimcv.plugins.imc-os.send_info", TRUE))
{
linked_list_t *attr_list;
attr_list = linked_list_create();
add_product_info(attr_list);
add_string_version(attr_list);
result = imc_os->send_message(imc_os, connection_id, FALSE, 0,
TNC_IMVID_ANY, attr_list);
attr_list->destroy(attr_list);
@@ -238,6 +253,9 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
case IETF_ATTR_PRODUCT_INFORMATION:
add_product_info(attr_list);
break;
case IETF_ATTR_STRING_VERSION:
add_string_version(attr_list);
break;
case IETF_ATTR_INSTALLED_PACKAGES:
add_installed_packages(attr_list);
break;
src/libimcv/plugins/imv_os/imv_os.c
+35 -11
View File
@@ -19,9 +19,10 @@
#include <pa_tnc/pa_tnc_msg.h>
#include <ietf/ietf_attr.h>
#include <ietf/ietf_attr_attr_request.h>
#include <ietf/ietf_attr_product_info.h>
#include <ietf/ietf_attr_installed_packages.h>
#include <ietf/ietf_attr_pa_tnc_error.h>
#include <ietf/ietf_attr_product_info.h>
#include <ietf/ietf_attr_string_version.h>
#include <tncif_names.h>
#include <tncif_pa_subtypes.h>
@@ -111,6 +112,8 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
imv_os_state_t *os_state;
enumerator_t *enumerator;
TNC_Result result;
char *os_name = NULL;
chunk_t os_version = chunk_empty;
bool fatal_error, assessment = FALSE;
if (!imv_os)
@@ -155,19 +158,25 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
case IETF_ATTR_PRODUCT_INFORMATION:
{
ietf_attr_product_info_t *attr_cast;
char *info;
attr_cast = (ietf_attr_product_info_t*)attr;
info = attr_cast->get_info(attr_cast, NULL, NULL);
os_state->set_info(os_state, info);
DBG1(DBG_IMV, "operating system is '%s'", info);
/* request installed packages */
attr = ietf_attr_attr_request_create(PEN_IETF,
IETF_ATTR_INSTALLED_PACKAGES);
attr_list->insert_last(attr_list, attr);
os_name = attr_cast->get_info(attr_cast, NULL, NULL);
DBG1(DBG_IMV, "operating system name is '%s'", os_name);
break;
}
}
case IETF_ATTR_STRING_VERSION:
{
ietf_attr_string_version_t *attr_cast;
attr_cast = (ietf_attr_string_version_t*)attr;
os_version = attr_cast->get_version(attr_cast, NULL, NULL);
if (os_version.len)
{
DBG1(DBG_IMV, "operating system version is '%.*s'",
os_version.len, os_version.ptr);
}
break;
}
case IETF_ATTR_INSTALLED_PACKAGES:
{
ietf_attr_installed_packages_t *attr_cast;
@@ -194,6 +203,17 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
}
}
enumerator->destroy(enumerator);
if (os_name && os_version.len)
{
os_state->set_info(os_state, os_name, os_version);
DBG1(DBG_IMV, "requesting installed packages for '%s'",
os_state->get_info(os_state));
attr = ietf_attr_attr_request_create(PEN_IETF,
IETF_ATTR_INSTALLED_PACKAGES);
attr_list->insert_last(attr_list, attr);
}
pa_tnc_msg->destroy(pa_tnc_msg);
if (fatal_error)
@@ -203,6 +223,7 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
TNC_IMV_EVALUATION_RESULT_ERROR);
assessment = TRUE;
}
if (assessment)
{
attr_list->destroy_offset(attr_list, offsetof(pa_tnc_attr_t, destroy));
@@ -295,10 +316,13 @@ TNC_Result TNC_IMV_BatchEnding(TNC_IMVID imv_id,
{
pa_tnc_attr_t *attr;
linked_list_t *attr_list;
ietf_attr_attr_request_t *attr_cast;
attr_list = linked_list_create();
attr = ietf_attr_attr_request_create(PEN_IETF,
IETF_ATTR_PRODUCT_INFORMATION);
attr_cast = (ietf_attr_attr_request_t*)attr;
attr_cast->add(attr_cast, PEN_IETF, IETF_ATTR_STRING_VERSION);
attr_list->insert_last(attr_list, attr);
result = imv_os->send_message(imv_os, connection_id, FALSE, imv_id,
TNC_IMCID_ANY, attr_list);
src/libimcv/plugins/imv_os/imv_os_state.c
+7 -2
View File
@@ -164,9 +164,14 @@ METHOD(imv_state_t, destroy, void,
}
METHOD(imv_os_state_t, set_info, void,
private_imv_os_state_t *this, char *info)
private_imv_os_state_t *this, char *name, chunk_t version)
{
this->info = strdup(info);
int len = strlen(name) + 1 + version.len + 1;
/* OS info is a concatenation of OS name and OS version */
free(this->info);
this->info = malloc(len);
snprintf(this->info, len, "%s %.*s", name, version.len, version.ptr);
}
METHOD(imv_os_state_t, get_info, char*,
src/libimcv/plugins/imv_os/imv_os_state.h
+6 -1
View File
@@ -39,11 +39,16 @@ struct imv_os_state_t {
/**
* Set OS Product Information
*
* @param name OS name
* @param version OS version
*/
void (*set_info)(imv_os_state_t *this, char *info);
void (*set_info)(imv_os_state_t *this, char *name, chunk_t version);
/**
* Get OS Product Information
*
* @result OS name & version
*/
char* (*get_info)(imv_os_state_t *this);