implement and test renew keys

This commit is contained in:
2024-07-16 12:28:47 -05:00
parent 2da3e7a443
commit 533151ebde
4 changed files with 59 additions and 11 deletions

View File

@@ -17,12 +17,16 @@ class CustomerInterface(BaseModel):
assert (attrs_per_key <= 256) assert (attrs_per_key <= 256)
return CustomerInterface( return CustomerInterface(
customer_interface=generate_random_nonrepeating_list(attrs_per_key*numb_keys), customer_interface=generate_random_nonrepeating_list(attrs_per_key * numb_keys),
set_vals=generate_random_nonrepeating_list(attrs_per_key), set_vals=generate_random_nonrepeating_list(attrs_per_key),
numb_keys=numb_keys, numb_keys=numb_keys,
attrs_per_key=attrs_per_key, attrs_per_key=attrs_per_key,
) )
def renew_interface(self):
self.customer_interface = generate_random_nonrepeating_list(self.attrs_per_key * self.numb_keys)
self.set_vals = generate_random_nonrepeating_list(self.attrs_per_key)
def get_interface_by_set(self) -> dict[int, list[int]]: def get_interface_by_set(self) -> dict[int, list[int]]:
interface_by_set = {self.set_vals[set_val]: [] for set_val in self.set_vals} interface_by_set = {self.set_vals[set_val]: [] for set_val in self.set_vals}
for idx, attr_set in enumerate(self.interface): for idx, attr_set in enumerate(self.interface):
@@ -37,11 +41,11 @@ class CustomerInterface(BaseModel):
return secure_fisher_yates_shuffle(list(range(len(self.interface)))) return secure_fisher_yates_shuffle(list(range(len(self.interface))))
def get_attr_set_val(self, attr: int) -> int: def get_attr_set_val(self, attr: int) -> int:
assert(attr in self.customer_interface) assert (attr in self.customer_interface)
attr_idx = self.customer_interface.index(attr) attr_idx = self.customer_interface.index(attr)
set_idx = attr_idx % self.attrs_per_key set_idx = attr_idx % self.attrs_per_key
return self.set_vals[set_idx] return self.set_vals[set_idx]
def get_set_index(self, set_val: int) -> int: def get_set_index(self, set_val: int) -> int:
assert(set_val in self.set_vals) assert (set_val in self.set_vals)
return self.set_vals.index(set_val) return self.set_vals.index(set_val)

View File

