Add PropertyPolicy to QoS API for Security settings (#278)
* Add PropertyPolicy to QoS API for Security settings This commit adds the public API for PropertyQosPolicy including tests. This policy can be used to set the parameters for the DDS security implementation, as an alternative for using the xml configuration. Tests are also inlcuded for setting security properties and conflict resolving when both security configuration and qos properties are present. Finally, the pubsub tool is updated so that is handles this qos correctly. Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Init binary_value.props to fix failing qos merge and moved init code in qset_prop functions Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Add additional test and some validation improvements based on review comments Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Refactoring of qos property Refactored the qos property handling based on review comments. Setting and unsettings functions are simplified and now use helper functions for lookup, property initialisation is simplified. Added an additional check for required security properties when creating participant using security settings from qos, and added a test-case for this code. Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Check for qos flag before getting property index from qos Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Participant creation should fail on inconsistent security qos properties, and some minor code improvements in property qos api functions Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Update log message in test security_config_qos Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Fixed unused label compiler error in q_entity.c when security is disabled Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com> * Refactored qprop functions with macros to avoid code duplicate code Signed-off-by: Dennis Potman <dennis.potman@adlinktech.com>
This commit is contained in:
dennis-adlink
eboasson
parent
5399e5103c
commit
7f59a46ff8
11 changed files with 927 additions and 47 deletions
|
|
@ -379,6 +379,72 @@ dds_qset_ignorelocal (
|
|||
dds_qos_t * __restrict qos,
|
||||
dds_ignorelocal_kind_t ignore);
|
||||
|
||||
/**
|
||||
* @brief Stores a property with the provided name and string value in a qos structure.
|
||||
*
|
||||
* In the case a property with the provided name already exists in the qos structure,
|
||||
* the value for this entry is overwritten with the provided string value. If more than
|
||||
* one property with the provided name exists, only the value of the first of these
|
||||
* properties is updated.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that will store the property
|
||||
* @param[in] name - Pointer to name of the property
|
||||
* @param[in] value - Pointer to a (null-terminated) string that will be stored
|
||||
*/
|
||||
DDS_EXPORT void
|
||||
dds_qset_prop (
|
||||
dds_qos_t * __restrict qos,
|
||||
const char * name,
|
||||
const char * value);
|
||||
|
||||
/**
|
||||
* @brief Removes the property with the provided name from a qos structure.
|
||||
*
|
||||
* In case more than one property exists with this name, only the first property
|
||||
* is removed.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains the property
|
||||
* @param[in] name - Pointer to name of the property
|
||||
*/
|
||||
DDS_EXPORT void
|
||||
dds_qunset_prop (
|
||||
dds_qos_t * __restrict qos,
|
||||
const char * name);
|
||||
|
||||
/**
|
||||
* @brief Stores the provided binary data as a property in a qos structure
|
||||
*
|
||||
* In the case a property with the provided name already exists in the qos structure,
|
||||
* the value for this entry is overwritten with the provided data. If more than one
|
||||
* property with the provided name exists, only the value of the first of these
|
||||
* properties is updated.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that will store the property
|
||||
* @param[in] name - Pointer to name of the property
|
||||
* @param[in] value - Pointer to data to be stored in the property
|
||||
* @param[in] sz - Size of the data
|
||||
*/
|
||||
DDS_EXPORT void
|
||||
dds_qset_bprop (
|
||||
dds_qos_t * __restrict qos,
|
||||
const char * name,
|
||||
const void * value,
|
||||
const size_t sz);
|
||||
|
||||
/**
|
||||
* @brief Removes the binary property with the provided name from a qos structure.
|
||||
*
|
||||
* In case more than one binary property exists with this name, only the first binary
|
||||
* property is removed.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains the binary property
|
||||
* @param[in] name - Pointer to name of the property
|
||||
*/
|
||||
DDS_EXPORT void
|
||||
dds_qunset_bprop (
|
||||
dds_qos_t * __restrict qos,
|
||||
const char * name);
|
||||
|
||||
/**
|
||||
* @brief Get the userdata from a qos structure
|
||||
*
|
||||
|
|
@ -680,6 +746,74 @@ dds_qget_ignorelocal (
|
|||
const dds_qos_t * __restrict qos,
|
||||
dds_ignorelocal_kind_t *ignore);
|
||||
|
||||
/**
|
||||
* @brief Gets the names of the properties from a qos structure.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains properties
|
||||
* @param[in,out] n - Pointer to number of property names that are returned (optional)
|
||||
* @param[in,out] names - Pointer that will store the string(s) containing property name(s) (optional). This function will allocate the memory for the list of names and for the strings containing the names; the caller gets ownership of the allocated memory
|
||||
*
|
||||
* @returns - false iff any of the arguments is invalid or the qos is not present in the qos object
|
||||
*/
|
||||
DDS_EXPORT bool
|
||||
dds_qget_propnames (
|
||||
const dds_qos_t * __restrict qos,
|
||||
uint32_t * n,
|
||||
char *** names);
|
||||
|
||||
/**
|
||||
* @brief Get the value of the property with the provided name from a qos structure.
|
||||
*
|
||||
* In case more than one property exists with this name, the value for the first
|
||||
* property with this name will be returned.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains the property
|
||||
* @param[in] name - Pointer to name of the property
|
||||
* @param[in,out] value - Pointer to a string that will store the value of the property. The memory for storing the string value will be allocated by this function and the caller gets ownership of the allocated memory
|
||||
*
|
||||
* @returns - false iff any of the arguments is invalid, the qos is not present in the qos object or there was no property found with the provided name
|
||||
*/
|
||||
DDS_EXPORT bool
|
||||
dds_qget_prop (
|
||||
const dds_qos_t * __restrict qos,
|
||||
const char * name,
|
||||
char ** value);
|
||||
|
||||
/**
|
||||
* @brief Gets the names of the binary properties from a qos structure.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains binary properties
|
||||
* @param[in,out] n - Pointer to number of binary property names that are returned (optional)
|
||||
* @param[in,out] names - Pointer that will store the string(s) containing binary property name(s) (optional). This function will allocate the memory for the list of names and for the strings containing the names; the caller gets ownership of the allocated memory
|
||||
*
|
||||
* @returns - false iff any of the arguments is invalid or the qos is not present in the qos object
|
||||
*/
|
||||
DDS_EXPORT bool
|
||||
dds_qget_bpropnames (
|
||||
const dds_qos_t * __restrict qos,
|
||||
uint32_t * n,
|
||||
char *** names);
|
||||
|
||||
/**
|
||||
* @brief Get the value of the binary property with the provided name from a qos structure.
|
||||
*
|
||||
* In case more than one binary property exists with this name, the value for the first
|
||||
* binary property with this name will be returned.
|
||||
*
|
||||
* @param[in,out] qos - Pointer to a dds_qos_t structure that contains the property
|
||||
* @param[in] name - Pointer to name of the binary property
|
||||
* @param[in,out] value - Pointer to a buffer that will store the value of the property. If sz = 0 then a NULL pointer. The memory for storing the value will be allocated by this function and the caller gets ownership of the allocated memory
|
||||
* @param[in,out] sz - Pointer that will store the size of the returned buffer.
|
||||
*
|
||||
* @returns - false iff any of the arguments is invalid, the qos is not present in the qos object or there was no binary property found with the provided name
|
||||
*/
|
||||
DDS_EXPORT bool
|
||||
dds_qget_bprop (
|
||||
const dds_qos_t * __restrict qos,
|
||||
const char * name,
|
||||
void ** value,
|
||||
size_t * sz);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ typedef enum dds_qos_policy_id {
|
|||
DDS_GROUPDATA_QOS_POLICY_ID,
|
||||
DDS_TRANSPORTPRIORITY_QOS_POLICY_ID,
|
||||
DDS_LIFESPAN_QOS_POLICY_ID,
|
||||
DDS_DURABILITYSERVICE_QOS_POLICY_ID
|
||||
DDS_DURABILITYSERVICE_QOS_POLICY_ID,
|
||||
DDS_PROPERTY_QOS_POLICY_ID,
|
||||
} dds_qos_policy_id_t;
|
||||
|
||||
/* QoS structure is opaque */
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ extern "C" {
|
|||
QP_DESTINATION_ORDER | QP_HISTORY | QP_RESOURCE_LIMITS)
|
||||
|
||||
#define DDS_PARTICIPANT_QOS_MASK \
|
||||
(QP_USER_DATA | QP_PRISMTECH_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL)
|
||||
(QP_USER_DATA | QP_PRISMTECH_ENTITY_FACTORY | \
|
||||
QP_CYCLONE_IGNORELOCAL | QP_PROPERTY_LIST)
|
||||
|
||||
#define DDS_PUBLISHER_QOS_MASK \
|
||||
(QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \
|
||||
|
|
@ -36,7 +37,7 @@ extern "C" {
|
|||
QP_OWNERSHIP | QP_LIVELINESS | QP_TIME_BASED_FILTER | \
|
||||
QP_RELIABILITY | QP_DESTINATION_ORDER | QP_HISTORY | \
|
||||
QP_RESOURCE_LIMITS | QP_PRISMTECH_READER_DATA_LIFECYCLE | \
|
||||
QP_CYCLONE_IGNORELOCAL)
|
||||
QP_CYCLONE_IGNORELOCAL | QP_PROPERTY_LIST)
|
||||
|
||||
#define DDS_SUBSCRIBER_QOS_MASK \
|
||||
(QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \
|
||||
|
|
@ -48,7 +49,7 @@ extern "C" {
|
|||
QP_LIVELINESS | QP_RELIABILITY | QP_TRANSPORT_PRIORITY | \
|
||||
QP_LIFESPAN | QP_DESTINATION_ORDER | QP_HISTORY | \
|
||||
QP_RESOURCE_LIMITS | QP_PRISMTECH_WRITER_DATA_LIFECYCLE | \
|
||||
QP_CYCLONE_IGNORELOCAL)
|
||||
QP_CYCLONE_IGNORELOCAL | QP_PROPERTY_LIST)
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -335,6 +335,110 @@ void dds_qset_ignorelocal (dds_qos_t * __restrict qos, dds_ignorelocal_kind_t ig
|
|||
qos->present |= QP_CYCLONE_IGNORELOCAL;
|
||||
}
|
||||
|
||||
static void dds_qprop_init (dds_qos_t * qos)
|
||||
{
|
||||
if (!(qos->present & QP_PROPERTY_LIST))
|
||||
{
|
||||
qos->property.value.n = 0;
|
||||
qos->property.value.props = NULL;
|
||||
qos->property.binary_value.n = 0;
|
||||
qos->property.binary_value.props = NULL;
|
||||
qos->present |= QP_PROPERTY_LIST;
|
||||
}
|
||||
}
|
||||
|
||||
#define DDS_QPROP_GET_INDEX(prop_type_, prop_field_) \
|
||||
static bool dds_q##prop_type_##_get_index (const dds_qos_t * qos, const char * name, uint32_t * index) \
|
||||
{ \
|
||||
if (qos == NULL || name == NULL || index == NULL || !(qos->present & QP_PROPERTY_LIST)) \
|
||||
return false; \
|
||||
for (uint32_t i = 0; i < qos->property.prop_field_.n; i++) \
|
||||
{ \
|
||||
if (strcmp (qos->property.prop_field_.props[i].name, name) == 0) \
|
||||
{ \
|
||||
*index = i; \
|
||||
return true; \
|
||||
} \
|
||||
} \
|
||||
return false; \
|
||||
}
|
||||
DDS_QPROP_GET_INDEX (prop, value)
|
||||
DDS_QPROP_GET_INDEX (bprop, binary_value)
|
||||
|
||||
#define DDS_QUNSET_PROP(prop_type_, prop_field_, value_field_) \
|
||||
void dds_qunset_##prop_type_ (dds_qos_t * __restrict qos, const char * name) \
|
||||
{ \
|
||||
uint32_t i; \
|
||||
if (qos == NULL || !(qos->present & QP_PROPERTY_LIST) || qos->property.prop_field_.n == 0 || name == NULL) \
|
||||
return; \
|
||||
if (dds_q##prop_type_##_get_index (qos, name, &i)) \
|
||||
{ \
|
||||
dds_free (qos->property.prop_field_.props[i].name); \
|
||||
dds_free (qos->property.prop_field_.props[i].value_field_); \
|
||||
if (qos->property.prop_field_.n > 1) \
|
||||
{ \
|
||||
if (i < (qos->property.prop_field_.n - 1)) \
|
||||
memmove (qos->property.prop_field_.props + i, qos->property.prop_field_.props + i + 1, \
|
||||
(qos->property.prop_field_.n - i - 1) * sizeof (*qos->property.prop_field_.props)); \
|
||||
qos->property.prop_field_.props = dds_realloc (qos->property.prop_field_.props, \
|
||||
(qos->property.prop_field_.n - 1) * sizeof (*qos->property.prop_field_.props)); \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
dds_free (qos->property.prop_field_.props); \
|
||||
qos->property.prop_field_.props = NULL; \
|
||||
} \
|
||||
qos->property.prop_field_.n--; \
|
||||
} \
|
||||
}
|
||||
DDS_QUNSET_PROP (prop, value, value)
|
||||
DDS_QUNSET_PROP (bprop, binary_value, value.value)
|
||||
|
||||
void dds_qset_prop (dds_qos_t * __restrict qos, const char * name, const char * value)
|
||||
{
|
||||
uint32_t i;
|
||||
if (qos == NULL || name == NULL || value == NULL)
|
||||
return;
|
||||
|
||||
dds_qprop_init (qos);
|
||||
if (dds_qprop_get_index (qos, name, &i))
|
||||
{
|
||||
dds_free (qos->property.value.props[i].value);
|
||||
qos->property.value.props[i].value = dds_string_dup (value);
|
||||
}
|
||||
else
|
||||
{
|
||||
qos->property.value.props = dds_realloc (qos->property.value.props,
|
||||
(qos->property.value.n + 1) * sizeof (*qos->property.value.props));
|
||||
qos->property.value.props[qos->property.value.n].propagate = 0;
|
||||
qos->property.value.props[qos->property.value.n].name = dds_string_dup (name);
|
||||
qos->property.value.props[qos->property.value.n].value = dds_string_dup (value);
|
||||
qos->property.value.n++;
|
||||
}
|
||||
}
|
||||
|
||||
void dds_qset_bprop (dds_qos_t * __restrict qos, const char * name, const void * value, const size_t sz)
|
||||
{
|
||||
uint32_t i;
|
||||
if (qos == NULL || name == NULL || (value == NULL && sz > 0))
|
||||
return;
|
||||
|
||||
dds_qprop_init (qos);
|
||||
if (dds_qbprop_get_index (qos, name, &i))
|
||||
{
|
||||
dds_qos_data_copy_in (&qos->property.binary_value.props[i].value, value, sz, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
qos->property.binary_value.props = dds_realloc (qos->property.binary_value.props,
|
||||
(qos->property.binary_value.n + 1) * sizeof (*qos->property.binary_value.props));
|
||||
qos->property.binary_value.props[qos->property.binary_value.n].propagate = 0;
|
||||
qos->property.binary_value.props[qos->property.binary_value.n].name = dds_string_dup (name);
|
||||
dds_qos_data_copy_in (&qos->property.binary_value.props[qos->property.binary_value.n].value, value, sz, false);
|
||||
qos->property.binary_value.n++;
|
||||
}
|
||||
}
|
||||
|
||||
bool dds_qget_userdata (const dds_qos_t * __restrict qos, void **value, size_t *sz)
|
||||
{
|
||||
if (qos == NULL || !(qos->present & QP_USER_DATA))
|
||||
|
|
@ -565,3 +669,66 @@ bool dds_qget_ignorelocal (const dds_qos_t * __restrict qos, dds_ignorelocal_kin
|
|||
*ignore = qos->ignorelocal.value;
|
||||
return true;
|
||||
}
|
||||
|
||||
#define DDS_QGET_PROPNAMES(prop_type_, prop_field_) \
|
||||
bool dds_qget_##prop_type_##names (const dds_qos_t * __restrict qos, uint32_t * n, char *** names) \
|
||||
{ \
|
||||
bool props; \
|
||||
if (qos == NULL || (n == NULL && names == NULL)) \
|
||||
return false; \
|
||||
props = (qos->present & QP_PROPERTY_LIST) && qos->property.prop_field_.n > 0; \
|
||||
if (n != NULL) \
|
||||
*n = props ? qos->property.prop_field_.n : 0; \
|
||||
if (names != NULL) \
|
||||
{ \
|
||||
if (!props) \
|
||||
*names = NULL; \
|
||||
else \
|
||||
{ \
|
||||
*names = dds_alloc (sizeof (char *) * qos->property.prop_field_.n); \
|
||||
for (uint32_t i = 0; i < qos->property.prop_field_.n; i++) \
|
||||
(*names)[i] = dds_string_dup (qos->property.prop_field_.props[i].name); \
|
||||
} \
|
||||
} \
|
||||
return props; \
|
||||
}
|
||||
DDS_QGET_PROPNAMES (prop, value)
|
||||
DDS_QGET_PROPNAMES (bprop, binary_value)
|
||||
|
||||
bool dds_qget_prop (const dds_qos_t * __restrict qos, const char * name, char ** value)
|
||||
{
|
||||
uint32_t i;
|
||||
bool found;
|
||||
|
||||
if (qos == NULL || name == NULL)
|
||||
return false;
|
||||
|
||||
found = dds_qprop_get_index (qos, name, &i);
|
||||
if (value != NULL)
|
||||
*value = found ? dds_string_dup (qos->property.value.props[i].value) : NULL;
|
||||
return found;
|
||||
}
|
||||
|
||||
bool dds_qget_bprop (const dds_qos_t * __restrict qos, const char * name, void ** value, size_t * sz)
|
||||
{
|
||||
uint32_t i;
|
||||
bool found;
|
||||
|
||||
if (qos == NULL || name == NULL || (sz == NULL && value != NULL))
|
||||
return false;
|
||||
|
||||
found = dds_qbprop_get_index (qos, name, &i);
|
||||
if (found)
|
||||
{
|
||||
if (value != NULL || sz != NULL)
|
||||
dds_qos_data_copy_out (&qos->property.binary_value.props[i].value, value, sz);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (value != NULL)
|
||||
*value = NULL;
|
||||
if (sz != NULL)
|
||||
*sz = 0;
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "dds/ddsrt/environ.h"
|
||||
#include "dds/ddsrt/heap.h"
|
||||
#include "dds/ddsi/q_misc.h"
|
||||
#include "dds/ddsi/q_xqos.h"
|
||||
|
||||
#define FORCE_ENV
|
||||
|
||||
|
|
@ -500,3 +501,326 @@ CU_Test(ddsc_config, security_deprecated, .init = ddsrt_init, .fini = ddsrt_fini
|
|||
CU_ASSERT_FATAL(found == 0x1fffff);
|
||||
#endif
|
||||
}
|
||||
|
||||
CU_Test(ddsc_config, security_qos, .init = ddsrt_init, .fini = ddsrt_fini)
|
||||
{
|
||||
/* Expected traces when creating participant with the security elements. */
|
||||
const char *log_expected[] = {
|
||||
#ifdef DDSI_INCLUDE_SECURITY
|
||||
/* The config should have been parsed into the participant QoS. */
|
||||
"PARTICIPANT * QOS={*property_list={value={"
|
||||
"{dds.sec.auth.identity_ca,testtext_IdentityCA_testtext,0},"
|
||||
"{dds.sec.auth.private_key,testtext_PrivateKey_testtext,0},"
|
||||
"{dds.sec.auth.identity_certificate,testtext_IdentityCertificate_testtext,0},"
|
||||
"{dds.sec.access.permissions_ca,file:Permissions_CA.pem,0},"
|
||||
"{dds.sec.access.governance,file:Governance.p7s,0},"
|
||||
"{dds.sec.access.permissions,file:Permissions.p7s,0},"
|
||||
"{dds.sec.auth.password,testtext_Password_testtext,0},"
|
||||
"{dds.sec.auth.trusted_ca_dir,file:/test/dir,0}"
|
||||
"}binary_value={}}*}*",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
dds_entity_t participant;
|
||||
dds_qos_t * qos;
|
||||
|
||||
/* Set up the trace sinks to detect the config parsing. */
|
||||
dds_set_log_mask(DDS_LC_FATAL|DDS_LC_ERROR|DDS_LC_WARNING|DDS_LC_CONFIG);
|
||||
dds_set_log_sink(&logger, (void*)log_expected);
|
||||
dds_set_trace_sink(&logger, (void*)log_expected);
|
||||
|
||||
/* Create the qos */
|
||||
CU_ASSERT_FATAL ((qos = dds_create_qos()) != NULL);
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_ca", "testtext_IdentityCA_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.private_key", "testtext_PrivateKey_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_certificate", "testtext_IdentityCertificate_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions_ca", "file:Permissions_CA.pem");
|
||||
dds_qset_prop (qos, "dds.sec.access.governance", "file:Governance.p7s");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions", "file:Permissions.p7s");
|
||||
dds_qset_prop (qos, "dds.sec.auth.password", "testtext_Password_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.trusted_ca_dir", "file:/test/dir");
|
||||
|
||||
/* Create participant with security config in qos. */
|
||||
found = 0;
|
||||
ddsrt_setenv(URI_VARIABLE, "<Tracing><Verbosity>finest</></>");
|
||||
CU_ASSERT_FATAL ((participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL)) > 0);
|
||||
ddsrt_setenv(URI_VARIABLE, "");
|
||||
dds_delete(participant);
|
||||
dds_delete_qos(qos);
|
||||
|
||||
/* All traces should have been provided. */
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_FATAL(found == 0);
|
||||
#else
|
||||
CU_ASSERT_FATAL(found == 0x1);
|
||||
#endif
|
||||
}
|
||||
|
||||
CU_Test(ddsc_config, security_qos_props, .init = ddsrt_init, .fini = ddsrt_fini)
|
||||
{
|
||||
/* Expected traces when creating participant with the security elements. */
|
||||
const char *log_expected[] = {
|
||||
#ifdef DDSI_INCLUDE_SECURITY
|
||||
/* The config should have been parsed into the participant QoS. */
|
||||
"PARTICIPANT * QOS={*property_list={value={"
|
||||
"{test.prop1,testtext_value1_testtext,0},"
|
||||
"{dds.sec.auth.identity_ca,testtext_IdentityCA_testtext,0},"
|
||||
"{dds.sec.auth.private_key,testtext_PrivateKey_testtext,0},"
|
||||
"{dds.sec.auth.identity_certificate,testtext_IdentityCertificate_testtext,0},"
|
||||
"{dds.sec.access.permissions_ca,file:Permissions_CA.pem,0},"
|
||||
"{dds.sec.access.governance,file:Governance.p7s,0},"
|
||||
"{dds.sec.access.permissions,file:Permissions.p7s,0},"
|
||||
"{dds.sec.auth.password,testtext_Password_testtext,0},"
|
||||
"{dds.sec.auth.trusted_ca_dir,file:/test/dir,0},"
|
||||
"{test.prop2,testtext_value2_testtext,0}}"
|
||||
"binary_value={{test.bprop1,(3,*),0}}}*}*",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
dds_entity_t participant;
|
||||
dds_qos_t * qos;
|
||||
|
||||
/* Set up the trace sinks to detect the config parsing. */
|
||||
dds_set_log_mask(DDS_LC_FATAL|DDS_LC_ERROR|DDS_LC_WARNING|DDS_LC_CONFIG);
|
||||
dds_set_log_sink(&logger, (void*)log_expected);
|
||||
dds_set_trace_sink(&logger, (void*)log_expected);
|
||||
|
||||
/* Create the qos */
|
||||
unsigned char bvalue[3] = { 0x01, 0x02, 0x03 };
|
||||
CU_ASSERT_FATAL ((qos = dds_create_qos()) != NULL);
|
||||
dds_qset_prop (qos, "test.prop1", "testtext_value1_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_ca", "testtext_IdentityCA_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.private_key", "testtext_PrivateKey_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_certificate", "testtext_IdentityCertificate_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions_ca", "file:Permissions_CA.pem");
|
||||
dds_qset_prop (qos, "dds.sec.access.governance", "file:Governance.p7s");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions", "file:Permissions.p7s");
|
||||
dds_qset_prop (qos, "dds.sec.auth.password", "testtext_Password_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.trusted_ca_dir", "file:/test/dir");
|
||||
dds_qset_prop (qos, "test.prop2", "testtext_value2_testtext");
|
||||
dds_qset_bprop (qos, "test.bprop1", bvalue, 3);
|
||||
|
||||
/* Create participant with security config in qos. */
|
||||
found = 0;
|
||||
ddsrt_setenv(URI_VARIABLE, "<Tracing><Verbosity>finest</></>");
|
||||
CU_ASSERT_FATAL ((participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL)) > 0);
|
||||
ddsrt_setenv(URI_VARIABLE, "");
|
||||
dds_delete(participant);
|
||||
dds_delete_qos(qos);
|
||||
|
||||
/* All traces should have been provided. */
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_FATAL(found == 0);
|
||||
#else
|
||||
CU_ASSERT_FATAL(found == 0x1);
|
||||
#endif
|
||||
}
|
||||
|
||||
CU_Test(ddsc_config, security_config_qos, .init = ddsrt_init, .fini = ddsrt_fini)
|
||||
{
|
||||
/* Expect qos settings used when creating participant with config security elements and qos. */
|
||||
const char *log_expected[] = {
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
"config: //CycloneDDS/Domain: DDSSecurity: unknown element*",
|
||||
#else
|
||||
/* The security settings from qos properties should have been parsed into the participant QoS. */
|
||||
"new_participant(*): using security settings from QoS, ignoring security configuration*",
|
||||
"PARTICIPANT * QOS={*property_list={value={"
|
||||
"{dds.sec.auth.identity_ca,testtext_QOS_IdentityCA_testtext,0},"
|
||||
"{dds.sec.auth.private_key,testtext_QOS_PrivateKey_testtext,0},"
|
||||
"{dds.sec.auth.identity_certificate,testtext_QOS_IdentityCertificate_testtext,0},"
|
||||
"{dds.sec.access.permissions_ca,file:QOS_Permissions_CA.pem,0},"
|
||||
"{dds.sec.access.governance,file:QOS_Governance.p7s,0},"
|
||||
"{dds.sec.access.permissions,file:QOS_Permissions.p7s,0}"
|
||||
"}binary_value={}}*}*",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
const char *sec_config =
|
||||
"<Tracing><Verbosity>finest</></>"
|
||||
"<DDSSecurity>"
|
||||
"<Authentication>"
|
||||
"<IdentityCertificate>testtext_IdentityCertificate_testtext</IdentityCertificate>"
|
||||
"<IdentityCA>testtext_IdentityCA_testtext</IdentityCA>"
|
||||
"<PrivateKey>testtext_PrivateKey_testtext</PrivateKey>"
|
||||
"</Authentication>"
|
||||
"<AccessControl>"
|
||||
"<Governance>file:Governance.p7s</Governance>"
|
||||
"<PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
|
||||
"<Permissions>file:Permissions.p7s</Permissions>"
|
||||
"</AccessControl>"
|
||||
"</DDSSecurity>";
|
||||
|
||||
dds_entity_t participant;
|
||||
dds_qos_t * qos;
|
||||
|
||||
CU_ASSERT_FATAL ((qos = dds_create_qos()) != NULL);
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_ca", "testtext_QOS_IdentityCA_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.private_key", "testtext_QOS_PrivateKey_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.auth.identity_certificate", "testtext_QOS_IdentityCertificate_testtext");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions_ca", "file:QOS_Permissions_CA.pem");
|
||||
dds_qset_prop (qos, "dds.sec.access.governance", "file:QOS_Governance.p7s");
|
||||
dds_qset_prop (qos, "dds.sec.access.permissions", "file:QOS_Permissions.p7s");
|
||||
|
||||
/* Set up the trace sinks to detect the config parsing. */
|
||||
dds_set_log_mask(DDS_LC_FATAL|DDS_LC_ERROR|DDS_LC_WARNING|DDS_LC_CONFIG);
|
||||
dds_set_log_sink(&logger, (void*)log_expected);
|
||||
dds_set_trace_sink(&logger, (void*)log_expected);
|
||||
|
||||
/* Create participant with security elements. */
|
||||
found = 0;
|
||||
ddsrt_setenv(URI_VARIABLE, sec_config);
|
||||
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
|
||||
ddsrt_setenv(URI_VARIABLE, "");
|
||||
dds_delete(participant);
|
||||
dds_delete_qos(qos);
|
||||
|
||||
/* All traces should have been provided. */
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_FATAL(found == 0x1);
|
||||
#else
|
||||
CU_ASSERT_FATAL(found == 0x3);
|
||||
#endif
|
||||
}
|
||||
|
||||
CU_Test(ddsc_config, security_other_prop, .init = ddsrt_init, .fini = ddsrt_fini)
|
||||
{
|
||||
/* Expect config used when creating participant with config security elements and
|
||||
* qos containing only non-security properties. */
|
||||
const char *log_expected[] = {
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
"config: //CycloneDDS/Domain: DDSSecurity: unknown element*",
|
||||
#else
|
||||
/* The security settings from config should have been parsed into the participant QoS. */
|
||||
"PARTICIPANT * QOS={*property_list={value={"
|
||||
"{test.dds.sec.prop1,testtext_value1_testtext,0},"
|
||||
"{dds.sec.auth.identity_ca,testtext_IdentityCA_testtext,0},"
|
||||
"{dds.sec.auth.private_key,testtext_PrivateKey_testtext,0},"
|
||||
"{dds.sec.auth.identity_certificate,testtext_IdentityCertificate_testtext,0},"
|
||||
"{dds.sec.access.permissions_ca,file:Permissions_CA.pem,0},"
|
||||
"{dds.sec.access.governance,file:Governance.p7s,0},"
|
||||
"{dds.sec.access.permissions,file:Permissions.p7s,0}"
|
||||
"}binary_value={}}*}*",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
const char *sec_config =
|
||||
"<Tracing><Verbosity>finest</></>"
|
||||
"<DDSSecurity>"
|
||||
"<Authentication>"
|
||||
"<IdentityCertificate>testtext_IdentityCertificate_testtext</IdentityCertificate>"
|
||||
"<IdentityCA>testtext_IdentityCA_testtext</IdentityCA>"
|
||||
"<PrivateKey>testtext_PrivateKey_testtext</PrivateKey>"
|
||||
"</Authentication>"
|
||||
"<AccessControl>"
|
||||
"<Governance>file:Governance.p7s</Governance>"
|
||||
"<PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
|
||||
"<Permissions>file:Permissions.p7s</Permissions>"
|
||||
"</AccessControl>"
|
||||
"</DDSSecurity>";
|
||||
|
||||
dds_entity_t participant;
|
||||
dds_qos_t * qos;
|
||||
|
||||
CU_ASSERT_FATAL ((qos = dds_create_qos()) != NULL);
|
||||
dds_qset_prop (qos, "test.dds.sec.prop1", "testtext_value1_testtext");
|
||||
|
||||
/* Set up the trace sinks to detect the config parsing. */
|
||||
dds_set_log_mask(DDS_LC_FATAL|DDS_LC_ERROR|DDS_LC_WARNING|DDS_LC_CONFIG);
|
||||
dds_set_log_sink(&logger, (void*)log_expected);
|
||||
dds_set_trace_sink(&logger, (void*)log_expected);
|
||||
|
||||
/* Create participant with security elements. */
|
||||
found = 0;
|
||||
ddsrt_setenv(URI_VARIABLE, sec_config);
|
||||
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
|
||||
ddsrt_setenv(URI_VARIABLE, "");
|
||||
dds_delete(participant);
|
||||
dds_delete_qos(qos);
|
||||
|
||||
/* All traces should have been provided. */
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_FATAL(found == 0x1);
|
||||
#else
|
||||
CU_ASSERT_FATAL(found == 0x1);
|
||||
#endif
|
||||
}
|
||||
|
||||
CU_Test(ddsc_config, security_qos_invalid, .init = ddsrt_init, .fini = ddsrt_fini)
|
||||
{
|
||||
/* Expected traces when creating participant with the security elements. */
|
||||
const char *log_expected[] = {
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
"config: //CycloneDDS/Domain: DDSSecurity: unknown element*",
|
||||
#else
|
||||
/* The config should have been parsed into the participant QoS. */
|
||||
"PARTICIPANT * QOS={*property_list={value={"
|
||||
"{dds.sec.auth.identity_ca,testtext_IdentityCA_testtext,0},"
|
||||
"{dds.sec.auth.private_key,testtext_PrivateKey_testtext,0},"
|
||||
"{dds.sec.auth.identity_certificate,testtext_IdentityCertificate_testtext,0},"
|
||||
"{dds.sec.access.permissions_ca,file:Permissions_CA.pem,0},"
|
||||
"{dds.sec.access.governance,file:Governance.p7s,0},"
|
||||
"{dds.sec.access.permissions,file:Permissions.p7s,0}"
|
||||
"}binary_value={}}*}*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_AUTH_IDENTITY_CA" missing in Property QoS*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_AUTH_PRIV_KEY" missing in Property QoS*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_AUTH_IDENTITY_CERT" missing in Property QoS*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_ACCESS_PERMISSIONS_CA" missing in Property QoS*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_ACCESS_GOVERNANCE" missing in Property QoS*",
|
||||
"new_participant(*): required security property "DDS_SEC_PROP_ACCESS_PERMISSIONS" missing in Property QoS*",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
const char *sec_config =
|
||||
"<Tracing><Verbosity>finest</></>"
|
||||
"<DDSSecurity>"
|
||||
"<Authentication>"
|
||||
"<IdentityCertificate>testtext_IdentityCertificate_testtext</IdentityCertificate>"
|
||||
"<IdentityCA>testtext_IdentityCA_testtext</IdentityCA>"
|
||||
"<PrivateKey>testtext_PrivateKey_testtext</PrivateKey>"
|
||||
"</Authentication>"
|
||||
"<AccessControl>"
|
||||
"<Governance>file:Governance.p7s</Governance>"
|
||||
"<PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
|
||||
"<Permissions>file:Permissions.p7s</Permissions>"
|
||||
"</AccessControl>"
|
||||
"</DDSSecurity>";
|
||||
|
||||
dds_entity_t participant;
|
||||
dds_qos_t * qos;
|
||||
|
||||
/* Set up the trace sinks to detect the config parsing. */
|
||||
dds_set_log_mask(DDS_LC_FATAL|DDS_LC_ERROR|DDS_LC_WARNING|DDS_LC_CONFIG);
|
||||
dds_set_log_sink(&logger, (void*)log_expected);
|
||||
dds_set_trace_sink(&logger, (void*)log_expected);
|
||||
|
||||
/* Create the qos */
|
||||
CU_ASSERT_FATAL ((qos = dds_create_qos()) != NULL);
|
||||
dds_qset_prop (qos, "dds.sec.dummy", "testtext_dummy_testtext");
|
||||
|
||||
/* Create participant with security config in qos. */
|
||||
found = 0;
|
||||
ddsrt_setenv(URI_VARIABLE, sec_config);
|
||||
participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
|
||||
dds_delete_qos(qos);
|
||||
#ifdef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_EQUAL_FATAL (participant, DDS_RETCODE_ERROR);
|
||||
#else
|
||||
dds_delete(participant);
|
||||
#endif
|
||||
ddsrt_setenv(URI_VARIABLE, "");
|
||||
|
||||
/* All traces should have been provided. */
|
||||
#ifndef DDSI_INCLUDE_SECURITY
|
||||
CU_ASSERT_FATAL(found == 0x01);
|
||||
#else
|
||||
CU_ASSERT_FATAL(found == 0x7e);
|
||||
#endif
|
||||
dds_set_log_sink(NULL, NULL);
|
||||
dds_set_trace_sink(NULL, NULL);
|
||||
}
|
||||
|
|
@ -146,7 +146,10 @@ static const char* c_userdata = "user_key";
|
|||
static const char* c_topicdata = "topic_key";
|
||||
static const char* c_groupdata = "group_key";
|
||||
static const char* c_partitions[] = {"Partition1", "Partition2"};
|
||||
|
||||
static const char* c_property_names[] = {"prop1", "prop2", "prop3"};
|
||||
static const char* c_property_values[] = {"val1", "val2", "val3"};
|
||||
static const char* c_bproperty_names[] = {"bprop1", "bprop2", "bprop3"};
|
||||
static const unsigned char c_bproperty_values[3][3] = {{0x0, 0x1, 0x2}, {0x2, 0x3, 0x4}, {0x5, 0x6, 0x7}};
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
|
|
@ -646,3 +649,186 @@ CU_Test(ddsc_qos, durability_service, .init=qos_init, .fini=qos_fini)
|
|||
CU_ASSERT_EQUAL_FATAL(p.max_samples_per_instance, g_pol_durability_service.max_samples_per_instance);
|
||||
}
|
||||
|
||||
CU_Test(ddsc_qos, property, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
char * value = NULL;
|
||||
char ** names = NULL;
|
||||
uint32_t cnt = 0;
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, NULL, NULL));
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, c_property_names[0], NULL));
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, NULL, &value));
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (NULL, c_property_names[0], &value));
|
||||
|
||||
dds_qset_prop (g_qos, NULL, NULL);
|
||||
dds_qset_prop (g_qos, NULL, c_property_values[0]);
|
||||
dds_qset_prop (NULL, c_property_names[0], c_property_values[0]);
|
||||
|
||||
/* Set null value should not succeed, setting empty string should */
|
||||
dds_qset_prop (g_qos, c_property_names[0], NULL);
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
dds_qset_prop (g_qos, c_property_names[0], "");
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, "");
|
||||
dds_free (value);
|
||||
|
||||
/* Getting after setting, should yield the original input. */
|
||||
dds_qset_prop (g_qos, c_property_names[0], c_property_values[0]);
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[0]);
|
||||
dds_free (value);
|
||||
|
||||
/* Overwrite value for existing property (and reset value) */
|
||||
dds_qset_prop (g_qos, c_property_names[0], c_property_values[1]);
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[1]);
|
||||
dds_free (value);
|
||||
dds_qset_prop (g_qos, c_property_names[0], c_property_values[0]);
|
||||
|
||||
/* Set 2nd prop and get length */
|
||||
dds_qset_prop (g_qos, c_property_names[1], c_property_values[1]);
|
||||
CU_ASSERT_FATAL (dds_qget_propnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 2);
|
||||
|
||||
/* Set another property and get list of property names */
|
||||
dds_qset_prop (g_qos, c_property_names[2], c_property_values[2]);
|
||||
CU_ASSERT_FATAL (dds_qget_propnames (g_qos, &cnt, &names));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 3);
|
||||
for (uint32_t i = 0; i < cnt; i++)
|
||||
{
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (names[i], c_property_names[i]);
|
||||
dds_free (names[i]);
|
||||
}
|
||||
dds_free (names);
|
||||
|
||||
/* Unset a property and check if removed */
|
||||
dds_qunset_prop (g_qos, c_property_names[1]);
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, c_property_names[1], &value));
|
||||
CU_ASSERT_FATAL (dds_qget_propnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 2);
|
||||
CU_ASSERT_FATAL(dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[0]);
|
||||
dds_free (value);
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[2], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[2]);
|
||||
dds_free (value);
|
||||
dds_qunset_prop (g_qos, c_property_names[0]);
|
||||
dds_qunset_prop (g_qos, c_property_names[2]);
|
||||
CU_ASSERT_FATAL (!dds_qget_propnames (g_qos, &cnt, NULL));
|
||||
}
|
||||
|
||||
CU_Test(ddsc_qos, bproperty, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
void * bvalue = NULL;
|
||||
size_t size = 0;
|
||||
char ** names = NULL;
|
||||
uint32_t cnt = 0;
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (g_qos, NULL, NULL, NULL));
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (g_qos, c_bproperty_names[0], NULL, NULL));
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (g_qos, NULL, &bvalue, &size));
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (NULL, c_bproperty_names[0], &bvalue, &size));
|
||||
|
||||
dds_qset_bprop (g_qos, NULL, NULL, 0);
|
||||
dds_qset_bprop (g_qos, NULL, &c_bproperty_values[0], 0);
|
||||
dds_qset_bprop (NULL, c_bproperty_names[0], c_bproperty_values[0], 0);
|
||||
|
||||
/* Set null value should succeed */
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[0], NULL, 0);
|
||||
CU_ASSERT_FATAL (dds_qget_bprop (g_qos, c_bproperty_names[0], &bvalue, &size));
|
||||
CU_ASSERT_EQUAL_FATAL (bvalue, NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 0);
|
||||
|
||||
/* Getting after setting, should yield the original input. */
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[0], c_bproperty_values[0], 3);
|
||||
CU_ASSERT_FATAL(dds_qget_bprop (g_qos, c_bproperty_names[0], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (bvalue != NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 3);
|
||||
CU_ASSERT_EQUAL_FATAL (memcmp (bvalue, c_bproperty_values[0], size), 0);
|
||||
dds_free (bvalue);
|
||||
|
||||
/* Overwrite value for existing binary property (and reset value) */
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[0], c_bproperty_values[1], 3);
|
||||
CU_ASSERT_FATAL (dds_qget_bprop (g_qos, c_bproperty_names[0], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (bvalue != NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 3);
|
||||
CU_ASSERT_EQUAL_FATAL (memcmp (bvalue, c_bproperty_values[1], size), 0);
|
||||
dds_free (bvalue);
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[0], &c_bproperty_values[0], 3);
|
||||
|
||||
/* Set 2nd binary prop and get length */
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[1], &c_bproperty_values[1], 3);
|
||||
CU_ASSERT_FATAL (dds_qget_bpropnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 2);
|
||||
|
||||
/* Set another binary property and get list of property names */
|
||||
dds_qset_bprop (g_qos, c_bproperty_names[2], &c_bproperty_values[2], 3);
|
||||
CU_ASSERT_FATAL (dds_qget_bpropnames (g_qos, &cnt, &names));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 3);
|
||||
for (uint32_t i = 0; i < cnt; i++)
|
||||
{
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (names[i], c_bproperty_names[i]);
|
||||
dds_free (names[i]);
|
||||
}
|
||||
dds_free (names);
|
||||
|
||||
/* Unset a binary property and check if removed */
|
||||
dds_qunset_bprop (g_qos, c_bproperty_names[1]);
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (g_qos, c_bproperty_names[1], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (dds_qget_bpropnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 2);
|
||||
CU_ASSERT_FATAL (dds_qget_bprop (g_qos, c_bproperty_names[0], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (bvalue != NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 3);
|
||||
CU_ASSERT_EQUAL_FATAL (memcmp (bvalue, c_bproperty_values[0], size), 0);
|
||||
dds_free (bvalue);
|
||||
CU_ASSERT_FATAL (dds_qget_bprop (g_qos, c_bproperty_names[2], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (bvalue != NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 3);
|
||||
CU_ASSERT_EQUAL_FATAL (memcmp (bvalue, c_bproperty_values[2], size), 0);
|
||||
dds_free (bvalue);
|
||||
dds_qunset_bprop (g_qos, c_bproperty_names[0]);
|
||||
dds_qunset_bprop (g_qos, c_bproperty_names[2]);
|
||||
CU_ASSERT_FATAL (!dds_qget_bpropnames (g_qos, &cnt, NULL));
|
||||
}
|
||||
|
||||
CU_Test(ddsc_qos, property_mixed, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
char * value = NULL;
|
||||
void * bvalue = NULL;
|
||||
size_t size = 0;
|
||||
uint32_t cnt = 0;
|
||||
|
||||
/* Set property and binary property with same name */
|
||||
dds_qset_prop (g_qos, c_property_names[0], c_property_values[0]);
|
||||
dds_qset_bprop (g_qos, c_property_names[0], c_bproperty_values[0], 3);
|
||||
|
||||
/* Check property values and count */
|
||||
CU_ASSERT_FATAL (dds_qget_bprop (g_qos, c_property_names[0], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (bvalue != NULL);
|
||||
CU_ASSERT_EQUAL_FATAL (size, 3);
|
||||
CU_ASSERT_EQUAL_FATAL (memcmp (bvalue, c_bproperty_values[0], size), 0);
|
||||
dds_free (bvalue);
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[0]);
|
||||
dds_free (value);
|
||||
|
||||
CU_ASSERT_FATAL (dds_qget_propnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 1);
|
||||
CU_ASSERT_FATAL (dds_qget_bpropnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_EQUAL_FATAL (cnt, 1);
|
||||
|
||||
/* Unset and check */
|
||||
dds_qunset_bprop (g_qos, c_property_names[0]);
|
||||
CU_ASSERT_FATAL (!dds_qget_bprop (g_qos, c_property_names[0], &bvalue, &size));
|
||||
CU_ASSERT_FATAL (dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_STRING_EQUAL_FATAL (value, c_property_values[0]);
|
||||
dds_free (value);
|
||||
|
||||
dds_qunset_prop (g_qos, c_property_names[0]);
|
||||
CU_ASSERT_FATAL (!dds_qget_prop (g_qos, c_property_names[0], &value));
|
||||
CU_ASSERT_FATAL (!dds_qget_propnames (g_qos, &cnt, NULL));
|
||||
CU_ASSERT_FATAL (!dds_qget_bpropnames (g_qos, &cnt, NULL));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue