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/awf/src/main.c
+24 -2
View File
@@ -25,15 +25,20 @@ static void testAtomicWriteFileAccess(BACNET_ATOMIC_WRITE_FILE_DATA *data)
uint8_t apdu[480] = { 0 };
int len = 0;
int apdu_len = 0;
int null_len = 0;
uint8_t invoke_id = 128;
uint8_t test_invoke_id = 0;
null_len = awf_encode_apdu(NULL, invoke_id, data);
len = awf_encode_apdu(&apdu[0], invoke_id, data);
zassert_not_equal(len, 0, NULL);
zassert_equal(len, null_len, NULL);
apdu_len = len;
null_len = awf_decode_apdu(&apdu[0], apdu_len, NULL, NULL);
len = awf_decode_apdu(&apdu[0], apdu_len, &test_invoke_id, &test_data);
zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
zassert_equal(len, null_len, NULL);
zassert_equal(test_data.object_type, data->object_type, NULL);
zassert_equal(test_data.object_instance, data->object_instance, NULL);
zassert_equal(test_data.access, data->access, NULL);
@@ -56,6 +61,12 @@ static void testAtomicWriteFileAccess(BACNET_ATOMIC_WRITE_FILE_DATA *data)
memcmp(octetstring_value(&test_data.fileData[0]),
octetstring_value(&data->fileData[0]),
octetstring_length(&test_data.fileData[0])), 0, NULL);
/* test APDU too short */
while (apdu_len) {
apdu_len--;
len = awf_decode_apdu(apdu, apdu_len, NULL, NULL);
zassert_true(len < 0, "len=%d apdu_len=%d", len, apdu_len);
}
}
#if defined(CONFIG_ZTEST_NEW_API)
@@ -94,14 +105,19 @@ static void testAtomicWriteFileAckAccess(
uint8_t apdu[480] = { 0 };
int len = 0;
int apdu_len = 0;
int null_len = 0;
uint8_t invoke_id = 128;
uint8_t test_invoke_id = 0;
len = awf_encode_apdu(&apdu[0], invoke_id, data);
null_len = awf_ack_encode_apdu(NULL, invoke_id, data);
len = awf_ack_encode_apdu(&apdu[0], invoke_id, data);
zassert_not_equal(len, 0, NULL);
zassert_equal(len, null_len, NULL);
apdu_len = len;
len = awf_decode_apdu(&apdu[0], apdu_len, &test_invoke_id, &test_data);
null_len = awf_ack_decode_apdu(&apdu[0], apdu_len, NULL, NULL);
len = awf_ack_decode_apdu(&apdu[0], apdu_len, &test_invoke_id, &test_data);
zassert_equal(len, null_len, NULL);
if (len == BACNET_STATUS_ERROR) {
if (data->access == FILE_STREAM_ACCESS) {
printf("testing FILE_STREAM_ACCESS failed decode\n");
@@ -120,6 +136,12 @@ static void testAtomicWriteFileAckAccess(
test_data.type.record.fileStartRecord,
data->type.record.fileStartRecord, NULL);
}
/* test APDU too short */
while (apdu_len) {
apdu_len--;
len = awf_ack_decode_apdu(apdu, apdu_len, NULL, NULL);
zassert_true(len < 0, "len=%d apdu_len=%d", len, apdu_len);
}
}
#if defined(CONFIG_ZTEST_NEW_API)