dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Secured the WhoHas codec and improved unit test coverage. (#649)

Browse Source
This commit is contained in:
Steve Karg
2024-05-20 11:39:10 -05:00
committed by GitHub
parent cf00e9e094
commit 53fd7a2e1f
3 changed files with 271 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/whohas/src/main.c
+39 -14
View File
@@ -1,13 +1,11 @@
/*
* Copyright (c) 2020 Legrand North America, LLC.
*
* SPDX-License-Identifier: MIT
/**
* @file
* @brief Unit test for BACnet WhoHas-Request encode and decode
* @author Steve Karg <skarg@users.sourceforge.net>
* @author Greg Shue <greg.shue@outlook.com>
* @date Aug 2022
* @copyright SPDX-License-Identifier: MIT
*/
/* @file
* @brief test BACnet integer encode/decode APIs
*/
#include <zephyr/ztest.h>
#include <bacnet/whohas.h>
@@ -20,7 +18,7 @@
* @brief Test
*/
int whohas_decode_apdu(
uint8_t *apdu, unsigned apdu_len, BACNET_WHO_HAS_DATA *data)
uint8_t *apdu, unsigned apdu_size, BACNET_WHO_HAS_DATA *data)
{
int len = 0;
@@ -32,8 +30,8 @@ int whohas_decode_apdu(
if (apdu[1] != SERVICE_UNCONFIRMED_WHO_HAS)
return -1;
/* optional limits - must be used as a pair */
if (apdu_len > 2) {
len = whohas_decode_service_request(&apdu[2], apdu_len - 2, data);
if (apdu_size > 2) {
len = whohas_decode_service_request(&apdu[2], apdu_size - 2, data);
}
return len;
@@ -44,7 +42,9 @@ static void testWhoHasData(BACNET_WHO_HAS_DATA *data)
uint8_t apdu[480] = { 0 };
int len = 0;
int apdu_len = 0;
BACNET_WHO_HAS_DATA test_data;
int null_len = 0;
int test_len = 0;
BACNET_WHO_HAS_DATA test_data = { 0 };
len = whohas_encode_apdu(&apdu[0], data);
zassert_not_equal(len, 0, NULL);
@@ -70,6 +70,31 @@ static void testWhoHasData(BACNET_WHO_HAS_DATA *data)
characterstring_same(&test_data.object.name, &data->object.name),
NULL);
}
/* encoder bounds checking */
null_len = bacnet_who_has_request_encode(NULL, data);
apdu_len = bacnet_who_has_request_encode(apdu, data);
zassert_true(apdu_len > 0, NULL);
zassert_equal(apdu_len, null_len, NULL);
null_len = bacnet_who_has_service_request_encode(NULL, sizeof(apdu), data);
apdu_len = bacnet_who_has_service_request_encode(apdu, sizeof(apdu), data);
zassert_equal(apdu_len, null_len, NULL);
zassert_true(apdu_len > 0, NULL);
/* test short APDU buffer */
while (--apdu_len) {
test_len = bacnet_who_has_service_request_encode(apdu, apdu_len, data);
zassert_equal(test_len, 0 , NULL);
}
/* decoder bounds checking */
apdu_len = bacnet_who_has_request_encode(apdu, data);
zassert_true(apdu_len > 0, NULL);
test_len = whohas_decode_service_request(apdu, apdu_len, data);
null_len = whohas_decode_service_request(apdu, apdu_len, NULL);
zassert_equal(test_len, null_len, NULL);
/* test short APDU buffer */
while (--apdu_len) {
test_len = whohas_decode_service_request(apdu, apdu_len, data);
zassert_equal(test_len, BACNET_STATUS_ERROR , NULL);
}
}
#if defined(CONFIG_ZTEST_NEW_API)
@@ -84,7 +109,7 @@ static void testWhoHas(void)
data.high_limit = -1;
data.is_object_name = false;
data.object.identifier.type = OBJECT_ANALOG_INPUT;
data.object.identifier.instance = 1;
data.object.identifier.instance = 0;
testWhoHasData(&data);
for (data.low_limit = 0; data.low_limit <= BACNET_MAX_INSTANCE;