d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Property read int32 tests.

Browse Source
This commit is contained in:
Roger A. Light 2018-10-04 19:04:21 +01:00
parent f4b2838574
commit e14b613a02
2 changed files with 179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/property_mosq.c
View File

@ -152,6 +152,10 @@ int property__read_all(struct mosquitto__packet *packet, struct mqtt5__property
bool have_wildcard_sub_available = false;
bool have_subscription_id_available = false;
bool have_shared_sub_available = false;
bool have_message_expiry_interval = false;
bool have_session_expiry_interval = false;
bool have_will_delay_interval = false;
bool have_maximum_packet_size = false;
rc = packet__read_varint(packet, &proplen, NULL);
if(rc) return rc;
@ -226,6 +230,30 @@ int property__read_all(struct mosquitto__packet *packet, struct mqtt5__property
return MOSQ_ERR_PROTOCOL;
}
have_shared_sub_available = true;
}else if(p->identifier == PROP_MESSAGE_EXPIRY_INTERVAL){
if(have_message_expiry_interval){
property__free_all(properties);
return MOSQ_ERR_PROTOCOL;
}
have_message_expiry_interval = true;
}else if(p->identifier == PROP_SESSION_EXPIRY_INTERVAL){
if(have_session_expiry_interval){
property__free_all(properties);
return MOSQ_ERR_PROTOCOL;
}
have_session_expiry_interval = true;
}else if(p->identifier == PROP_WILL_DELAY_INTERVAL){
if(have_will_delay_interval){
property__free_all(properties);
return MOSQ_ERR_PROTOCOL;
}
have_will_delay_interval = true;
}else if(p->identifier == PROP_MAXIMUM_PACKET_SIZE){
if(have_maximum_packet_size || p->value.i32 == 0){
property__free_all(properties);
return MOSQ_ERR_PROTOCOL;
}
have_maximum_packet_size = true;
}
}

151
test/unit/property_read.c
View File

