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

Bugfix/deprecate decode tag number and value (#481)

Browse Source 
* added or updated secure the BACnet primitive value decoders - the core codecs - named bacnet_x_decode(), bacnet_x_application_decode() and bacnet_x_context_decode where x is one of the 13 BACnet primitive value names.  The updated API includes an APDU size to prevent over-reading of an APDU buffer while decoding.  Improved or added unit test code coverage for the BACnet primitive value decoders.

* marked the insecure decoding API as 'deprecated' which is defined in src/bacnet/basic/sys/platform.h and can be disabled during a build. 

* added secure decoders for BACnetTimeValue, BACnetHostNPort, BACnetTimeStamp, BACnetAddress, and Weekly_Schedule and improved unit test code coverage.

* improved test code coverage for BACnet objects and properties.

* secured AtomicReadFile and AtomicWriteFile service decoders and improved unit test code coverage.

* secured BACnet Error service decoder and improved unit test code coverage.

---------

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-09-08 11:39:27 -05:00
committed by GitHub
parent bc8c261153
commit f641aacddb
67 changed files with 6103 additions and 3145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/bacaddr/src/main.c
+67 -6
View File
@@ -84,7 +84,7 @@ static void test_BACNET_ADDRESS(void)
status = bacnet_address_init(&dest, &mac, dnet, &adr);
zassert_true(status, NULL);
status = bacnet_address_init(&src, &mac, dnet, &adr);
src.adr[MAX_MAC_LEN-1] = 1;
src.adr[MAX_MAC_LEN - 1] = 1;
status = bacnet_address_same(&dest, &src);
zassert_false(status, NULL);
/* mac_len is different */
@@ -178,7 +178,69 @@ static void test_BACNET_MAC_ADDRESS(void)
zassert_false(status, NULL);
status = bacnet_address_mac_from_ascii(&dest, NULL);
zassert_false(status, NULL);
}
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(bacnet_address_tests, test_BACnetAddress_Codec)
#else
static void test_BACnetAddress_Codec(void)
#endif
{
uint8_t apdu[MAX_APDU];
BACNET_ADDRESS value = { 0 }, test_value = { 0 };
uint8_t tag_number, wrong_tag_number;
int len, test_len;
value.mac[0] = 1;
value.mac[1] = 2;
value.mac[2] = 3;
value.mac[3] = 4;
value.mac[4] = 0xba;
value.mac[5] = 0xc0;
value.mac_len = 6;
value.net = 0;
len = encode_bacnet_address(NULL, &value);
test_len = encode_bacnet_address(apdu, &value);
zassert_true(len > 0, NULL);
zassert_true(test_len > 0, NULL);
zassert_equal(len, test_len, "len=%d test_len=%d", len, test_len);
test_len = bacnet_address_decode(apdu, sizeof(apdu), &test_value);
zassert_equal(len, test_len, NULL);
zassert_equal(value.net, test_value.net, NULL);
zassert_equal(value.mac_len, test_value.mac_len, NULL);
zassert_equal(value.mac_len, 6, NULL);
test_len = bacnet_address_decode(apdu, sizeof(apdu), NULL);
zassert_equal(len, test_len, NULL);
tag_number = 1;
len = encode_context_bacnet_address(NULL, tag_number, &value);
test_len = encode_context_bacnet_address(apdu, tag_number, &value);
zassert_true(len > 0, NULL);
zassert_true(test_len > 0, NULL);
zassert_equal(len, test_len, NULL);
test_len = bacnet_address_context_decode(
apdu, sizeof(apdu), tag_number, &test_value);
zassert_equal(len, test_len, NULL);
zassert_equal(value.net, test_value.net, NULL);
zassert_equal(value.mac_len, test_value.mac_len, NULL);
zassert_equal(value.mac_len, 6, NULL);
test_len = bacnet_address_context_decode(
apdu, sizeof(apdu), tag_number, &test_value);
/* negative tests - NULL value */
test_len =
bacnet_address_context_decode(apdu, sizeof(apdu), tag_number, NULL);
zassert_equal(len, test_len, NULL);
/* negative tests - wrong tag number */
wrong_tag_number = 4;
test_len = bacnet_address_context_decode(
apdu, sizeof(apdu), wrong_tag_number, &test_value);
zassert_equal(test_len, BACNET_STATUS_ERROR, NULL);
/* negative tests - apdu too short */
while (len) {
len--;
test_len = bacnet_address_context_decode(apdu, len, tag_number, NULL);
zassert_equal(test_len, BACNET_STATUS_ERROR, NULL);
}
}
/**
* @}
@@ -188,10 +250,9 @@ ZTEST_SUITE(bacnet_address_tests, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(bacnet_address_tests,
ztest_unit_test(test_BACNET_ADDRESS),
ztest_unit_test(test_BACNET_MAC_ADDRESS)
);
ztest_test_suite(bacnet_address_tests, ztest_unit_test(test_BACNET_ADDRESS),
ztest_unit_test(test_BACNET_MAC_ADDRESS),
ztest_unit_test(test_BACnetAddress_Codec));
ztest_run_test_suite(bacnet_address_tests);
}