@@ -5,6 +5,7 @@ from src.models import EncipheredNKode
from src.user_cipher_keys import UserCipherKeys from src.user_cipher_keys import UserCipherKeys
from src.user_interface import UserInterface from src.user_interface import UserInterface
from src.nkode_interface import CustomerInterface from src.nkode_interface import CustomerInterface
from src.utils import xor_lists
class UserDBModel(BaseModel): class UserDBModel(BaseModel):
@@ -13,9 +14,19 @@ class UserDBModel(BaseModel):
user_keys: UserCipherKeys user_keys: UserCipherKeys
user_interface: UserInterface user_interface: UserInterface
def get_passcode_set_vals(self) -> list[int]: def renew_keys(self, sets_xor: list[int], attrs_xor: list[int]):
pass self.user_keys.renew = True
self.user_keys.set_key = xor_lists(self.user_keys.set_key, sets_xor)
self.user_keys.alpha_key = xor_lists(self.user_keys.alpha_key, attrs_xor)
def refresh_passcode(self, passcode_attr_idx: list[int], customer_interface: CustomerInterface):
self.user_keys = UserCipherKeys.new_user_encipher_keys(
customer_interface.numb_keys,
customer_interface.attrs_per_key,
customer_interface.set_vals
)
self.enciphered_passcode = self.user_keys.encipher_nkode(passcode_attr_idx, customer_interface)
class CustomerDBModel(BaseModel): class CustomerDBModel(BaseModel):
customer_id: UUID customer_id: UUID
@@ -36,19 +47,37 @@ class CustomerDBModel(BaseModel):
set_vals_idx = [self.interface.get_set_index(set_val) for set_val in passcode_set_vals] set_vals_idx = [self.interface.get_set_index(set_val) for set_val in passcode_set_vals]
presumed_selected_attributes = [] presumed_selected_attributes = []
presumed_selected_attributes_idx = []
for idx in range(passcode_len): for idx in range(passcode_len):
key_numb = selected_keys[idx] key_numb = selected_keys[idx]
key_attribute_idxs = user.user_interface.get_key_attr_idxs(key_numb) key_attribute_idxs = user.user_interface.get_key_attr_idxs(key_numb)
set_idx = set_vals_idx[idx] set_idx = set_vals_idx[idx]
selected_attr_idx = key_attribute_idxs[set_idx] selected_attr_idx = key_attribute_idxs[set_idx]
presumed_selected_attributes_idx.append(selected_attr_idx)
presumed_selected_attributes.append(selected_attr_idx) presumed_selected_attributes.append(selected_attr_idx)
enciphered_attr = user.user_keys.encipher_salt_hash_code(presumed_selected_attributes, self.interface) enciphered_attr = user.user_keys.encipher_salt_hash_code(presumed_selected_attributes, self.interface)
if enciphered_attr == user.enciphered_passcode.code: if enciphered_attr != user.enciphered_passcode.code:
return False
if user.user_keys.renew:
user.refresh_passcode(presumed_selected_attributes_idx, self.interface)
return True return True
return False def renew_keys(self) -> bool:
attrs_before = self.interface.customer_interface.copy()
sets_before = self.interface.set_vals.copy()
self.interface.renew_interface()
attrs_after = self.interface.customer_interface
sets_after = self.interface.set_vals
attrs_xor = xor_lists(attrs_after, attrs_before)
set_xor = xor_lists(sets_after, sets_before)
for user in self.users.values():
user.renew_keys(set_xor, attrs_xor)
return True
class SessionCacheModel(BaseModel): class SessionCacheModel(BaseModel):
@@ -166,8 +195,9 @@ class PseudoNKodeAPI(BaseModel):
customer = self.customers[customer_id] customer = self.customers[customer_id]
return customer.valid_key_entry(username, key_selection) return customer.valid_key_entry(username, key_selection)
def renew_keys(self): def renew_keys(self, customer_id: UUID) -> bool:
pass assert (customer_id in self.customers.keys())
return self.customers[customer_id].renew_keys()
def create_new_customer(self, numb_keys: int, numb_sets: int) -> CustomerDBModel: def create_new_customer(self, numb_keys: int, numb_sets: int) -> CustomerDBModel:
new_customer = CustomerDBModel( new_customer = CustomerDBModel(

View File

@@ -16,6 +16,7 @@ class UserCipherKeys(BaseModel):
mask_key: list[int] mask_key: list[int]
salt: bytes salt: bytes
max_nkode_len: int = 10 max_nkode_len: int = 10
renew: bool = False
@staticmethod @staticmethod
def new_user_encipher_keys(numb_of_keys: int, attrs_per_key: int, set_values: list[int]): def new_user_encipher_keys(numb_of_keys: int, attrs_per_key: int, set_values: list[int]):

View File

@@ -10,7 +10,7 @@ def pseudo_nkode_api() -> PseudoNKodeAPI:
@pytest.mark.parametrize("numb_keys,attrs_per_key,user_passcode", [ @pytest.mark.parametrize("numb_keys,attrs_per_key,user_passcode", [
(10, 7, [3, 10, 27, 68]), (10, 7, [3, 10, 27, 68]),
]) ])
def test_create_new_user(pseudo_nkode_api, numb_keys, attrs_per_key, user_passcode): def test_create_new_user_and_renew_keys(pseudo_nkode_api, numb_keys, attrs_per_key, user_passcode):
username = "test_username" username = "test_username"
customer = pseudo_nkode_api.create_new_customer(numb_keys, attrs_per_key) customer = pseudo_nkode_api.create_new_customer(numb_keys, attrs_per_key)
session_id, set_interface = pseudo_nkode_api.generate_index_interface(customer.customer_id) session_id, set_interface = pseudo_nkode_api.generate_index_interface(customer.customer_id)
@@ -32,3 +32,16 @@ def test_create_new_user(pseudo_nkode_api, numb_keys, attrs_per_key, user_passco
login_key_selection = key_selection(login_interface) login_key_selection = key_selection(login_interface)
successful_login = pseudo_nkode_api.login(customer.customer_id, username, login_key_selection) successful_login = pseudo_nkode_api.login(customer.customer_id, username, login_key_selection)
assert successful_login assert successful_login
successful_renew = pseudo_nkode_api.renew_keys(customer.customer_id)
assert successful_renew
login_interface = pseudo_nkode_api.get_login_index_interface(username, customer.customer_id)
login_key_selection = key_selection(login_interface)
successful_login = pseudo_nkode_api.login(customer.customer_id, username, login_key_selection)
assert successful_login
login_interface = pseudo_nkode_api.get_login_index_interface(username, customer.customer_id)
login_key_selection = key_selection(login_interface)
successful_login = pseudo_nkode_api.login(customer.customer_id, username, login_key_selection)
assert successful_login