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

Fix ReinitializeDevice service handling of optional password (#487)

Browse Source 
* Fix ReinitializeDevice service handling of optional password

* Improve ReinitializeDevice service unit testing

---------

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-09-08 14:58:04 -05:00
committed by GitHub
parent f641aacddb
commit bd597082d2
5 changed files with 188 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/rd/src/main.c
+79 -37
View File
@@ -21,31 +21,84 @@
* @brief Test
*/
static int rd_decode_apdu(uint8_t *apdu,
unsigned apdu_len,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_REINITIALIZED_STATE *state,
BACNET_CHARACTER_STRING *password)
{
int len = 0;
unsigned offset = 0;
int apdu_len = 0;
if (!apdu)
if (!apdu) {
return -1;
}
if (apdu_size <= 4) {
return -1;
}
/* optional checking - most likely was already done prior to this call */
if (apdu[0] != PDU_TYPE_CONFIRMED_SERVICE_REQUEST)
if (apdu[0] != PDU_TYPE_CONFIRMED_SERVICE_REQUEST) {
return -1;
}
/* apdu[1] = encode_max_segs_max_apdu(0, MAX_APDU); */
*invoke_id = apdu[2]; /* invoke id - filled in by net layer */
if (apdu[3] != SERVICE_CONFIRMED_REINITIALIZE_DEVICE)
if (invoke_id) {
*invoke_id = apdu[2]; /* invoke id - filled in by net layer */
}
if (apdu[3] != SERVICE_CONFIRMED_REINITIALIZE_DEVICE) {
return -1;
offset = 4;
if (apdu_len > offset) {
}
apdu_len = 4;
if (apdu_len < apdu_size) {
len = rd_decode_service_request(
&apdu[offset], apdu_len - offset, state, password);
&apdu[apdu_len], apdu_size - apdu_len, state, password);
if (len > 0) {
apdu_len += len;
} else {
apdu_len = len;
}
}
return len;
return apdu_len;
}
static void Test_ReinitializeDevice_Service(
BACNET_REINITIALIZED_STATE state, char *password_string)
{
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;
BACNET_REINITIALIZED_STATE test_state;
BACNET_CHARACTER_STRING password;
BACNET_CHARACTER_STRING test_password;
characterstring_init_ansi(&password, password_string);
null_len = rd_encode_apdu(NULL, invoke_id, state, &password);
len = rd_encode_apdu(&apdu[0], invoke_id, state, &password);
zassert_equal(null_len, len, "len=%d null_len=%d", len, null_len);
zassert_true(len > 0, NULL);
apdu_len = len;
null_len = rd_decode_apdu(&apdu[0], apdu_len, NULL, NULL, NULL);
len = rd_decode_apdu(
&apdu[0], apdu_len, &test_invoke_id, &test_state, &test_password);
zassert_equal(null_len, len, "len=%d null_len=%d", len, null_len);
zassert_true(len > 0, NULL);
zassert_equal(test_invoke_id, invoke_id, NULL);
zassert_equal(test_state, state, NULL);
zassert_true(characterstring_same(&test_password, &password), NULL);
while (apdu_len) {
apdu_len--;
if (apdu_len == 6) {
/* boundary of optional password, so becomes valid */
continue;
}
len = rd_decode_apdu(apdu, apdu_len, NULL, NULL, NULL);
zassert_true(len < 0, "len=%d apdu_len=%d password='%s'", len, apdu_len,
password_string);
}
}
#if defined(CONFIG_ZTEST_NEW_API)
@@ -54,28 +107,20 @@ ZTEST(rd_tests, test_ReinitializeDevice)
static void test_ReinitializeDevice(void)
#endif
{
uint8_t apdu[480] = { 0 };
int len = 0;
int apdu_len = 0;
uint8_t invoke_id = 128;
uint8_t test_invoke_id = 0;
BACNET_REINITIALIZED_STATE state;
BACNET_REINITIALIZED_STATE test_state;
BACNET_CHARACTER_STRING password;
BACNET_CHARACTER_STRING test_password;
state = BACNET_REINIT_WARMSTART;
characterstring_init_ansi(&password, "John 3:16");
len = rd_encode_apdu(&apdu[0], invoke_id, state, &password);
zassert_not_equal(len, 0, NULL);
apdu_len = len;
len = rd_decode_apdu(
&apdu[0], apdu_len, &test_invoke_id, &test_state, &test_password);
zassert_not_equal(len, -1, NULL);
zassert_equal(test_invoke_id, invoke_id, NULL);
zassert_equal(test_state, state, NULL);
zassert_true(characterstring_same(&test_password, &password), NULL);
Test_ReinitializeDevice_Service(BACNET_REINIT_COLDSTART, "John 3:16");
Test_ReinitializeDevice_Service(BACNET_REINIT_COLDSTART, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_WARMSTART, "Joshua95");
Test_ReinitializeDevice_Service(BACNET_REINIT_WARMSTART, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_STARTBACKUP, "Mary98");
Test_ReinitializeDevice_Service(BACNET_REINIT_STARTBACKUP, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_ENDBACKUP, "Anna99");
Test_ReinitializeDevice_Service(BACNET_REINIT_ENDBACKUP, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_STARTRESTORE, "Chris04");
Test_ReinitializeDevice_Service(BACNET_REINIT_STARTRESTORE, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_ENDRESTORE, "Steve66");
Test_ReinitializeDevice_Service(BACNET_REINIT_ENDRESTORE, "");
Test_ReinitializeDevice_Service(BACNET_REINIT_ABORTRESTORE, "Patricia66");
Test_ReinitializeDevice_Service(BACNET_REINIT_ABORTRESTORE, "");
return;
}
@@ -83,15 +128,12 @@ static void test_ReinitializeDevice(void)
* @}
*/
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST_SUITE(rd_tests, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(rd_tests,
ztest_unit_test(test_ReinitializeDevice)
);
ztest_test_suite(rd_tests, ztest_unit_test(test_ReinitializeDevice));
ztest_run_test_suite(rd_tests);
}