@ -59,6 +59,53 @@ static void bad_byte_helper(int identifier)
}
static void int32_prop_read_helper(
uint8_t *payload,
int remaining_length,
int rc_expected,
int identifier,
uint32_t value_expected)
{
struct mosquitto__packet packet;
struct mqtt5__property *properties;
int rc;
memset(&packet, 0, sizeof(struct mosquitto__packet));
packet.payload = payload;
packet.remaining_length = remaining_length;
rc = property__read_all(&packet, &properties);
CU_ASSERT_EQUAL(rc, rc_expected);
CU_ASSERT_EQUAL(packet.pos, remaining_length);
if(properties){
CU_ASSERT_EQUAL(properties->identifier, identifier);
CU_ASSERT_EQUAL(properties->value.i32, value_expected);
CU_ASSERT_PTR_EQUAL(properties->next, NULL);
property__free_all(&properties);
}
CU_ASSERT_PTR_EQUAL(properties, NULL);
}
static void duplicate_int32_helper(int identifier)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 10; /* Proplen = (Identifier + int32)*2 */
payload[1] = identifier;
payload[2] = 1;
payload[3] = 1;
payload[4] = 1;
payload[5] = 1;
payload[6] = identifier;
payload[7] = 0;
payload[8] = 0;
payload[9] = 0;
payload[10] = 0;
int32_prop_read_helper(payload, 11, MOSQ_ERR_PROTOCOL, identifier, 1);
}
/* ========================================================================
* NO PROPERTIES
* ======================================================================== */
@ -256,6 +303,66 @@ static void TEST_single_shared_subscription_available(void)
byte_prop_read_helper(payload, 3, MOSQ_ERR_SUCCESS, PROP_SHARED_SUB_AVAILABLE, 1);
}
static void TEST_single_message_expiry_interval(void)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 5; /* Proplen = Identifier + byte */
payload[1] = PROP_MESSAGE_EXPIRY_INTERVAL;
payload[2] = 0x12;
payload[3] = 0x23;
payload[4] = 0x34;
payload[5] = 0x45;
int32_prop_read_helper(payload, 6, MOSQ_ERR_SUCCESS, PROP_MESSAGE_EXPIRY_INTERVAL, 0x12233445);
}
static void TEST_single_session_expiry_interval(void)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 5; /* Proplen = Identifier + byte */
payload[1] = PROP_SESSION_EXPIRY_INTERVAL;
payload[2] = 0x45;
payload[3] = 0x34;
payload[4] = 0x23;
payload[5] = 0x12;
int32_prop_read_helper(payload, 6, MOSQ_ERR_SUCCESS, PROP_SESSION_EXPIRY_INTERVAL, 0x45342312);
}
static void TEST_single_will_delay_interval(void)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 5; /* Proplen = Identifier + byte */
payload[1] = PROP_WILL_DELAY_INTERVAL;
payload[2] = 0x45;
payload[3] = 0x34;
payload[4] = 0x23;
payload[5] = 0x12;
int32_prop_read_helper(payload, 6, MOSQ_ERR_SUCCESS, PROP_WILL_DELAY_INTERVAL, 0x45342312);
}
static void TEST_single_maximum_packet_size(void)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 5; /* Proplen = Identifier + byte */
payload[1] = PROP_MAXIMUM_PACKET_SIZE;
payload[2] = 0x45;
payload[3] = 0x34;
payload[4] = 0x23;
payload[5] = 0x12;
int32_prop_read_helper(payload, 6, MOSQ_ERR_SUCCESS, PROP_MAXIMUM_PACKET_SIZE, 0x45342312);
}
/* ========================================================================
* DUPLICATE PROPERTIES
* ======================================================================== */
@ -300,6 +407,26 @@ static void TEST_duplicate_shared_subscription_available(void)
duplicate_byte_helper(PROP_SHARED_SUB_AVAILABLE);
}
static void TEST_duplicate_message_expiry_interval(void)
{
duplicate_int32_helper(PROP_MESSAGE_EXPIRY_INTERVAL);
}
static void TEST_duplicate_session_expiry_interval(void)
{
duplicate_int32_helper(PROP_SESSION_EXPIRY_INTERVAL);
}
static void TEST_duplicate_will_delay_interval(void)
{
duplicate_int32_helper(PROP_WILL_DELAY_INTERVAL);
}
static void TEST_duplicate_maximum_packet_size(void)
{
duplicate_int32_helper(PROP_MAXIMUM_PACKET_SIZE);
}
/* ========================================================================
* BAD PROPERTY VALUES
* ======================================================================== */
@ -339,6 +466,21 @@ static void TEST_bad_shared_sub_available(void)
bad_byte_helper(PROP_SHARED_SUB_AVAILABLE);
}
static void TEST_bad_maximum_packet_size(void)
{
uint8_t payload[20];
memset(&payload, 0, sizeof(payload));
payload[0] = 5; /* Proplen = Identifier + int32 */
payload[1] = PROP_MAXIMUM_PACKET_SIZE;
payload[2] = 0;
payload[3] = 0;
payload[4] = 0;
payload[5] = 0; /* 0 is invalid */
int32_prop_read_helper(payload, 6, MOSQ_ERR_PROTOCOL, PROP_MAXIMUM_PACKET_SIZE, 0);
}
/* ========================================================================
* TEST SUITE SETUP
* ======================================================================== */
@ -365,6 +507,10 @@ int init_property_read_tests(void)
|| !CU_add_test(test_suite, "Single Wildcard Subscription Available", TEST_single_wildcard_subscription_available)
|| !CU_add_test(test_suite, "Single Subscription Identifier Available", TEST_single_subscription_identifier_available)
|| !CU_add_test(test_suite, "Single Shared Subscription Available", TEST_single_shared_subscription_available)
|| !CU_add_test(test_suite, "Single Message Expiry Interval", TEST_single_message_expiry_interval)
|| !CU_add_test(test_suite, "Single Session Expiry Interval", TEST_single_session_expiry_interval)
|| !CU_add_test(test_suite, "Single Will Delay Interval", TEST_single_will_delay_interval)
|| !CU_add_test(test_suite, "Single Maximum Packet Size", TEST_single_maximum_packet_size)
|| !CU_add_test(test_suite, "Duplicate Payload Format Indicator", TEST_duplicate_payload_format_indicator)
|| !CU_add_test(test_suite, "Duplicate Request Problem Information", TEST_duplicate_request_problem_information)
|| !CU_add_test(test_suite, "Duplicate Request Response Information", TEST_duplicate_request_response_information)
@ -373,6 +519,10 @@ int init_property_read_tests(void)
|| !CU_add_test(test_suite, "Duplicate Wildcard Subscription Available", TEST_duplicate_wildcard_subscription_available)
|| !CU_add_test(test_suite, "Duplicate Subscription Identifier Available", TEST_duplicate_subscription_identifier_available)
|| !CU_add_test(test_suite, "Duplicate Shared Subscription Available", TEST_duplicate_shared_subscription_available)
|| !CU_add_test(test_suite, "Duplicate Message Expiry Interval", TEST_duplicate_message_expiry_interval)
|| !CU_add_test(test_suite, "Duplicate Session Expiry Interval", TEST_duplicate_session_expiry_interval)
|| !CU_add_test(test_suite, "Duplicate Will Delay Interval", TEST_duplicate_will_delay_interval)
|| !CU_add_test(test_suite, "Duplicate Maximum Packet Size", TEST_duplicate_maximum_packet_size)
|| !CU_add_test(test_suite, "Bad Request Problem Information", TEST_bad_request_problem_information)
|| !CU_add_test(test_suite, "Bad Request Response Information", TEST_bad_request_response_information)
|| !CU_add_test(test_suite, "Bad Maximum QoS", TEST_bad_maximum_qos)
@ -380,6 +530,7 @@ int init_property_read_tests(void)
|| !CU_add_test(test_suite, "Bad Wildcard Subscription Available", TEST_bad_wildcard_sub_available)
|| !CU_add_test(test_suite, "Bad Subscription Identifier Available", TEST_bad_subscription_id_available)
|| !CU_add_test(test_suite, "Bad Shared Subscription Available", TEST_bad_shared_sub_available)
|| !CU_add_test(test_suite, "Bad Maximum Packet Size", TEST_bad_maximum_packet_size)
){
printf("Error adding Property read CUnit tests.\n");