implemented get_remediation_instructions()

This commit is contained in:
Andreas Steffen
2012-11-10 23:47:06 +01:00
parent b217e16f7e
commit af83700f88
8 changed files with 156 additions and 19 deletions
@@ -20,6 +20,7 @@
#include <ietf/ietf_attr.h>
#include <ietf/ietf_attr_attr_request.h>
#include <ietf/ietf_attr_port_filter.h>
#include <ietf/ietf_attr_remediation_instr.h>
#include <tncif_pa_subtypes.h>
@@ -339,6 +340,39 @@ static TNC_Result receive_message(imc_msg_t *in_msg)
}
e->destroy(e);
}
else if (attr_type.type == IETF_ATTR_REMEDIATION_INSTRUCTIONS)
{
ietf_attr_remediation_instr_t *attr_cast;
pen_type_t parameters_type;
chunk_t parameters, string, lang_code;
attr_cast = (ietf_attr_remediation_instr_t*)attr;
parameters_type = attr_cast->get_parameters_type(attr_cast);
parameters = attr_cast->get_parameters(attr_cast);
if (parameters_type.vendor_id == PEN_IETF)
{
switch (parameters_type.type)
{
case IETF_REMEDIATION_PARAMETERS_URI:
DBG1(DBG_IMC, "remediation uri: '%.*s'",
parameters.len, parameters.ptr);
break;
case IETF_REMEDIATION_PARAMETERS_STRING:
string = attr_cast->get_string(attr_cast, &lang_code);
DBG1(DBG_IMC, "remediation string: '%.*s' [%.*s]",
string.len, string.ptr,
lang_code.len, lang_code.ptr);
break;
default:
DBG1(DBG_IMC, "remediation parameters %B", &parameters);
}
}
else
{
DBG1(DBG_IMC, "remediation parameters %B", &parameters);
}
}
}
enumerator->destroy(enumerator);
@@ -197,6 +197,13 @@ METHOD(imv_state_t, get_reason_string, bool,
return FALSE;
}
METHOD(imv_state_t, get_remediation_instructions, bool,
private_imv_os_state_t *this, enumerator_t *language_enumerator,
char **string, char **lang_code)
{
return FALSE;
}
METHOD(imv_state_t, destroy, void,
private_imv_os_state_t *this)
{
@@ -309,6 +316,7 @@ imv_state_t *imv_os_state_create(TNC_ConnectionID connection_id)
.get_recommendation = _get_recommendation,
.set_recommendation = _set_recommendation,
.get_reason_string = _get_reason_string,
.get_remediation_instructions = _get_remediation_instructions,
.destroy = _destroy,
},
.set_info = _set_info,
@@ -71,9 +71,9 @@ struct private_imv_scanner_state_t {
char *violating_ports;
/**
* Local copy of the reason string
* Local copy of the remediation instruction string
*/
char *reason_string;
char *instructions;
};
typedef struct entry_t entry_t;
@@ -90,10 +90,20 @@ struct entry_t {
* Table of multi-lingual reason string entries
*/
static entry_t reasons[] = {
{ "en", "The following ports are open:" },
{ "de", "Die folgenden Ports sind offen:" },
{ "fr", "Les ports suivants sont ouverts:" },
{ "pl", "Następujące porty sa otwarte:" }
{ "en", "Open server ports were detected" },
{ "de", "Offene Serverports wurden festgestellt" },
{ "fr", "Il y a des ports du serveur ouverts" },
{ "pl", "Są otwarte porty serwera" }
};
/**
* Table of multi-lingual remediation instruction string entries
*/
static entry_t instructions [] = {
{ "en", "Please close the following server ports:" },
{ "de", "Bitte schliessen Sie die folgenden Serverports:" },
{ "fr", "Fermez les ports du serveur suivants s'il vous plait:" },
{ "pl", "Proszę zamknąć następujące porty serwera:" }
};
METHOD(imv_state_t, get_connection_id, TNC_ConnectionID,
@@ -167,6 +177,7 @@ METHOD(imv_state_t, get_reason_string, bool,
{
return FALSE;
}
/* set the default language */
*reason_language = reasons[0].lang;
*reason_string = reasons[0].string;
@@ -188,10 +199,48 @@ METHOD(imv_state_t, get_reason_string, bool,
break;
}
}
this->reason_string = malloc(strlen(*reason_string) +
strlen(this->violating_ports + 1));
sprintf(this->reason_string, "%s%s", *reason_string, this->violating_ports);
*reason_string = this->reason_string;
return TRUE;
}
METHOD(imv_state_t, get_remediation_instructions, bool,
private_imv_scanner_state_t *this, enumerator_t *language_enumerator,
char **string, char **lang_code)
{
bool match = FALSE;
char *lang;
int i;
if (!this->violating_ports)
{
return FALSE;
}
/* set the default language */
*lang_code = instructions[0].lang;
*string = instructions[0].string;
while (language_enumerator->enumerate(language_enumerator, &lang))
{
for (i = 0; i < countof(instructions); i++)
{
if (streq(lang, instructions[i].lang))
{
match = TRUE;
*lang_code = instructions[i].lang;
*string = instructions[i].string;
break;
}
}
if (match)
{
break;
}
}
this->instructions = malloc(strlen(*string) +
strlen(this->violating_ports) + 1);
sprintf(this->instructions, "%s%s", *string, this->violating_ports);
*string = this->instructions;
return TRUE;
}
@@ -200,7 +249,7 @@ METHOD(imv_state_t, destroy, void,
private_imv_scanner_state_t *this)
{
free(this->violating_ports);
free(this->reason_string);
free(this->instructions);
free(this);
}
@@ -230,6 +279,7 @@ imv_state_t *imv_scanner_state_create(TNC_ConnectionID connection_id)
.get_recommendation = _get_recommendation,
.set_recommendation = _set_recommendation,
.get_reason_string = _get_reason_string,
.get_remediation_instructions = _get_remediation_instructions,
.destroy = _destroy,
},
.set_violating_ports = _set_violating_ports,
@@ -195,6 +195,13 @@ METHOD(imv_state_t, get_reason_string, bool,
return TRUE;
}
METHOD(imv_state_t, get_remediation_instructions, bool,
private_imv_test_state_t *this, enumerator_t *language_enumerator,
char **string, char **lang_code)
{
}
METHOD(imv_state_t, destroy, void,
private_imv_test_state_t *this)
{
@@ -287,6 +294,7 @@ imv_state_t *imv_test_state_create(TNC_ConnectionID connection_id)
.get_recommendation = _get_recommendation,
.set_recommendation = _set_recommendation,
.get_reason_string = _get_reason_string,
.get_remediation_instructions = _get_remediation_instructions,
.destroy = _destroy,
},
.add_imc = _add_imc,