From 9e1f590d5a929a21223bb39ae5123d27e69fda66 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Fri, 17 Jan 2020 18:19:45 +0100 Subject: Add tests for Pro`s bootloader --- unittest/test_pro.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index a8df7cd..3f1cb8d 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -977,21 +977,48 @@ def test_get_device_model(C): # assert C.NK_get_device_model() != C.NK_DISCONNECTED +@pytest.mark.firmware +def test_bootloader_password_change_pro_length(C): + skip_if_device_version_lower_than({'P': 11}) + + # Test whether the correct password is set + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + # Change to the longest possible password + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_LONG) == DeviceErrorCode.STATUS_OK + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_LONG, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + # Use longer or shorter passwords than possible + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TOO_LONG) == LibraryErrors.TOO_LONG_STRING + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TOO_SHORT) == DeviceErrorCode.WRONG_PASSWORD + + + @pytest.mark.firmware def test_bootloader_password_change_pro(C): skip_if_device_version_lower_than({'P': 11}) assert C.NK_change_firmware_password_pro(b'zxcasd', b'zxcasd') == DeviceErrorCode.WRONG_PASSWORD + # Revert effects of broken test run, if needed + C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_TEMP, DefaultPasswords.UPDATE) + + # Change to the same password + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + # Change password assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.STATUS_OK assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_TEMP, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK @pytest.mark.firmware -def test_bootloader_run_pro(C): +def test_bootloader_run_pro_wrong_password(C): skip_if_device_version_lower_than({'P': 11}) assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.WRONG_PASSWORD + + +@pytest.mark.skip +@pytest.mark.firmware +def test_bootloader_run_pro(C): # Not enabled due to lack of side-effect removal at this point - # assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK @pytest.mark.firmware -- cgit v1.2.1 From 4d6a01cd2f2ec6440f5dd2c02048cbb413f91f5d Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Mon, 27 Jan 2020 18:18:55 +0100 Subject: Correct result of successful execution for bootloader to DISCONNECTED --- unittest/test_pro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 3f1cb8d..d26aa7c 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -1018,7 +1018,7 @@ def test_bootloader_run_pro_wrong_password(C): @pytest.mark.firmware def test_bootloader_run_pro(C): # Not enabled due to lack of side-effect removal at this point - assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK + assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_DISCONNECTED @pytest.mark.firmware -- cgit v1.2.1 From 73251ccf5abae5ae91f2aa962a29dce6fcc0e5e4 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Mon, 27 Jan 2020 19:14:09 +0100 Subject: Rename the actual bootloader switching test to a distinct name --- unittest/test_pro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index d26aa7c..3a324bb 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -1016,7 +1016,7 @@ def test_bootloader_run_pro_wrong_password(C): @pytest.mark.skip @pytest.mark.firmware -def test_bootloader_run_pro(C): +def test_bootloader_run_pro_real(C): # Not enabled due to lack of side-effect removal at this point assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_DISCONNECTED -- cgit v1.2.1 From ec767410d860688f32ef644e9573841272d5aec2 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Jan 2020 14:45:34 +0100 Subject: Skip bootloader activation unless specified by the switch --- unittest/test_pro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 3a324bb..a47d804 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -1014,7 +1014,7 @@ def test_bootloader_run_pro_wrong_password(C): assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.WRONG_PASSWORD -@pytest.mark.skip +@pytest.mark.skip_by_default @pytest.mark.firmware def test_bootloader_run_pro_real(C): # Not enabled due to lack of side-effect removal at this point -- cgit v1.2.1 From 2b37ae486deba1985179543333c592b55fafbc37 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Jan 2020 14:46:04 +0100 Subject: Bootloader data retention test --- unittest/test_pro.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index a47d804..4ac19ab 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -1029,6 +1029,23 @@ def test_bootloader_password_change_pro_too_long(C): assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, long_string) == LibraryErrors.TOO_LONG_STRING +@pytest.mark.skip_by_default +@pytest.mark.firmware +def test_bootloader_data_rention_test(C): + skip_if_device_version_lower_than({'P': 11}) + + def populate_device(): + return False + + def check_data_on_device(): + return False + + assert populate_device() + assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_DISCONNECTED + input('Please press ENTER after uploading new firmware to the device') + assert check_data_on_device() + + @pytest.mark.otp @pytest.mark.parametrize('counter_mid', [10**3-1, 10**4-1, 10**7-1, 10**8-10, 2**16, 2**31-1, 2**32-1, 2**33, 2**50, 2**60, 2**63]) # 2**64-1 def test_HOTP_counter_getter(C, counter_mid: int): -- cgit v1.2.1 From 0f0225c63b6770c62ca13fcd31fd0e3e83674d93 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Jan 2020 14:49:26 +0100 Subject: Refactor rename --- unittest/test_pro.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 4ac19ab..2a5f02a 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -88,21 +88,21 @@ def test_write_all_password_safe_slots_and_read_10_times(C): @pytest.mark.slowtest @pytest.mark.xfail(reason="This test should be run directly after test_write_all_password_safe_slots_and_read_10_times") def test_read_all_password_safe_slots_10_times(C): - def fill(s, wid): - assert wid >= len(s) + def helper_fill(str_to_fill, target_width): + assert target_width >= len(str_to_fill) numbers = '1234567890'*4 - s += numbers[:wid-len(s)] - assert len(s) == wid - return bb(s) + str_to_fill += numbers[:target_width - len(str_to_fill)] + assert len(str_to_fill) == target_width + return bb(str_to_fill) - def get_pass(suffix): - return fill('pass' + suffix, 20) + def helper_PWS_get_pass(suffix): + return helper_fill('pass' + suffix, 20) - def get_loginname(suffix): - return fill('login' + suffix, 32) + def helper_PWS_get_loginname(suffix): + return helper_fill('login' + suffix, 32) - def get_slotname(suffix): - return fill('slotname' + suffix, 11) + def helper_PWS_get_slotname(suffix): + return helper_fill('slotname' + suffix, 11) assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK assert C.NK_enable_password_safe(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK @@ -111,9 +111,9 @@ def test_read_all_password_safe_slots_10_times(C): for j in range(0, 10): for i in range(0, PWS_slot_count): iss = str(i) - assert gs(C.NK_get_password_safe_slot_name(i)) == get_slotname(iss) - assert gs(C.NK_get_password_safe_slot_login(i)) == get_loginname(iss) - assert gs(C.NK_get_password_safe_slot_password(i)) == get_pass(iss) + assert gs(C.NK_get_password_safe_slot_name(i)) == helper_PWS_get_slotname(iss) + assert gs(C.NK_get_password_safe_slot_login(i)) == helper_PWS_get_loginname(iss) + assert gs(C.NK_get_password_safe_slot_password(i)) == helper_PWS_get_pass(iss) @pytest.mark.lock_device -- cgit v1.2.1 From 59ca679eeb272163e4ebbb2f01231adc4820cda1 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Jan 2020 14:52:09 +0100 Subject: Refactor move --- unittest/test_pro.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 2a5f02a..233d4d2 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -22,8 +22,9 @@ SPDX-License-Identifier: LGPL-3.0 import pytest from conftest import skip_if_device_version_lower_than -from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bb, bbRFC_SECRET, LibraryErrors, HOTP_slot_count, \ +from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bbRFC_SECRET, LibraryErrors, HOTP_slot_count, \ TOTP_slot_count +from helpers import helper_PWS_get_slotname, helper_PWS_get_loginname, helper_PWS_get_pass, bb from misc import ffi, gs, wait, cast_pointer_to_tuple, has_binary_counter from misc import is_storage @@ -88,22 +89,6 @@ def test_write_all_password_safe_slots_and_read_10_times(C): @pytest.mark.slowtest @pytest.mark.xfail(reason="This test should be run directly after test_write_all_password_safe_slots_and_read_10_times") def test_read_all_password_safe_slots_10_times(C): - def helper_fill(str_to_fill, target_width): - assert target_width >= len(str_to_fill) - numbers = '1234567890'*4 - str_to_fill += numbers[:target_width - len(str_to_fill)] - assert len(str_to_fill) == target_width - return bb(str_to_fill) - - def helper_PWS_get_pass(suffix): - return helper_fill('pass' + suffix, 20) - - def helper_PWS_get_loginname(suffix): - return helper_fill('login' + suffix, 32) - - def helper_PWS_get_slotname(suffix): - return helper_fill('slotname' + suffix, 11) - assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK assert C.NK_enable_password_safe(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK PWS_slot_count = 16 -- cgit v1.2.1 From 2fa7e29b725085e62dd647da6e0dd28bcfe91e43 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Jan 2020 14:53:41 +0100 Subject: Refactor move 2 --- unittest/test_pro.py | 69 ---------------------------------------------------- 1 file changed, 69 deletions(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 233d4d2..13efd28 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -962,75 +962,6 @@ def test_get_device_model(C): # assert C.NK_get_device_model() != C.NK_DISCONNECTED -@pytest.mark.firmware -def test_bootloader_password_change_pro_length(C): - skip_if_device_version_lower_than({'P': 11}) - - # Test whether the correct password is set - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK - # Change to the longest possible password - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_LONG) == DeviceErrorCode.STATUS_OK - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_LONG, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK - # Use longer or shorter passwords than possible - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TOO_LONG) == LibraryErrors.TOO_LONG_STRING - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TOO_SHORT) == DeviceErrorCode.WRONG_PASSWORD - - - -@pytest.mark.firmware -def test_bootloader_password_change_pro(C): - skip_if_device_version_lower_than({'P': 11}) - assert C.NK_change_firmware_password_pro(b'zxcasd', b'zxcasd') == DeviceErrorCode.WRONG_PASSWORD - - # Revert effects of broken test run, if needed - C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_TEMP, DefaultPasswords.UPDATE) - - # Change to the same password - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK - # Change password - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.STATUS_OK - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE_TEMP, DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_OK - - -@pytest.mark.firmware -def test_bootloader_run_pro_wrong_password(C): - skip_if_device_version_lower_than({'P': 11}) - assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.WRONG_PASSWORD - - -@pytest.mark.skip_by_default -@pytest.mark.firmware -def test_bootloader_run_pro_real(C): - # Not enabled due to lack of side-effect removal at this point - assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_DISCONNECTED - - -@pytest.mark.firmware -def test_bootloader_password_change_pro_too_long(C): - skip_if_device_version_lower_than({'P': 11}) - long_string = b'a' * 100 - assert C.NK_change_firmware_password_pro(long_string, long_string) == LibraryErrors.TOO_LONG_STRING - assert C.NK_change_firmware_password_pro(DefaultPasswords.UPDATE, long_string) == LibraryErrors.TOO_LONG_STRING - - -@pytest.mark.skip_by_default -@pytest.mark.firmware -def test_bootloader_data_rention_test(C): - skip_if_device_version_lower_than({'P': 11}) - - def populate_device(): - return False - - def check_data_on_device(): - return False - - assert populate_device() - assert C.NK_enable_firmware_update_pro(DefaultPasswords.UPDATE) == DeviceErrorCode.STATUS_DISCONNECTED - input('Please press ENTER after uploading new firmware to the device') - assert check_data_on_device() - - @pytest.mark.otp @pytest.mark.parametrize('counter_mid', [10**3-1, 10**4-1, 10**7-1, 10**8-10, 2**16, 2**31-1, 2**32-1, 2**33, 2**50, 2**60, 2**63]) # 2**64-1 def test_HOTP_counter_getter(C, counter_mid: int): -- cgit v1.2.1 From 55f9b7293c22bbedd5a972fa8f1946dfd57d9c7a Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 25 Feb 2020 14:10:30 +0100 Subject: Data retention test. Refactoring. Helper functions. --- unittest/test_pro.py | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'unittest/test_pro.py') diff --git a/unittest/test_pro.py b/unittest/test_pro.py index 13efd28..99d7b1f 100644 --- a/unittest/test_pro.py +++ b/unittest/test_pro.py @@ -24,8 +24,8 @@ import pytest from conftest import skip_if_device_version_lower_than from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bbRFC_SECRET, LibraryErrors, HOTP_slot_count, \ TOTP_slot_count -from helpers import helper_PWS_get_slotname, helper_PWS_get_loginname, helper_PWS_get_pass, bb -from misc import ffi, gs, wait, cast_pointer_to_tuple, has_binary_counter +from helpers import helper_PWS_get_slotname, helper_PWS_get_loginname, helper_PWS_get_pass +from misc import ffi, gs, wait, cast_pointer_to_tuple, has_binary_counter, bb from misc import is_storage @pytest.mark.lock_device @@ -51,37 +51,21 @@ def test_write_password_safe_slot(C): @pytest.mark.PWS @pytest.mark.slowtest def test_write_all_password_safe_slots_and_read_10_times(C): - def fill(s, wid): - assert wid >= len(s) - numbers = '1234567890'*4 - s += numbers[:wid-len(s)] - assert len(s) == wid - return bb(s) - - def get_pass(suffix): - return fill('pass' + suffix, 20) - - def get_loginname(suffix): - return fill('login' + suffix, 32) - - def get_slotname(suffix): - return fill('slotname' + suffix, 11) - assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK assert C.NK_enable_password_safe(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK PWS_slot_count = 16 for i in range(0, PWS_slot_count): iss = str(i) assert C.NK_write_password_safe_slot(i, - get_slotname(iss), get_loginname(iss), - get_pass(iss)) == DeviceErrorCode.STATUS_OK + helper_PWS_get_slotname(iss), helper_PWS_get_loginname(iss), + helper_PWS_get_pass(iss)) == DeviceErrorCode.STATUS_OK for j in range(0, 10): for i in range(0, PWS_slot_count): iss = str(i) - assert gs(C.NK_get_password_safe_slot_name(i)) == get_slotname(iss) - assert gs(C.NK_get_password_safe_slot_login(i)) == get_loginname(iss) - assert gs(C.NK_get_password_safe_slot_password(i)) == get_pass(iss) + assert gs(C.NK_get_password_safe_slot_name(i)) == helper_PWS_get_slotname(iss) + assert gs(C.NK_get_password_safe_slot_login(i)) == helper_PWS_get_loginname(iss) + assert gs(C.NK_get_password_safe_slot_password(i)) == helper_PWS_get_pass(iss) @pytest.mark.lock_device -- cgit v1.2.1