dkelly/pynkode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor customer interface to attributes

Browse Source
This commit is contained in:
Donovan
2024-07-19 14:43:15 -05:00
parent 65d78867ca
commit 50dc917a90
11 changed files with 268 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/customer.py
View File

@@ -1,6 +1,6 @@
from uuid import UUID
from pydantic import BaseModel
from src.customer_interface import CustomerInterface
from src.customer_attributes import CustomerAttributes
from src.models import NKodePolicy
from src.user import User
from src.utils import xor_lists
@@ -9,7 +9,7 @@ from src.utils import xor_lists
class Customer(BaseModel):
customer_id: UUID
nkode_policy: NKodePolicy
interface: CustomerInterface
attributes: CustomerAttributes
users: dict[str, User]
def add_new_user(self, user: User):
@@ -17,13 +17,13 @@ class Customer(BaseModel):
def valid_key_entry(self, username, selected_keys) -> bool:
assert (username in self.users.keys())
assert (all(key_idx < self.interface.keypad_size.numb_of_keys for key_idx in selected_keys))
assert (all(key_idx < self.attributes.keypad_size.numb_of_keys for key_idx in selected_keys))
passcode_len = len(selected_keys)
user = self.users[username]
passcode_set_vals = user.user_keys.decipher_mask(
user.enciphered_passcode.mask, self.interface.set_vals, len(selected_keys))
set_vals_idx = [self.interface.get_set_index(set_val) for set_val in passcode_set_vals]
user.enciphered_passcode.mask, self.attributes.set_vals, len(selected_keys))
set_vals_idx = [self.attributes.get_set_index(set_val) for set_val in passcode_set_vals]
presumed_selected_attributes = []
presumed_selected_attributes_idx = []
@@ -36,20 +36,20 @@ class Customer(BaseModel):
presumed_selected_attributes_idx.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.attributes)
if enciphered_attr != user.enciphered_passcode.code:
return False
if user.renew:
user.refresh_passcode(presumed_selected_attributes_idx, self.interface)
user.refresh_passcode(presumed_selected_attributes_idx, self.attributes)
return True
def renew_keys(self) -> bool:
attrs_before = self.interface.attr_vals.copy()
sets_before = self.interface.set_vals.copy()
self.interface.renew_interface()
attrs_after = self.interface.attr_vals
sets_after = self.interface.set_vals
attrs_before = self.attributes.attr_vals.copy()
sets_before = self.attributes.set_vals.copy()
self.attributes.renew()
attrs_after = self.attributes.attr_vals
sets_after = self.attributes.set_vals
attrs_xor = xor_lists(attrs_after, attrs_before)
set_xor = xor_lists(sets_after, sets_before)
@@ -60,7 +60,7 @@ class Customer(BaseModel):
def valid_new_nkode(self, passcode_attr_idx: list[int]) -> bool:
nkode_len = len(passcode_attr_idx)
passcode_set_values = [
self.interface.get_attr_set_val(self.interface.attr_vals[attr_idx]) for attr_idx in passcode_attr_idx
self.attributes.get_attr_set_val(self.attributes.attr_vals[attr_idx]) for attr_idx in passcode_attr_idx
]
distinct_sets = len(set(passcode_set_values))
distinct_attributes = len(set(passcode_attr_idx))