added IETF standard error handling method

diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.c b/src/libimcv/pa_tnc/pa_tnc_msg.c
index f8d3b9d0e8034a52cfd3f3bcf084f76bac98e53f..b5df0a5b57cfef6df036a10bdf06d6cbffbfe641 100644 (file)
--- a/src/libimcv/pa_tnc/pa_tnc_msg.c
+++ b/src/libimcv/pa_tnc/pa_tnc_msg.c
@@ -311,6 +311,63 @@ err:
        return VERIFY_ERROR;
 }
 
+METHOD(pa_tnc_msg_t, process_ietf_std_errors, bool,
+       private_pa_tnc_msg_t *this)
+{
+       enumerator_t *enumerator;
+       pa_tnc_attr_t *attr;
+       bool fatal_error = FALSE;
+
+       enumerator = this->attributes->create_enumerator(this->attributes);
+       while (enumerator->enumerate(enumerator, &attr))
+       {
+               if (attr->get_vendor_id(attr) == PEN_IETF &&
+                       attr->get_type(attr) == IETF_ATTR_PA_TNC_ERROR)
+               {
+                       ietf_attr_pa_tnc_error_t *error_attr;
+                       pen_t error_vendor_id;
+                       pa_tnc_error_code_t error_code;
+                       chunk_t msg_info, attr_info;
+                       u_int32_t offset;
+
+                       error_attr = (ietf_attr_pa_tnc_error_t*)attr;
+                       error_vendor_id = error_attr->get_vendor_id(error_attr);
+                       error_code = error_attr->get_error_code(error_attr);
+                       msg_info = error_attr->get_msg_info(error_attr);
+
+                       /* skip errors from non-IETF namespaces */
+                       if (error_vendor_id != PEN_IETF)
+                       {
+                               continue;
+                       }
+                       DBG1(DBG_IMC, "received PA-TNC error '%N' concerning message "
+                                "0x%08x/0x%08x", pa_tnc_error_code_names, error_code,
+                                untoh32(msg_info.ptr), untoh32(msg_info.ptr + 4));
+
+                       switch (error_code)
+                       {
+                               case PA_ERROR_INVALID_PARAMETER:
+                                       offset = error_attr->get_offset(error_attr);
+                                       DBG1(DBG_IMC, "  occurred at offset of %u bytes", offset);
+                                       break;
+                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
+                                       attr_info = error_attr->get_attr_info(error_attr);
+                                       DBG1(DBG_IMC, "  unsupported attribute %#B", &attr_info);
+                                       break;
+                               default:
+                                       break;
+                       }
+
+                       /* remove the processed IETF standard error attribute */
+                       this->attributes->remove_at(this->attributes, enumerator);
+                       fatal_error = TRUE;
+               }
+       }
+       enumerator->destroy(enumerator);
+
+       return fatal_error;
+}
+
 METHOD(pa_tnc_msg_t, create_attribute_enumerator, enumerator_t*,
        private_pa_tnc_msg_t *this)
 {
@@ -347,6 +404,7 @@ pa_tnc_msg_t *pa_tnc_msg_create_from_data(chunk_t data)
                        .add_attribute = _add_attribute,
                        .build = _build,
                        .process = _process,
+                       .process_ietf_std_errors = _process_ietf_std_errors,
                        .create_attribute_enumerator = _create_attribute_enumerator,
                        .create_error_enumerator = _create_error_enumerator,
                        .destroy = _destroy,

diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.h b/src/libimcv/pa_tnc/pa_tnc_msg.h
index bff954678e6279586581548ad4e7411378c87c7f..c3ce829d55eefdd6a1a65737e6eee4a1e1f9019b 100644 (file)
--- a/src/libimcv/pa_tnc/pa_tnc_msg.h
+++ b/src/libimcv/pa_tnc/pa_tnc_msg.h
@@ -61,6 +61,13 @@ struct pa_tnc_msg_t {
         */
        status_t (*process)(pa_tnc_msg_t *this);
 
+       /**
+        * Process and remove all IETF standard error PA-TNC attributes
+        *
+        * @return                                      TRUE if at least one error attribute processed
+        */
+       bool (*process_ietf_std_errors)(pa_tnc_msg_t *this);
+
        /**
         * Enumerates over all PA-TNC attributes
         *

diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner.c b/src/libimcv/plugins/imc_scanner/imc_scanner.c
index 4cdf2bdb6d452db626a507198734e1a15c12fff4..a54aafecdf0776df3a3326c62fdc4bf2fa9156ff 100644 (file)
--- a/src/libimcv/plugins/imc_scanner/imc_scanner.c
+++ b/src/libimcv/plugins/imc_scanner/imc_scanner.c
@@ -270,9 +270,8 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
        pa_tnc_msg_t *pa_tnc_msg;
        pa_tnc_attr_t *attr;
        imc_state_t *state;
-       enumerator_t *enumerator;
        TNC_Result result;
-       bool fatal_error = FALSE;
+       bool fatal_error;
 
        if (!imc_scanner)
        {
@@ -296,43 +295,8 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                return result;
        }
 
-       /* analyze PA-TNC attributes */
-       enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
-       while (enumerator->enumerate(enumerator, &attr))
-       {
-               ietf_attr_pa_tnc_error_t *error_attr;
-               pa_tnc_error_code_t error_code;
-               chunk_t msg_info, attr_info;
-               u_int32_t offset;
-
-               if (attr->get_vendor_id(attr) != PEN_IETF &&
-                       attr->get_type(attr) != IETF_ATTR_PA_TNC_ERROR)
-               {
-                       continue;
-               }
-
-               error_attr = (ietf_attr_pa_tnc_error_t*)attr;
-               error_code = error_attr->get_error_code(error_attr);
-               msg_info = error_attr->get_msg_info(error_attr);
-               DBG1(DBG_IMC, "received PA-TNC error '%N' concerning message %#B",
-                        pa_tnc_error_code_names, error_code, &msg_info);
-
-               switch (error_code)
-               {
-                       case PA_ERROR_INVALID_PARAMETER:
-                               offset = error_attr->get_offset(error_attr);
-                               DBG1(DBG_IMC, "  occurred at offset of %u bytes", offset);
-                               break;
-                       case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                               attr_info = error_attr->get_attr_info(error_attr);
-                               DBG1(DBG_IMC, "  unsupported attribute %#B", &attr_info);
-                               break;
-                       default:
-                               break;
-               }
-               fatal_error = TRUE;
-       }
-       enumerator->destroy(enumerator);
+       /* preprocess any IETF standard error attributes */
+       fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
        pa_tnc_msg->destroy(pa_tnc_msg);
 
        /* if no error occurred then always return the same response */

diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
index 732a625d4542b3e541834e3119fdc79780427468..b7858c5e7bf47d7c099b4d1cafb9c1de92a3be36 100644 (file)
--- a/src/libimcv/plugins/imc_test/imc_test.c
+++ b/src/libimcv/plugins/imc_test/imc_test.c
@@ -279,41 +279,15 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                return result;
        }
 
+       /* preprocess any IETF standard error attributes */
+       fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
+
        /* analyze PA-TNC attributes */
        enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
        while (enumerator->enumerate(enumerator, &attr))
        {
-               if (attr->get_vendor_id(attr) == PEN_IETF &&
-                       attr->get_type(attr) == IETF_ATTR_PA_TNC_ERROR)
-               {
-                       ietf_attr_pa_tnc_error_t *error_attr;
-                       pa_tnc_error_code_t error_code;
-                       chunk_t msg_info, attr_info;
-                       u_int32_t offset;
-
-                       error_attr = (ietf_attr_pa_tnc_error_t*)attr;
-                       error_code = error_attr->get_error_code(error_attr);
-                       msg_info = error_attr->get_msg_info(error_attr);
-
-                       DBG1(DBG_IMC, "received PA-TNC error '%N' concerning message %#B",
-                                pa_tnc_error_code_names, error_code, &msg_info);
-                       switch (error_code)
-                       {
-                               case PA_ERROR_INVALID_PARAMETER:
-                                       offset = error_attr->get_offset(error_attr);
-                                       DBG1(DBG_IMC, "  occurred at offset of %u bytes", offset);
-                                       break;
-                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                                       attr_info = error_attr->get_attr_info(error_attr);
-                                       DBG1(DBG_IMC, "  unsupported attribute %#B", &attr_info);
-                                       break;
-                               default:
-                                       break;
-                       }
-                       fatal_error = TRUE;
-               }
-               else if (attr->get_vendor_id(attr) == PEN_ITA &&
-                                attr->get_type(attr) == ITA_ATTR_COMMAND)
+               if (attr->get_vendor_id(attr) == PEN_ITA &&
+                       attr->get_type(attr) == ITA_ATTR_COMMAND)
                {
                        ita_attr_command_t *ita_attr;
                        char *command;

diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner.c b/src/libimcv/plugins/imv_scanner/imv_scanner.c
index 0b2187a249911c569bd8c57bb56a9a856e7530ae..845511555ed6f0d7570ead2ec2c34e506ad8f663 100644 (file)
--- a/src/libimcv/plugins/imv_scanner/imv_scanner.c
+++ b/src/libimcv/plugins/imv_scanner/imv_scanner.c
@@ -189,7 +189,7 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
        imv_state_t *state;
        enumerator_t *enumerator;
        TNC_Result result;
-       bool fatal_error = FALSE;
+       bool fatal_error;
 
        if (!imv_scanner)
        {
@@ -213,44 +213,15 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
                return result;
        }
 
+       /* preprocess any IETF standard error attributes */
+       fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
+
        /* analyze PA-TNC attributes */
        enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
        while (enumerator->enumerate(enumerator, &attr))
        {
-               if (attr->get_vendor_id(attr) != PEN_IETF)
-               {
-                       continue;
-               }
-
-               if (attr->get_type(attr) == IETF_ATTR_PA_TNC_ERROR)
-               {
-                       ietf_attr_pa_tnc_error_t *error_attr;
-                       pa_tnc_error_code_t error_code;
-                       chunk_t msg_info, attr_info;
-                       u_int32_t offset;
-
-                       error_attr = (ietf_attr_pa_tnc_error_t*)attr;
-                       error_code = error_attr->get_error_code(error_attr);
-                       msg_info = error_attr->get_msg_info(error_attr);
-                       DBG1(DBG_IMV, "received PA-TNC error '%N' concerning message %#B",
-                                pa_tnc_error_code_names, error_code, &msg_info);
-
-                       switch (error_code)
-                       {
-                               case PA_ERROR_INVALID_PARAMETER:
-                                       offset = error_attr->get_offset(error_attr);
-                                       DBG1(DBG_IMV, "  occurred at offset of %u bytes", offset);
-                                       break;
-                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                                       attr_info = error_attr->get_attr_info(error_attr);
-                                       DBG1(DBG_IMV, "  unsupported attribute %#B", &attr_info);
-                                       break;
-                               default:
-                                       break;
-                       }
-                       fatal_error = TRUE;
-               }
-               else if (attr->get_type(attr) == IETF_ATTR_PORT_FILTER)
+               if (attr->get_vendor_id(attr) == PEN_IETF &&
+                       attr->get_type(attr) == IETF_ATTR_PORT_FILTER)
                {
                        ietf_attr_port_filter_t *attr_port_filter;
                        enumerator_t *enumerator;

diff --git a/src/libimcv/plugins/imv_test/imv_test.c b/src/libimcv/plugins/imv_test/imv_test.c
index d19c7c04c43cb0b3b35d1635808ba20e069d738e..be5aa98a66ebdf53dd7008dbe626803396102378 100644 (file)
--- a/src/libimcv/plugins/imv_test/imv_test.c
+++ b/src/libimcv/plugins/imv_test/imv_test.c
@@ -140,7 +140,7 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
        imv_test_state_t *imv_test_state;
        enumerator_t *enumerator;
        TNC_Result result;
-       bool fatal_error = FALSE, retry = FALSE;
+       bool fatal_error, retry = FALSE;
 
        if (!imv_test)
        {
@@ -164,41 +164,15 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
                return result;
        }
 
+       /* preprocess any IETF standard error attributes */
+       fatal_error = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg);
+
        /* analyze PA-TNC attributes */
        enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
        while (enumerator->enumerate(enumerator, &attr))
        {
-               if (attr->get_vendor_id(attr) == PEN_IETF &&
-                       attr->get_type(attr) == IETF_ATTR_PA_TNC_ERROR)
-               {
-                       ietf_attr_pa_tnc_error_t *error_attr;
-                       pa_tnc_error_code_t error_code;
-                       chunk_t msg_info, attr_info;
-                       u_int32_t offset;
-
-                       error_attr = (ietf_attr_pa_tnc_error_t*)attr;
-                       error_code = error_attr->get_error_code(error_attr);
-                       msg_info = error_attr->get_msg_info(error_attr);
-
-                       DBG1(DBG_IMV, "received PA-TNC error '%N' concerning message %#B",
-                                pa_tnc_error_code_names, error_code, &msg_info);
-                       switch (error_code)
-                       {
-                               case PA_ERROR_INVALID_PARAMETER:
-                                       offset = error_attr->get_offset(error_attr);
-                                       DBG1(DBG_IMV, "  occurred at offset of %u bytes", offset);
-                                       break;
-                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                                       attr_info = error_attr->get_attr_info(error_attr);
-                                       DBG1(DBG_IMV, "  unsupported attribute %#B", &attr_info);
-                                       break;
-                               default:
-                                       break;
-                       }
-                       fatal_error = TRUE;
-               }
-               else if (attr->get_vendor_id(attr) == PEN_ITA &&
-                                attr->get_type(attr) == ITA_ATTR_COMMAND)
+               if (attr->get_vendor_id(attr) == PEN_ITA &&
+                       attr->get_type(attr) == ITA_ATTR_COMMAND)
                {
                        ita_attr_command_t *ita_attr;
                        char *command;

diff --git a/src/libpts/plugins/imc_attestation/imc_attestation.c b/src/libpts/plugins/imc_attestation/imc_attestation.c
index 683cf98b551ab269296c626890022c9eff0cf4f5..4f77ba09379e93304663dd258e366bfe1f6290d8 100644 (file)
--- a/src/libpts/plugins/imc_attestation/imc_attestation.c
+++ b/src/libpts/plugins/imc_attestation/imc_attestation.c
@@ -205,8 +205,11 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                return result;
        }
        
+       /* preprocess any IETF standard error attributes */
+       result = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg) ?
+                                       TNC_RESULT_FATAL : TNC_RESULT_SUCCESS;
+
        attr_list = linked_list_create();
-       result = TNC_RESULT_SUCCESS;
 
        /* analyze PA-TNC attributes */
        enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
@@ -216,30 +219,24 @@ static TNC_Result receive_message(TNC_IMCID imc_id,
                        attr->get_type(attr) == IETF_ATTR_PA_TNC_ERROR)
                {
                        ietf_attr_pa_tnc_error_t *error_attr;
+                       pen_t error_vendor_id;
                        pa_tnc_error_code_t error_code;
-                       chunk_t msg_info, attr_info;
-                       u_int32_t offset;
+                       chunk_t msg_info;
 
                        error_attr = (ietf_attr_pa_tnc_error_t*)attr;
-                       error_code = error_attr->get_error_code(error_attr);
-                       msg_info = error_attr->get_msg_info(error_attr);
+                       error_vendor_id = error_attr->get_vendor_id(error_attr);
 
-                       DBG1(DBG_IMC, "received PA-TNC error '%N' concerning message %#B",
-                                pa_tnc_error_code_names, error_code, &msg_info);
-                       switch (error_code)
+                       if (error_vendor_id == PEN_TCG)
                        {
-                               case PA_ERROR_INVALID_PARAMETER:
-                                       offset = error_attr->get_offset(error_attr);
-                                       DBG1(DBG_IMC, "  occurred at offset of %u bytes", offset);
-                                       break;
-                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                                       attr_info = error_attr->get_attr_info(error_attr);
-                                       DBG1(DBG_IMC, "  unsupported attribute %#B", &attr_info);
-                                       break;
-                               default:
-                                       break;
+                               error_code = error_attr->get_error_code(error_attr);
+                               msg_info = error_attr->get_msg_info(error_attr);
+
+                               DBG1(DBG_IMC, "received TCG-PTS error '%N'",
+                                        pts_error_code_names, error_code);
+                               DBG1(DBG_IMC, "error information: %B", &msg_info);
+
+                               result = TNC_RESULT_FATAL;
                        }
-                       result = TNC_RESULT_FATAL;
                }
                else if (attr->get_vendor_id(attr) == PEN_TCG)
                {

diff --git a/src/libpts/plugins/imv_attestation/imv_attestation.c b/src/libpts/plugins/imv_attestation/imv_attestation.c
index 7803fb68717561094018b4959eed5db1f14eb66a..cd6f5b524417d7d59db20d265b12a702d4599626 100644 (file)
--- a/src/libpts/plugins/imv_attestation/imv_attestation.c
+++ b/src/libpts/plugins/imv_attestation/imv_attestation.c
@@ -239,8 +239,11 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
                return result;
        }
 
+       /* preprocess any IETF standard error attributes */
+       result = pa_tnc_msg->process_ietf_std_errors(pa_tnc_msg) ?
+                                       TNC_RESULT_FATAL : TNC_RESULT_SUCCESS;
+
        attr_list = linked_list_create();
-       result = TNC_RESULT_SUCCESS;
 
        /* analyze PA-TNC attributes */
        enumerator = pa_tnc_msg->create_attribute_enumerator(pa_tnc_msg);
@@ -253,43 +256,22 @@ static TNC_Result receive_message(TNC_IMVID imv_id,
                                ietf_attr_pa_tnc_error_t *error_attr;
                                pen_t error_vendor_id;
                                pa_tnc_error_code_t error_code;
-                               chunk_t msg_info, attr_info;
-                               u_int32_t offset;
+                               chunk_t msg_info;
 
                                error_attr = (ietf_attr_pa_tnc_error_t*)attr;
                                error_vendor_id = error_attr->get_vendor_id(error_attr);
-                               error_code = error_attr->get_error_code(error_attr);
-                               msg_info = error_attr->get_msg_info(error_attr);
 
-                               if (error_vendor_id == PEN_IETF)
-                               {
-                                       DBG1(DBG_IMV, "received PA-TNC error '%N' "
-                                                                 "concerning message %#B",
-                                                pa_tnc_error_code_names, error_code, &msg_info);
-
-                                       switch (error_code)
-                                       {
-                                               case PA_ERROR_INVALID_PARAMETER:
-                                                       offset = error_attr->get_offset(error_attr);
-                                                       DBG1(DBG_IMV, "  occurred at offset of %u bytes",
-                                                                offset);
-                                                       break;
-                                               case PA_ERROR_ATTR_TYPE_NOT_SUPPORTED:
-                                                       attr_info = error_attr->get_attr_info(error_attr);
-                                                       DBG1(DBG_IMV, "  unsupported attribute %#B",
-                                                                &attr_info);
-                                                       break;
-                                               default:
-                                                       break;
-                                       }
-                               }
-                               else if (error_vendor_id == PEN_TCG)
+                               if (error_vendor_id == PEN_TCG)
                                {
+                                       error_code = error_attr->get_error_code(error_attr);
+                                       msg_info = error_attr->get_msg_info(error_attr);
+
                                        DBG1(DBG_IMV, "received TCG-PTS error '%N'",
                                                 pts_error_code_names, error_code);
                                        DBG1(DBG_IMV, "error information: %B", &msg_info);
+
+                                       result = TNC_RESULT_FATAL;
                                }
-                               result = TNC_RESULT_FATAL;
                        }
                        else if (attr->get_type(attr) == IETF_ATTR_PRODUCT_INFORMATION)
                        {