shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

re-enable all tests

Browse Source
This commit is contained in:
Conor Patrick 2019-04-10 13:42:38 -04:00
parent 7068be9cd5
commit c71bbd8689
1 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tools/testing/tests/fido2.py
View File

@ -73,15 +73,28 @@ def TestCborKeysSorted(cbor_bytes):
l_sorted = l[:] l_sorted = l[:]
l_sorted = sorted(l_sorted, key=cmp_to_key(sort_cbor_keys)) l_sorted = sorted(l_sorted, key=cmp_to_key(sort_cbor_keys))
print("sorted", l_sorted)
print("real", l)
for i in range(0, len(l)): for i in range(0, len(l)):
if l[i] != l_sorted[i]: if l[i] != l_sorted[i]:
print("sorted", l_sorted)
print("real", l)
raise ValueError(f"Cbor list item {i}: {l[i]} is out of order") raise ValueError(f"Cbor list item {i}: {l[i]} is out of order")
return l return l
# hot patch cbor map parsing to test the order of keys in map
_load_map_old = cbor.load_map
def _load_map_new(ai, data):
values, data = _load_map_old(ai, data)
TestCborKeysSorted(values)
return values, data
cbor.load_map = _load_map_new
cbor._DESERIALIZERS[5] = _load_map_new
class FIDO2Tests(Tester): class FIDO2Tests(Tester):
def __init__(self, tester=None): def __init__(self, tester=None):
super().__init__(tester) super().__init__(tester)
@ -281,12 +294,6 @@ class FIDO2Tests(Tester):
print(bytes(info)) print(bytes(info))
print(cbor.loads(bytes(info))) print(cbor.loads(bytes(info)))
with Test("Check map keys are sorted correctly"):
TestCborKeysSorted(bytes(info))
with Test("Check options keys are sorted correctly"):
TestCborKeysSorted(cbor.loads(bytes(info))[0][4])
with Test("Check FIDO2 string is in VERSIONS field"): with Test("Check FIDO2 string is in VERSIONS field"):
assert "FIDO_2_0" in info.versions assert "FIDO_2_0" in info.versions
@ -332,20 +339,6 @@ class FIDO2Tests(Tester):
expectedError=CtapError.ERR.SUCCESS, expectedError=CtapError.ERR.SUCCESS,
) )
with Test("Check response map keys are sorted correctly"):
TestCborKeysSorted(bytes(prev_reg))
with Test("Check attestation statement map keys are sorted correctly"):
att_statement = cbor.loads(bytes(prev_reg))[0][3]
TestCborKeysSorted(att_statement)
with Test("Check COSE KEY dictionary keys are sorted correctly"):
last = 0
data = prev_reg.auth_data.credential_data
c_len = struct.unpack(">H", data[16:18])[0]
cred_id = data[18 : 18 + c_len]
TestCborKeysSorted(data[18 + c_len :])
allow_list = [ allow_list = [
{ {
"id": prev_reg.auth_data.credential_data.credential_id, "id": prev_reg.auth_data.credential_data.credential_id,
@ -688,12 +681,6 @@ class FIDO2Tests(Tester):
expectedError=CtapError.ERR.SUCCESS, expectedError=CtapError.ERR.SUCCESS,
) )
with Test("Check response map keys are sorted correctly"):
TestCborKeysSorted(bytes(prev_auth))
with Test("Check credential map keys are sorted correctly"):
TestCborKeysSorted(cbor.loads(bytes(prev_auth))[0][1])
with Test("Test auth_data is 37 bytes"): with Test("Test auth_data is 37 bytes"):
assert len(prev_auth.auth_data) == 37 assert len(prev_auth.auth_data) == 37
@ -1163,15 +1150,15 @@ class FIDO2Tests(Tester):
self.test_get_info() self.test_get_info()
self.test_get_assertion() self.test_get_assertion()
#
self.test_make_credential() self.test_make_credential()
#
# self.test_rk(None) self.test_rk(None)
#
# self.test_client_pin() self.test_client_pin()
#
# self.testReset() self.testReset()
#
# self.test_extensions() self.test_extensions()
#
# print("Done") print("Done")