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

refactor cbor sorting test

Browse Source
This commit is contained in:
Conor Patrick 2019-04-10 12:47:39 -04:00
parent 5fc8d214fd
commit ffa9ad4923
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ import time
from random import randint from random import randint
import array import array
import struct import struct
from functools import cmp_to_key
from fido2 import cbor from fido2 import cbor
from fido2.ctap import CtapError from fido2.ctap import CtapError
@ -34,6 +35,30 @@ def VerifyAttestation(attest, data):
verifier().verify(attest.att_statement, attest.auth_data, data.hash) verifier().verify(attest.att_statement, attest.auth_data, data.hash)
def TestCborKeysSorted(cbor_bytes):
def sort_cbor_keys(x1, x2):
if isinstance(x1, int) and isinstance(x2, int):
if x1 >= 0 and x2 >= 0:
return x1 > x2
elif x1 < 0 and x2 >= 0:
return x1 > x2
elif x1 >= 0 and x2 < 0:
return x1 < x2
else:
return x1 < x2
last = 0
l = [x for x in cbor.loads(cbor_bytes)[0]]
l_sorted = l[:]
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)):
if l[i] != l_sorted[i]:
raise ValueError("Cbor list item %d: %d is out of order" % (i, l[i]))
return l
class FIDO2Tests(Tester): class FIDO2Tests(Tester):
def __init__(self, tester=None): def __init__(self, tester=None):
super().__init__(tester) super().__init__(tester)
@ -234,11 +259,7 @@ class FIDO2Tests(Tester):
print(cbor.loads(bytes(info))) print(cbor.loads(bytes(info)))
with Test("Check dictionary keys are sorted from lowest to highest"): with Test("Check dictionary keys are sorted from lowest to highest"):
last = 0 TestCborKeysSorted(bytes(info))
for x in cbor.loads(bytes(info))[0]:
print("%d < %d" % (last, x))
assert last < x
last = x
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
@ -287,22 +308,13 @@ class FIDO2Tests(Tester):
with Test("Check response dictionary keys are sorted from lowest to highest"): with Test("Check response dictionary keys are sorted from lowest to highest"):
last = 0 last = 0
for x in cbor.loads(bytes(prev_reg))[0]:
assert last < x
last = x
with Test("Check COSE KEY dictionary keys are sorted from lowest to highest"): with Test("Check COSE KEY dictionary keys are sorted from lowest to highest"):
last = 0 last = 0
data = prev_reg.auth_data.credential_data data = prev_reg.auth_data.credential_data
c_len = struct.unpack(">H", data[16:18])[0] c_len = struct.unpack(">H", data[16:18])[0]
cred_id = data[18 : 18 + c_len] cred_id = data[18 : 18 + c_len]
pub_key, _ = cbor.loads(data[18 + c_len :]) TestCborKeysSorted(data[18 + c_len :])
for x in pub_key:
if x > 0:
assert last < x
else:
assert last > x
last = x
allow_list = [ allow_list = [
{ {
@ -649,9 +661,7 @@ class FIDO2Tests(Tester):
with Test("Check response dictionary keys are sorted from lowest to highest"): with Test("Check response dictionary keys are sorted from lowest to highest"):
last = 0 last = 0
print(cbor.loads(bytes(prev_auth))[0]) print(cbor.loads(bytes(prev_auth))[0])
for x in cbor.loads(bytes(prev_auth))[0]: TestCborKeysSorted(bytes(prev_auth))
assert last < x
last = x
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
@ -1123,7 +1133,7 @@ class FIDO2Tests(Tester):
self.test_get_assertion() self.test_get_assertion()
# #
# self.test_make_credential() self.test_make_credential()
# #
# self.test_rk(None) # self.test_rk(None)
# #