Phase 2: E2EE for DM + Slint migration + dead code cleanup
- E2EE crypto (src/e2ee.rs) with X25519 key derivation from Ed25519, HKDF shared secret, ChaCha20-Poly1305 encrypt/decrypt - E2EE net layer: PID 0x0071-0x0074, JSON payloads, dispatch, session handlers - E2EE UI: lock icons in DM header and sidebar - Slint migration: all .slint files, bridge.rs, update.rs, main.rs - Removed egui UI (~50 files), cleaned all dead code - Clean cargo clippy -- -D warnings
This commit is contained in:
parent
f361b037cb
commit
03d94e0465
83 changed files with 5055 additions and 9202 deletions
|
|
@ -146,6 +146,41 @@ pub async fn handle(pid: u16, payload: &[u8], tx: &mpsc::Sender<NetEvent>) -> Re
|
|||
_ => debug!("unhandled friend event: {}", p.event_type),
|
||||
}
|
||||
}
|
||||
PID_E2EE_DM_KEY_EXCHANGE => {
|
||||
let p: E2eeDmKeyExchangePayload = serde_json::from_slice(payload)?;
|
||||
let _ = tx
|
||||
.send(NetEvent::E2eeDmKeyExchange {
|
||||
dm_id: p.dm_id,
|
||||
e2ee_public_key: p.e2ee_public_key,
|
||||
})
|
||||
.await;
|
||||
}
|
||||
PID_E2EE_DM_KEY_EXCHANGE_ACK => {
|
||||
let p: E2eeDmKeyExchangeAckPayload = serde_json::from_slice(payload)?;
|
||||
let _ = tx
|
||||
.send(NetEvent::E2eeDmKeyExchangeAck { dm_id: p.dm_id })
|
||||
.await;
|
||||
}
|
||||
PID_E2EE_DM_MESSAGE => {
|
||||
let p: E2eeDmMessagePayload = serde_json::from_slice(payload)?;
|
||||
let _ = tx
|
||||
.send(NetEvent::E2eeDmMessage {
|
||||
dm_id: p.dm_id,
|
||||
sender_id: p.sender_id,
|
||||
ciphertext: p.ciphertext,
|
||||
timestamp: p.timestamp,
|
||||
})
|
||||
.await;
|
||||
}
|
||||
PID_E2EE_DM_HISTORY => {
|
||||
let p: E2eeDmHistoryPayload = serde_json::from_slice(payload)?;
|
||||
let _ = tx
|
||||
.send(NetEvent::E2eeDmHistory {
|
||||
dm_id: p.dm_id,
|
||||
messages: p.messages,
|
||||
})
|
||||
.await;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@ pub async fn incoming(pid: u16, payload: &[u8], tx: &mpsc::Sender<NetEvent>) ->
|
|||
| PID_MESSAGE_REACTION_REMOVE
|
||||
| PID_MESSAGE_EDIT
|
||||
| PID_MESSAGE_DELETE
|
||||
| PID_FRIEND_EVENT => dm::handle(pid, payload, tx).await?,
|
||||
| PID_FRIEND_EVENT
|
||||
| PID_E2EE_DM_KEY_EXCHANGE
|
||||
| PID_E2EE_DM_KEY_EXCHANGE_ACK
|
||||
| PID_E2EE_DM_MESSAGE
|
||||
| PID_E2EE_DM_HISTORY => dm::handle(pid, payload, tx).await?,
|
||||
|
||||
PID_GUILD_LIST
|
||||
| PID_GUILD_CREATE
|
||||
|
|
|
|||
|
|
@ -1,5 +1,34 @@
|
|||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct E2eeDmKeyExchangePayload {
|
||||
pub dm_id: String,
|
||||
pub e2ee_public_key: Vec<u8>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct E2eeDmKeyExchangeAckPayload {
|
||||
pub dm_id: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct E2eeDmMessagePayload {
|
||||
pub dm_id: String,
|
||||
pub sender_id: String,
|
||||
#[serde(with = "serde_bytes")]
|
||||
pub ciphertext: Vec<u8>,
|
||||
pub timestamp: i64,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct E2eeDmHistoryPayload {
|
||||
pub dm_id: String,
|
||||
#[serde(default)]
|
||||
pub messages: Vec<E2eeDmMessagePayload>,
|
||||
#[serde(default)]
|
||||
pub limit: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct DmStartPayload {
|
||||
pub target_user_id: String,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ pub const PID_MESSAGE_DELETE: u16 = 0x0069;
|
|||
pub const PID_READ_RECEIPT: u16 = 0x0064;
|
||||
pub const PID_READ_RECEIPT_BROADCAST: u16 = 0x0065;
|
||||
pub const PID_TYPING_START: u16 = 0x0070;
|
||||
pub const PID_E2EE_DM_KEY_EXCHANGE: u16 = 0x0071;
|
||||
pub const PID_E2EE_DM_KEY_EXCHANGE_ACK: u16 = 0x0072;
|
||||
pub const PID_E2EE_DM_MESSAGE: u16 = 0x0073;
|
||||
pub const PID_E2EE_DM_HISTORY: u16 = 0x0074;
|
||||
pub const PID_GUILD_CREATE: u16 = 0x0100;
|
||||
pub const PID_GUILD_DELETE: u16 = 0x0101;
|
||||
pub const PID_GUILD_LIST: u16 = 0x0102;
|
||||
|
|
|
|||
|
|
@ -140,6 +140,53 @@ pub async fn handle_cmd(
|
|||
})?;
|
||||
framing::io::write_encrypted(stream, PID_DM_HISTORY, seq, &payload, crypto).await?;
|
||||
}
|
||||
NetCommand::E2eeDmKeyExchange {
|
||||
dm_id,
|
||||
e2ee_public_key,
|
||||
} => {
|
||||
let payload = serde_json::to_vec(&E2eeDmKeyExchangePayload {
|
||||
dm_id,
|
||||
e2ee_public_key,
|
||||
})?;
|
||||
framing::io::write_encrypted(stream, PID_E2EE_DM_KEY_EXCHANGE, seq, &payload, crypto)
|
||||
.await?;
|
||||
}
|
||||
NetCommand::E2eeDmKeyExchangeAck { dm_id } => {
|
||||
let payload = serde_json::to_vec(&E2eeDmKeyExchangeAckPayload { dm_id })?;
|
||||
framing::io::write_encrypted(
|
||||
stream,
|
||||
PID_E2EE_DM_KEY_EXCHANGE_ACK,
|
||||
seq,
|
||||
&payload,
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
NetCommand::E2eeDmSend { dm_id, ciphertext } => {
|
||||
let msg = E2eeDmMessagePayload {
|
||||
dm_id,
|
||||
sender_id: identity.pubkey_hex.clone(),
|
||||
ciphertext,
|
||||
timestamp: now_ms(),
|
||||
};
|
||||
framing::io::write_encrypted(
|
||||
stream,
|
||||
PID_E2EE_DM_MESSAGE,
|
||||
seq,
|
||||
&serde_json::to_vec(&msg)?,
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
NetCommand::E2eeDmHistory { dm_id, limit } => {
|
||||
let payload = serde_json::to_vec(&E2eeDmHistoryPayload {
|
||||
dm_id,
|
||||
messages: vec![],
|
||||
limit,
|
||||
})?;
|
||||
framing::io::write_encrypted(stream, PID_E2EE_DM_HISTORY, seq, &payload, crypto)
|
||||
.await?;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -158,5 +158,20 @@ pub enum NetCommand {
|
|||
channel_id: String,
|
||||
message_id: String,
|
||||
},
|
||||
E2eeDmKeyExchange {
|
||||
dm_id: String,
|
||||
e2ee_public_key: Vec<u8>,
|
||||
},
|
||||
E2eeDmKeyExchangeAck {
|
||||
dm_id: String,
|
||||
},
|
||||
E2eeDmSend {
|
||||
dm_id: String,
|
||||
ciphertext: Vec<u8>,
|
||||
},
|
||||
E2eeDmHistory {
|
||||
dm_id: String,
|
||||
limit: Option<i64>,
|
||||
},
|
||||
Disconnect,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -224,4 +224,21 @@ pub enum NetEvent {
|
|||
channel_id: String,
|
||||
message_id: String,
|
||||
},
|
||||
E2eeDmKeyExchange {
|
||||
dm_id: String,
|
||||
e2ee_public_key: Vec<u8>,
|
||||
},
|
||||
E2eeDmKeyExchangeAck {
|
||||
dm_id: String,
|
||||
},
|
||||
E2eeDmMessage {
|
||||
dm_id: String,
|
||||
sender_id: String,
|
||||
ciphertext: Vec<u8>,
|
||||
timestamp: i64,
|
||||
},
|
||||
E2eeDmHistory {
|
||||
dm_id: String,
|
||||
messages: Vec<crate::net::payloads::E2eeDmMessagePayload>,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue