Completed implementation of PWG HCD attributes
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 18 May 2015 14:40:27 +0000 (16:40 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 18 Aug 2015 19:25:38 +0000 (21:25 +0200)
src/libimcv/Makefile.am
src/libimcv/generic/generic_attr_bool.c
src/libimcv/generic/generic_attr_chunk.c [new file with mode: 0644]
src/libimcv/generic/generic_attr_chunk.h [new file with mode: 0644]
src/libimcv/generic/generic_attr_string.c
src/libimcv/generic/generic_attr_string.h
src/libimcv/pwg/pwg_attr.c
src/libimcv/pwg/pwg_attr_vendor_smi_code.c [new file with mode: 0644]
src/libimcv/pwg/pwg_attr_vendor_smi_code.h [new file with mode: 0644]

index af2770c..593611d 100644 (file)
@@ -37,6 +37,7 @@ libimcv_la_SOURCES = \
        imv/imv_session_manager.h imv/imv_session_manager.c \
        imv/imv_workitem.h imv/imv_workitem.c \
        generic/generic_attr_bool.h generic/generic_attr_bool.c \
+       generic/generic_attr_chunk.h generic/generic_attr_chunk.c \
        generic/generic_attr_string.h generic/generic_attr_string.c \
        ietf/ietf_attr.h ietf/ietf_attr.c \
        ietf/ietf_attr_assess_result.h ietf/ietf_attr_assess_result.c \
@@ -84,6 +85,7 @@ libimcv_la_SOURCES = \
        pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
        pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
        pwg/pwg_attr.h pwg/pwg_attr.c \
+       pwg/pwg_attr_vendor_smi_code.h pwg/pwg_attr_vendor_smi_code.c \
        seg/seg_contract.h seg/seg_contract.c \
        seg/seg_contract_manager.h seg/seg_contract_manager.c \
        seg/seg_env.h seg/seg_env.c \
index eca077a..3f570d9 100644 (file)
@@ -130,7 +130,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        {
                return NEED_MORE;
        }
-    pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+       pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
                                                                                                          this->type.vendor_id);
 
        if (this->value.len != ATTR_BOOL_SIZE)
diff --git a/src/libimcv/generic/generic_attr_chunk.c b/src/libimcv/generic/generic_attr_chunk.c
new file mode 100644 (file)
index 0000000..98a5399
--- /dev/null
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "generic_attr_chunk.h"
+
+#include <imcv.h>
+#include <pen/pen.h>
+#include <utils/debug.h>
+
+typedef struct private_generic_attr_chunk_t private_generic_attr_chunk_t;
+
+/**
+ * Private data of an generic_attr_chunk_t object.
+ */
+struct private_generic_attr_chunk_t {
+
+       /**
+        * Public members of generic_attr_chunk_t
+        */
+       generic_attr_chunk_t public;
+
+       /**
+        * Vendor-specific attribute type
+        */
+       pen_type_t type;
+
+       /**
+        * Length of attribute value
+        */
+       size_t length;
+
+       /**
+        * Fixed size of attribute value, set to 0 if dynamic
+        */
+       size_t size;
+
+       /**
+        * Attribute value or segment
+        */
+       chunk_t value;
+
+       /**
+        * Noskip flag
+        */
+       bool noskip_flag;
+
+       /**
+        * Reference count
+        */
+       refcount_t ref;
+};
+
+METHOD(pa_tnc_attr_t, get_type, pen_type_t,
+       private_generic_attr_chunk_t *this)
+{
+       return this->type;
+}
+
+METHOD(pa_tnc_attr_t, get_value, chunk_t,
+       private_generic_attr_chunk_t *this)
+{
+       return this->value;
+}
+
+METHOD(pa_tnc_attr_t, get_noskip_flag, bool,
+       private_generic_attr_chunk_t *this)
+{
+       return this->noskip_flag;
+}
+
+METHOD(pa_tnc_attr_t, set_noskip_flag,void,
+       private_generic_attr_chunk_t *this, bool noskip)
+{
+       this->noskip_flag = noskip;
+}
+
+METHOD(pa_tnc_attr_t, build, void,
+       private_generic_attr_chunk_t *this)
+{
+       return;
+}
+
+METHOD(pa_tnc_attr_t, process, status_t,
+       private_generic_attr_chunk_t *this, u_int32_t *offset)
+{
+       enum_name_t *pa_attr_names;
+       *offset = 0;
+
+       if (this->value.len < this->length)
+       {
+               return NEED_MORE;
+       }
+       pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+                                                                                                         this->type.vendor_id);
+
+       if ((this->size == 0 && this->value.len > this->length) ||
+               (this->size != 0 && this->value.len != this->size))
+       {
+               DBG1(DBG_TNC, "inconsistent length of %N/%N string attribute",
+                        pen_names, this->type.vendor_id, pa_attr_names, this->type.type);
+               return FAILED;
+       }
+
+       return SUCCESS;
+}
+
+METHOD(pa_tnc_attr_t, add_segment, void,
+       private_generic_attr_chunk_t *this, chunk_t segment)
+{
+       this->value = chunk_cat("mc", this->value, segment);
+}
+
+METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
+       private_generic_attr_chunk_t *this)
+{
+       ref_get(&this->ref);
+       return &this->public.pa_tnc_attribute;
+}
+
+METHOD(pa_tnc_attr_t, destroy, void,
+       private_generic_attr_chunk_t *this)
+{
+       if (ref_put(&this->ref))
+       {
+               free(this->value.ptr);
+               free(this);
+       }
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *generic_attr_chunk_create_from_data(size_t length, chunk_t value,
+                                                                                                  size_t size, pen_type_t type)
+{
+       private_generic_attr_chunk_t *this;
+
+       INIT(this,
+               .public = {
+                       .pa_tnc_attribute = {
+                               .get_type = _get_type,
+                               .get_value = _get_value,
+                               .get_noskip_flag = _get_noskip_flag,
+                               .set_noskip_flag = _set_noskip_flag,
+                               .build = _build,
+                               .process = _process,
+                               .add_segment = _add_segment,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
+               },
+               .type = type,
+               .length = length,
+               .size = size,
+               .value = chunk_clone(value),
+               .ref = 1,
+       );
+
+       return &this->public.pa_tnc_attribute;
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *generic_attr_chunk_create(chunk_t value, pen_type_t type)
+{
+       return generic_attr_chunk_create_from_data(value.len, value,
+                                                                                          value.len, type);
+}
+
diff --git a/src/libimcv/generic/generic_attr_chunk.h b/src/libimcv/generic/generic_attr_chunk.h
new file mode 100644 (file)
index 0000000..a9b3a62
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup generic_attr_chunk generic_attr_chunk
+ * @{ @ingroup generic_attr
+ */
+
+#ifndef GENERIC_ATTR_CHUNK_H_
+#define GENERIC_ATTR_CHUNK_H_
+
+typedef struct generic_attr_chunk_t generic_attr_chunk_t;
+
+#include <pen/pen.h>
+#include "pa_tnc/pa_tnc_attr.h"
+
+/**
+ * Class implementing a generic PA-TNC attribute containing a possibly
+ * binary string with either a fixed or variable size
+ */
+struct generic_attr_chunk_t {
+
+       /**
+        * Public PA-TNC attribute interface
+        */
+       pa_tnc_attr_t pa_tnc_attribute;
+};
+
+/**
+ * Creates a generic_attr_chunk_t object
+ *
+ * @param string                       Non-nul terminated string
+ * @param type                         Vendor ID / Attribute Type
+ */
+pa_tnc_attr_t* generic_attr_chunk_create(chunk_t string, pen_type_t type);
+
+/**
+ * Creates an generic_attr_chunk_t object from received data
+ *
+ * @param length                       Total length of attribute value
+ * @param value                                Unparsed attribute value (might be a segment)
+ * @param size                         size in bytes if fixed array or 0 if dynamic size
+ * @param type                         Vendor ID / Attribute Type
+ */
+pa_tnc_attr_t* generic_attr_chunk_create_from_data(size_t length, chunk_t value,
+                                                                                                  size_t size, pen_type_t type);
+
+#endif /** GENERIC_ATTR_CHUNK_H_ @}*/
index e14e8d2..e63c012 100644 (file)
@@ -98,8 +98,14 @@ METHOD(pa_tnc_attr_t, process, status_t,
        {
                return NEED_MORE;
        }
-    pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+       pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
                                                                                                          this->type.vendor_id);
+       if (this->value.len > this->length)
+       {
+               DBG1(DBG_TNC, "inconsistent length of %N/%N string attribute",
+                        pen_names, this->type.vendor_id, pa_attr_names, this->type.type);
+               return FAILED;
+       }
 
        pos = memchr(this->value.ptr, '\0', this->value.len);
        if (pos)
index c721029..d830ab4 100644 (file)
@@ -28,7 +28,7 @@ typedef struct generic_attr_string_t generic_attr_string_t;
 
 /**
  * Class implementing a generic PA-TNC attribute containing a non-nul
- * terminated string 
+ * terminated printable string
  */
 struct generic_attr_string_t {
 
index 0301cc7..f40eb76 100644 (file)
 #include "pwg_attr.h"
 
 #include "generic/generic_attr_bool.h"
+#include "generic/generic_attr_chunk.h"
+#include "generic/generic_attr_string.h"
 #include "ietf/ietf_attr_port_filter.h"
-
+#include "pwg/pwg_attr_vendor_smi_code.h"
 
 ENUM_BEGIN(pwg_attr_names,     PWG_HCD_ATTRS_NATURAL_LANG,
                                                        PWG_HCD_VENDOR_SMI_CODE,
@@ -96,17 +98,22 @@ pa_tnc_attr_t* pwg_attr_create_from_data(u_int32_t type, size_t length, chunk_t
                case PWG_HCD_RESIDENT_APP_NAME:
                case PWG_HCD_RESIDENT_APP_PATCHES:
                case PWG_HCD_RESIDENT_APP_STRING_VERSION:
+                       return generic_attr_string_create_from_data(length, value,
+                                                                       pen_type_create(PEN_PWG, type));
+               case PWG_HCD_FIRMWARE_VERSION:
+               case PWG_HCD_RESIDENT_APP_VERSION:
+               case PWG_HCD_USER_APP_VERSION:
+                       return generic_attr_chunk_create_from_data(length, value, 16,
+                                                                       pen_type_create(PEN_PWG, type));
                case PWG_HCD_CERTIFICATION_STATE:
                case PWG_HCD_CONFIGURATION_STATE:
-                       return generic_attr_string_create_from_data(length, value,
+                       return generic_attr_chunk_create_from_data(length, value, 0,
                                                                        pen_type_create(PEN_PWG, type));
+               case PWG_HCD_VENDOR_SMI_CODE:
+                       return pwg_attr_vendor_smi_code_create_from_data(length, value);
                case PWG_HCD_FIREWALL_SETTING:
                        return ietf_attr_port_filter_create_from_data(length, value,
                                                                        pen_type_create(PEN_PWG, type));
-               case PWG_HCD_VENDOR_SMI_CODE:
-               case PWG_HCD_FIRMWARE_VERSION:
-               case PWG_HCD_RESIDENT_APP_VERSION:
-               case PWG_HCD_USER_APP_VERSION:
                default:
                        return NULL;
        }
diff --git a/src/libimcv/pwg/pwg_attr_vendor_smi_code.c b/src/libimcv/pwg/pwg_attr_vendor_smi_code.c
new file mode 100644 (file)
index 0000000..7931259
--- /dev/null
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "pwg_attr_vendor_smi_code.h"
+
+#include <pa_tnc/pa_tnc_msg.h>
+#include <bio/bio_writer.h>
+#include <bio/bio_reader.h>
+#include <utils/debug.h>
+
+typedef struct private_pwg_attr_vendor_smi_code_t private_pwg_attr_vendor_smi_code_t;
+
+/**
+ * PWG HCD PA-TNC Vendor SMI Code
+ *
+ *                       1                   2                   3
+ *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |    Reserved   |                 Vendor SMI Code               |
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+#define VENDOR_SMI_CODE_SIZE   4
+
+/**
+ * Private data of an pwg_attr_vendor_smi_code_t object.
+ */
+struct private_pwg_attr_vendor_smi_code_t {
+
+       /**
+        * Public members of pwg_attr_vendor_smi_code_t
+        */
+       pwg_attr_vendor_smi_code_t public;
+
+       /**
+        * Vendor-specific attribute type
+        */
+       pen_type_t type;
+
+       /**
+        * Length of attribute value
+        */
+       size_t length;
+
+       /**
+        * Attribute value or segment
+        */
+       chunk_t value;
+
+       /**
+        * Noskip flag
+        */
+       bool noskip_flag;
+
+       /**
+        * Vendor SMI code
+        */
+       pen_t vendor_smi_code;
+
+       /**
+        * Reference count
+        */
+       refcount_t ref;
+};
+
+METHOD(pa_tnc_attr_t, get_type, pen_type_t,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       return this->type;
+}
+
+METHOD(pa_tnc_attr_t, get_value, chunk_t,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       return this->value;
+}
+
+METHOD(pa_tnc_attr_t, get_noskip_flag, bool,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       return this->noskip_flag;
+}
+
+METHOD(pa_tnc_attr_t, set_noskip_flag,void,
+       private_pwg_attr_vendor_smi_code_t *this, bool noskip)
+{
+       this->noskip_flag = noskip;
+}
+
+METHOD(pa_tnc_attr_t, build, void,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       bio_writer_t *writer;
+
+       if (this->value.ptr)
+       {
+               return;
+       }
+       writer = bio_writer_create(VENDOR_SMI_CODE_SIZE);
+       writer->write_uint32(writer, this->vendor_smi_code);
+
+       this->value = writer->extract_buf(writer);
+       this->length = this->value.len;
+       writer->destroy(writer);
+}
+
+METHOD(pa_tnc_attr_t, process, status_t,
+       private_pwg_attr_vendor_smi_code_t *this, u_int32_t *offset)
+{
+       bio_reader_t *reader;
+       uint32_t vendor_smi_code;
+       uint8_t reserved;
+
+       *offset = 0;
+
+       if (this->value.len < this->length)
+       {
+               return NEED_MORE;
+       }
+       if (this->value.len != VENDOR_SMI_CODE_SIZE)
+       {
+               DBG1(DBG_TNC, "incorrect attribute length for PWG HCD Vendor SMI Code");
+               return FAILED;
+       }
+       reader = bio_reader_create(this->value);
+       reader->read_uint8 (reader, &reserved);
+       reader->read_uint24(reader, &vendor_smi_code);
+       reader->destroy(reader);
+       this->vendor_smi_code = vendor_smi_code;
+
+       return SUCCESS;
+}
+
+METHOD(pa_tnc_attr_t, add_segment, void,
+       private_pwg_attr_vendor_smi_code_t *this, chunk_t segment)
+{
+       this->value = chunk_cat("mc", this->value, segment);
+}
+
+METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       ref_get(&this->ref);
+       return &this->public.pa_tnc_attribute;
+}
+
+METHOD(pa_tnc_attr_t, destroy, void,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       if (ref_put(&this->ref))
+       {
+               free(this->value.ptr);
+               free(this);
+       }
+}
+
+METHOD(pwg_attr_vendor_smi_code_t, get_vendor_smi_code, pen_t,
+       private_pwg_attr_vendor_smi_code_t *this)
+{
+       return this->vendor_smi_code;
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *pwg_attr_vendor_smi_code_create(pen_t vendor_smi_code)
+{
+       private_pwg_attr_vendor_smi_code_t *this;
+
+       INIT(this,
+               .public = {
+                       .pa_tnc_attribute = {
+                               .get_type = _get_type,
+                               .get_value = _get_value,
+                               .get_noskip_flag = _get_noskip_flag,
+                               .set_noskip_flag = _set_noskip_flag,
+                               .build = _build,
+                               .process = _process,
+                               .add_segment = _add_segment,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
+                       .get_vendor_smi_code = _get_vendor_smi_code,
+               },
+               .type = { PEN_PWG, PWG_HCD_VENDOR_SMI_CODE },
+               .vendor_smi_code = vendor_smi_code,
+               .ref = 1,
+       );
+
+       return &this->public.pa_tnc_attribute;
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *pwg_attr_vendor_smi_code_create_from_data(size_t length,
+                                                                                                                chunk_t data)
+{
+       private_pwg_attr_vendor_smi_code_t *this;
+
+       INIT(this,
+               .public = {
+                       .pa_tnc_attribute = {
+                               .get_type = _get_type,
+                               .get_value = _get_value,
+                               .get_noskip_flag = _get_noskip_flag,
+                               .set_noskip_flag = _set_noskip_flag,
+                               .build = _build,
+                               .process = _process,
+                               .add_segment = _add_segment,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
+                       .get_vendor_smi_code = _get_vendor_smi_code,
+               },
+               .type = { PEN_PWG, PWG_HCD_VENDOR_SMI_CODE },
+               .length = length,
+               .value = chunk_clone(data),
+               .ref = 1,
+       );
+
+       return &this->public.pa_tnc_attribute;
+}
+
diff --git a/src/libimcv/pwg/pwg_attr_vendor_smi_code.h b/src/libimcv/pwg/pwg_attr_vendor_smi_code.h
new file mode 100644 (file)
index 0000000..31255b4
--- /dev/null
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup pwg_attr_vendor_smi_codet pwg_attr_vendor_smi_code
+ * @{ @ingroup ietf_attr
+ */
+
+#ifndef PWG_ATTR_VENDOR_SMI_CODE_H_
+#define PWG_ATTR_VENDOR_SMI_CODE_H_
+
+typedef struct pwg_attr_vendor_smi_code_t pwg_attr_vendor_smi_code_t;
+
+#include "pwg_attr.h"
+#include "pa_tnc/pa_tnc_attr.h"
+
+
+/**
+ * Class implementing the PWG HCD PA-TNC Vendor SMI Code attribute.
+ *
+ */
+struct pwg_attr_vendor_smi_code_t {
+
+       /**
+        * Public PA-TNC attribute interface
+        */
+       pa_tnc_attr_t pa_tnc_attribute;
+
+       /**
+        * Gets the Vendor SMI Code
+        *
+        * @return                              Vendor SMI Code
+        */
+       pen_t (*get_vendor_smi_code)(pwg_attr_vendor_smi_code_t *this);
+
+};
+
+/**
+ * Creates an pwg_attr_vendor_smi_code_t object
+ *
+ */
+pa_tnc_attr_t* pwg_attr_vendor_smi_code_create(pen_t vendor_smi_code);
+
+/**
+ * Creates an pwg_attr_vendor_smi_code_t object from received data
+ *
+ * @param length                       Total length of attribute value
+ * @param value                                Unparsed attribute value (might be a segment)
+ */
+pa_tnc_attr_t* pwg_attr_vendor_smi_code_create_from_data(size_t length,
+                                                                                                                chunk_t value);
+
+#endif /** PWG_ATTR_VENDOR_SMI_CODE_H_ @}*/