dkelly/nkode-protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement most of client app

Browse Source
This commit is contained in:
Donovan
2025-12-18 19:11:08 -06:00
parent 88656fefac
commit 05ba550a18
11 changed files with 120 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/client/app.rs
View File

@@ -1,7 +1,9 @@
use async_trait::async_trait;
use std::collections::HashMap;
use crate::client::client_auth_api::ClientAuth;
use crate::client::opaque::{ServerConnectionLogin, ServerConnectionRegister};
use crate::shared::models::app::AuthAPI;
use crate::client::repo::ClientRepo;
use crate::client::states::{KeyRegister, UserStateCodeLogin, UserStateCodeRegister, UserStateKey};
use crate::shared::models::app::{Icon, IconID};
use crate::shared::email::Email;
use crate::shared::opaque::UserSecretKey;
use crate::shared::user_api::UserAPI;
@@ -15,34 +17,54 @@ where
{
auth_api: ClientAuth<'a, R, U>,
client_repo: C,
new_user: HashMap<Email, UserStateCodeRegister>,
user_login: HashMap<Email, UserStateCodeLogin>
}
impl <'a, R, U, C>ClientApp<'a, R, U, C>
where
R: ServerConnectionRegister + ServerConnectionLogin,
U: UserAPI,
C: ClientRepo
C: ClientRepo,
{
fn new(auth_api: ClientAuth<'a, R, U>, client_repo: C) -> Self {
pub fn new(auth_api: ClientAuth<'a, R, U>, client_repo: C) -> Self {
Self {
auth_api,
client_repo
client_repo,
new_user: HashMap::new(),
user_login: HashMap::new()
}
}
async fn new_user(&self, email: Email) -> Result<UserSecretKey, String> {
let secret_key = UserSecretKey::new();
async fn new_user(&mut self, email: Email, secret_key: UserSecretKey) -> Result<Vec<Icon>, String> {
let key_register = UserStateKey::<KeyRegister>::new(email.clone(), secret_key.clone());
self.client_repo.add_secret_key(email.clone(), secret_key.clone()).await?;
if let Err(_) = self.auth_api.register_key(&email, &secret_key).await {
let key_login = match key_register.register(&self.auth_api).await.map_err(|e| format!("error: {e:?}")) {
Ok(s) => {s}
Err(e) => {
self.client_repo.remove_secret_key(&email).await.expect("couldn't delete");
return Err(format!("error registering key {}", e))
}
Ok(secret_key)
};
let key_logged_in = key_login.login(&self.auth_api).await.map_err(|e| format!("error: {e:?}"))?;
let code_register = key_logged_in.register_code(&self.auth_api).await?;
let icons = code_register.get_icons();
self.new_user.insert(email, code_register);
Ok(icons)
}
async fn new_user_register_code(&mut self, email: Email, selected_icons: Vec<IconID>) -> Result<Vec<Vec<Icon>>, String> {
let code_register = self.new_user.remove(&email).unwrap(); // Todo should be an error
let code_login = code_register.register(&self.auth_api,selected_icons).await?;
let keypad = code_login.get_keypad().await;
self.user_login.insert(email, code_login);
Ok(keypad)
}
#[async_trait]
trait ClientRepo {
async fn add_secret_key(&self, email: Email, user_secret_key: UserSecretKey) -> Result<(), String>;
async fn remove_secret_key(&self, email: &Email) -> Result<(), String>;
async fn user_login(&mut self, email: Email, selected_keys: &Vec<usize>) -> Result<(), String> {
let mut code_login = self.user_login.remove(&email).unwrap(); // Todo should be an error
let code_logged_in = code_login.login(&self.auth_api, &selected_keys).await?;
self.client_repo.add_code_logged_in(&email, code_logged_in).await?;
Ok(())
}
}

9
src/client/client_auth_api.rs
View File

@@ -3,6 +3,7 @@ use crate::shared::email::Email;
use crate::shared::opaque::UserSecretKey;
use anyhow::Result;
use async_trait::async_trait;
use nkode_rs::nkode_core::keypad::Keypad;
use nkode_rs::nkode_core::policy::{NKodePolicy, DEFAULT_POLICY};
use crate::client::opaque::{OpaqueAuthData, OpaqueAuth, ServerConnectionLogin, ServerConnectionRegister};
use crate::shared::signed_session_data::SignedSessionData;
@@ -48,8 +49,14 @@ where
Ok(KeyLoggedInSession(session))
}
async fn login_code(&self, email: &Email, passcode: &[u64]) -> Result<CodeLoggedInSession, String> {
async fn login_code(&self, email: &Email, passcode: &[u64], key_login_session: &KeyLoggedInSession, keypad: Keypad) -> Result<CodeLoggedInSession, String> {
let auth_data = OpaqueAuthData::from_code(email.as_str(), passcode);
let signed_session = SignedSessionData::new(
key_login_session.0.session_id,
keypad,
&key_login_session.0.session_key
).map_err(|e| format!("error: {e:?}"))?;
self.user_api.update_keypad(signed_session).await?;
let session = self.opaque_code_login.login(&auth_data).await.map_err(|e| format!("error: {}", e))?;
Ok(CodeLoggedInSession(session))
}

7
src/client/mod.rs
View File

@@ -1,4 +1,5 @@
mod client_auth_api;
pub mod client_auth_api;
pub mod opaque;
mod states;
mod app;
pub mod states;
pub mod app;
mod repo;

11
src/client/repo.rs Normal file
View File

@@ -0,0 +1,11 @@
use async_trait::async_trait;
use crate::shared::email::Email;
use crate::shared::models::app::CodeLoggedInSession;
use crate::shared::opaque::UserSecretKey;
#[async_trait]
pub trait ClientRepo {
async fn add_secret_key(&self, email: Email, user_secret_key: UserSecretKey) -> Result<(), String>;
async fn remove_secret_key(&self, email: &Email) -> Result<(), String>;
async fn add_code_logged_in(&self, email: &Email, login_session: CodeLoggedInSession) -> Result<(), String>;
}

95
src/client/states.rs
View File

@@ -7,22 +7,27 @@ use crate::shared::models::app::{AuthAPI, CodeLoggedInSession, CodeLoginData, Ic
use crate::shared::email::Email;
use crate::shared::opaque::UserSecretKey;
struct KeyLogin;
pub struct KeyLogin;
pub struct KeyRegister;
struct KeyRegister;
pub struct UserStateKey<State, S: AuthAPI> {
api: S,
pub struct UserStateKey<State> {
email: Email,
user_secret_key: UserSecretKey,
_state: PhantomData<State>
}
impl <S: AuthAPI> UserStateKey<KeyRegister,S> {
pub async fn register(self) -> Result<UserStateKey<KeyLogin, S>, String> {
self.api.register_key(&self.email, &self.user_secret_key).await?;
impl<State> UserStateKey<State> {
pub fn new(email: Email, user_secret_key: UserSecretKey) -> Self {
Self {
email,
user_secret_key,
_state: PhantomData
}
}
pub async fn register(self, api: &dyn AuthAPI ) -> Result<UserStateKey<KeyLogin>, String> {
api.register_key(&self.email, &self.user_secret_key).await?;
Ok(UserStateKey {
api: self.api,
email: self.email,
user_secret_key: self.user_secret_key,
_state: PhantomData::<KeyLogin>,
@@ -30,11 +35,10 @@ impl <S: AuthAPI> UserStateKey<KeyRegister,S> {
}
}
impl <S: AuthAPI> UserStateKey<KeyLogin,S> {
pub async fn login(self) -> Result<UserStateKeyLoggedIn<S>,String> {
let key_login = self.api.login_key(&self.email, &self.user_secret_key).await?;
impl UserStateKey<KeyLogin> {
pub async fn login(self, api: &dyn AuthAPI) -> Result<UserStateKeyLoggedIn,String> {
let key_login = api.login_key(&self.email, &self.user_secret_key).await?;
Ok(UserStateKeyLoggedIn {
api: self.api,
email: self.email,
user_secret_key: self.user_secret_key,
key_login
@@ -42,33 +46,29 @@ impl <S: AuthAPI> UserStateKey<KeyLogin,S> {
}
}
pub struct UserStateKeyLoggedIn<S: AuthAPI> {
api: S,
pub struct UserStateKeyLoggedIn {
email: Email,
user_secret_key: UserSecretKey,
key_login: KeyLoggedInSession,
}
impl <S: AuthAPI> UserStateKeyLoggedIn<S> {
pub async fn register_code(self) -> Result<UserStateCodeRegister<S>, String> {
impl UserStateKeyLoggedIn {
pub async fn register_code(self, api: &dyn AuthAPI) -> Result<UserStateCodeRegister, String> {
let icon_nonce = Nonce::new();
let icons = self.get_icons(&icon_nonce).await?;
let policy = self.api.get_policy().await?;
let icons = self.get_icons(api, &icon_nonce).await?;
Ok(UserStateCodeRegister {
api: self.api,
email: self.email,
user_secret_key: self.user_secret_key,
key_login: self.key_login,
icons,
icon_nonce,
keypad: Keypad::new(policy),
})
}
async fn get_icons(&self, icon_nonce: &Nonce) -> Result<Vec<Icon>, String> {
async fn get_icons(&self, api: &dyn AuthAPI, icon_nonce: &Nonce) -> Result<Vec<Icon>, String> {
let chacha20_key = self.user_secret_key.chacha20_secret_key();
let mut chacha_cipher = nkode_rs::nkode_core::chacha20prng::ChaCha20PRNG::new(&chacha20_key, icon_nonce);
let mut icons = self.api.get_new_icons().await?;
let mut icons = api.get_new_icons().await?;
for icon in &mut icons {
let bytes = chacha_cipher.read_u8(ICON_ID_SIZE)?;
let new_id = IconID::from_bytes(bytes.as_slice()).unwrap();
@@ -77,38 +77,37 @@ impl <S: AuthAPI> UserStateKeyLoggedIn<S> {
Ok(icons)
}
pub async fn login_code(self) -> Result<UserStateCodeLogin<S>, String> {
let login_data = self.api.get_login_data(&self.key_login).await?;
let icons = self.get_icons(&login_data.icon_nonce()).await?;
let policy = self.api.get_policy().await?;
pub async fn login_code(self, api: &dyn AuthAPI) -> Result<UserStateCodeLogin, String> {
let login_data = api.get_login_data(&self.key_login).await?;
let icons = self.get_icons(api, &login_data.icon_nonce()).await?;
let policy = api.get_policy().await?;
let nkode_secret_key = self.user_secret_key.chacha20_secret_key();
let cipher = NKodeCipher::from_nonce(policy, &nkode_secret_key, login_data.icon_nonce())?;
Ok(
UserStateCodeLogin {
api: self.api,
email: self.email,
mask: login_data.mask,
icons,
keypad: login_data.keypad,
cipher,
key_login: self.key_login
}
)
}
}
pub struct UserStateCodeRegister<S: AuthAPI> {
api: S,
pub struct UserStateCodeRegister {
email: Email,
user_secret_key: UserSecretKey,
key_login: KeyLoggedInSession,
icon_nonce: Nonce,
icons: Vec<Icon>,
keypad: Keypad,
}
impl <S: AuthAPI> UserStateCodeRegister<S> {
pub async fn register(self, selected_icons: Vec<IconID>) -> Result<UserStateCodeLogin<S>, String> {
let policy = self.api.get_policy().await?;
impl UserStateCodeRegister {
pub async fn register(self, api: &dyn AuthAPI, selected_icons: Vec<IconID>) -> Result<UserStateCodeLogin, String>
{
let policy = api.get_policy().await?;
let keypad = Keypad::new(policy.clone());
let secret_key = self.user_secret_key.chacha20_secret_key();
let (cipher, cipher_nonce) = NKodeCipher::new(policy, &secret_key);
@@ -123,28 +122,32 @@ impl <S: AuthAPI> UserStateCodeRegister<S> {
icon_nonce: self.icon_nonce,
keypad,
};
self.api.register_code(&self.email, &ciphered_nkode.passcode, &self.key_login, data.clone()).await?;
api.register_code(&self.email, &ciphered_nkode.passcode, &self.key_login, data.clone()).await?;
Ok(UserStateCodeLogin {
api: self.api,
mask: data.mask,
email: self.email,
keypad: data.keypad,
cipher,
icons: self.icons
icons: self.icons,
key_login: self.key_login
})
}
pub fn get_icons(&self) -> Vec<Icon> {
self.icons.clone()
}
}
pub struct UserStateCodeLogin<S: AuthAPI> {
api: S,
pub struct UserStateCodeLogin {
email: Email,
mask: Vec<u64>,
icons: Vec<Icon>,
keypad: Keypad,
cipher: NKodeCipher
cipher: NKodeCipher,
key_login: KeyLoggedInSession,
}
impl <S: AuthAPI> UserStateCodeLogin<S> {
impl UserStateCodeLogin {
pub fn sort_icons(&self) -> Vec<Icon> {
nkode_rs::tensor::reorder(
&self.icons,
@@ -152,8 +155,14 @@ impl <S: AuthAPI> UserStateCodeLogin<S> {
).unwrap().to_vec()
}
pub async fn login(&self, selected_keys: &Vec<usize>) -> Result<CodeLoggedInSession, String> {
pub async fn login(&mut self, api: &dyn AuthAPI, selected_keys: &Vec<usize>) -> Result<CodeLoggedInSession, String> {
let passcode = self.cipher.decipher(selected_keys, self.keypad.indices(), &self.mask).map_err(|e| format!("invalid keys: {e}"))?;
self.api.login_code(&self.email, &passcode).await
self.keypad.login_shuffle();
api.login_code(&self.email, &passcode,&self.key_login ,self.keypad.clone()).await?;
todo!()
}
pub async fn get_keypad(&self) -> Vec<Vec<Icon>> {
todo!()
}
}

2
src/server/app.rs
View File

@@ -5,7 +5,7 @@ use opaque_ke::argon2::password_hash::rand_core::OsRng;
use nkode_rs::from_bytes::FromBytes;
use crate::server::models::CredKind;
use crate::server::repository::opaque_repo::{AuthRepoError, OpaqueDatabaseRepo, OpaqueSessionRepo};
use crate::server::repository::UserRepo::UserRepo;
use crate::server::repository::user_repo::UserRepo;
use crate::shared::models::app::{CodeLoggedInSession, CodeLoginData, KeyLoggedInSession, LoggedInSession};
use crate::shared::email::Email;
use crate::shared::opaque::{NKodeCipherSuite, NKodeServerSetup, OpaqueLoginSession, OpaqueRegisterSession, OpaqueSessionKey, PasswordFile};

2
src/server/repository/in_memory/in_memory_user_db.rs
View File

@@ -3,7 +3,7 @@ use std::sync::Arc;
use async_trait::async_trait;
use tokio::sync::Mutex;
use uuid::Uuid;
use crate::server::repository::UserRepo::UserRepo;
use crate::server::repository::user_repo::UserRepo;
use crate::shared::models::app::{CodeLoggedInSession, CodeLoginData, KeyLoggedInSession};
use crate::shared::email::Email;

2
src/server/repository/mod.rs
View File

@@ -1,3 +1,3 @@
pub mod in_memory;
pub mod opaque_repo;
pub mod UserRepo;
pub mod user_repo;

0
src/server/repository/UserRepo.rs → src/server/repository/user_repo.rs
View File

2
src/shared/models/app.rs
View File

@@ -62,7 +62,7 @@ pub trait AuthAPI {
async fn register_key(&self, email: &Email, secret_key: &UserSecretKey) -> Result<(), String>;
async fn register_code(&self, email: &Email, passcode: &[u64], key_login_session: &KeyLoggedInSession, data: CodeLoginData) -> Result<(), String>;
async fn login_key(&self, email: &Email, secret_key: &UserSecretKey) -> Result<KeyLoggedInSession, String>;
async fn login_code(&self, email: &Email, passcode: &[u64]) -> Result<CodeLoggedInSession, String>;
async fn login_code(&self, email: &Email, passcode: &[u64], key_login_session: &KeyLoggedInSession, keypad: Keypad) -> Result<CodeLoggedInSession, String>;
async fn get_new_icons(&self) -> Result<Vec<Icon>, String>;
async fn get_login_data(&self, key_login_session: &KeyLoggedInSession) -> Result<CodeLoginData, String>;

2
src/shared/user_api.rs
View File

@@ -1,4 +1,5 @@
use async_trait::async_trait;
use nkode_rs::nkode_core::keypad::Keypad;
use crate::shared::email::Email;
use crate::shared::models::app::{CodeLoginData, Icon};
use crate::shared::signed_session_data::SignedSessionData;
@@ -10,4 +11,5 @@ pub trait UserAPI: Sync + Send {
async fn get_login_data(&self, session: SignedSessionData<Email>) -> Result<CodeLoginData, String>;
async fn is_code_registered(&self, session: SignedSessionData<Email>) -> Result<bool, String>;
async fn set_code_login_data(&self, session: SignedSessionData<CodeLoginData>) -> Result<(), String>;
async fn update_keypad(&self, keypad: SignedSessionData<Keypad>) -> Result<(), String>;
}