tensamin/omikron
Watch
6
0
Fork
You've already forked omikron
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

[Add] New client identification

Browse source
This commit is contained in:
Alex Emmet 2026-04-05 23:37:33 +02:00
commit 6939615b47
2 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3133,7 +3133,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "ttp-core" name = "ttp-core"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.methanium.net/Tensamin/TTP.git#778f6d14c73e7eab45fc620f8daa095eea296840" source = "git+https://git.methanium.net/Tensamin/TTP.git#bacbcb0e38791cf1a38cf5851beb20d5645002ba"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"byteorder", "byteorder",
@ -3145,7 +3145,7 @@ dependencies = [
[[package]] [[package]]
name = "ttp-native" name = "ttp-native"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.methanium.net/Tensamin/TTP.git#778f6d14c73e7eab45fc620f8daa095eea296840" source = "git+https://git.methanium.net/Tensamin/TTP.git#bacbcb0e38791cf1a38cf5851beb20d5645002ba"
dependencies = [ dependencies = [
"quinn", "quinn",
"rustls", "rustls",

33
src/rho/connection.rs
View file

@ -35,6 +35,7 @@ pub struct GeneralConnection {
identified: Arc<RwLock<bool>>, identified: Arc<RwLock<bool>>,
challenged: Arc<RwLock<bool>>, challenged: Arc<RwLock<bool>>,
challenge: Arc<RwLock<String>>, challenge: Arc<RwLock<String>>,
challenge_cv_id: Arc<RwLock<u32>>,
connection_kind: Arc<RwLock<Option<ConnectionKind>>>, connection_kind: Arc<RwLock<Option<ConnectionKind>>>,
pub rho_connection: Arc<RwLock<Option<Arc<RhoConnection>>>>, pub rho_connection: Arc<RwLock<Option<Arc<RhoConnection>>>>,
@ -51,6 +52,7 @@ impl GeneralConnection {
identified: Arc::new(RwLock::new(false)), identified: Arc::new(RwLock::new(false)),
challenged: Arc::new(RwLock::new(false)), challenged: Arc::new(RwLock::new(false)),
challenge: Arc::new(RwLock::new(String::new())), challenge: Arc::new(RwLock::new(String::new())),
challenge_cv_id: Arc::new(RwLock::new(0)),
connection_kind: Arc::new(RwLock::new(None)), connection_kind: Arc::new(RwLock::new(None)),
rho_connection: Arc::new(RwLock::new(None)), rho_connection: Arc::new(RwLock::new(None)),
id: Arc::new(RwLock::new(0)), id: Arc::new(RwLock::new(0)),
@ -232,15 +234,7 @@ impl GeneralConnection {
if *response == expected { if *response == expected {
*self.challenged.write().await = true; *self.challenged.write().await = true;
*self.challenge_cv_id.write().await = cv.get_id();
let response = CommunicationValue::new(CommunicationType::identification_response)
.with_id(cv.get_id())
.add_data(DataTypes::accepted, DataValue::Bool(true));
log_cv_out!(response);
if let Err(_) = self.sender.send(&response).await {
return;
}
} else { } else {
log_err!( log_err!(
id, id,
@ -306,6 +300,27 @@ impl GeneralConnection {
if let Some(rho_conn) = rho { if let Some(rho_conn) = rho {
rho_conn.bind_user_id(user_id).await; rho_conn.bind_user_id(user_id).await;
rho_conn.add_client_connection(client.clone()).await; rho_conn.add_client_connection(client.clone()).await;
let session_id = *self.session_id.read().await as i64;
let iota_msg = CommunicationValue::new(CommunicationType::client_connected)
.add_data(DataTypes::user_id, DataValue::Number(user_id))
.add_data(DataTypes::session_id, DataValue::Number(session_id));
if let Ok(resp) = rho_conn
.get_iota_connection()
.clone()
.await_response(&iota_msg, Some(Duration::from_secs(20)))
.await
{
let mut ident_resp =
CommunicationValue::new(CommunicationType::identification_response)
.with_id(*self.challenge_cv_id.read().await);
for (k, v) in resp.get_data_container() {
ident_resp = ident_resp.add_data(k.clone(), v.clone());
}
log_cv_out!(ident_resp);
let _ = self.sender.send(&ident_resp).await;
}
} else { } else {
log_err!( log_err!(
user_id, user_id,