Send message
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
use crate::data::messages::{MessageData, StoredMessage};
|
||||
use crate::server::Server;
|
||||
use axum::extract::ws::WebSocket;
|
||||
use ed25519_dalek::{Signature, Verifier, VerifyingKey};
|
||||
use std::sync::Arc;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
pub async fn send_message(
|
||||
server: &Arc<Server>,
|
||||
verifying_key: VerifyingKey,
|
||||
socket: &Arc<Mutex<WebSocket>>,
|
||||
message: MessageData,
|
||||
channel_id: String,
|
||||
) -> anyhow::Result<()> {
|
||||
let server_timestamp = SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() as u64;
|
||||
|
||||
if server_timestamp.saturating_sub(message.timestamp) > 2000 {
|
||||
anyhow::bail!(
|
||||
"Message timestamp out of range ({server_timestamp} - {}) < 2000",
|
||||
message.timestamp
|
||||
);
|
||||
}
|
||||
|
||||
let server_pubkey_string = crate::signature::to_string(&server.key.verifying_key());
|
||||
let signed_string = format!(
|
||||
"{}@{}@{}",
|
||||
message.timestamp, server_pubkey_string, message.content
|
||||
);
|
||||
|
||||
let signature = crate::signature::from_string_sig(&message.signature)
|
||||
.map_err(|_| anyhow::anyhow!("Invalid signature encoding"))?;
|
||||
|
||||
verifying_key
|
||||
.verify(signed_string.as_bytes(), &signature)
|
||||
.map_err(|_| anyhow::anyhow!("Signature verification failed"))?;
|
||||
|
||||
let stored = StoredMessage {
|
||||
id: uuid::Uuid::new_v4().to_string(),
|
||||
author: crate::signature::to_string(&verifying_key),
|
||||
data: message,
|
||||
};
|
||||
|
||||
server.message_store.insert_message(&channel_id, &stored)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
+17
-2
@@ -1,12 +1,14 @@
|
||||
use std::{borrow::Cow, sync::Arc};
|
||||
|
||||
use axum::extract::ws::{Message, Utf8Bytes, WebSocket};
|
||||
use ed25519_dalek::VerifyingKey;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
use crate::types::ClientMeta;
|
||||
use crate::{server::Server, types::ClientMeta};
|
||||
|
||||
pub mod initialize;
|
||||
pub mod message;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
#[serde(tag = "method")]
|
||||
@@ -35,6 +37,11 @@ pub enum ServerMethod {
|
||||
hostname: String,
|
||||
},
|
||||
|
||||
SendMessage {
|
||||
channel_id: String,
|
||||
data: crate::data::messages::MessageData,
|
||||
},
|
||||
|
||||
Meta(ClientMeta),
|
||||
|
||||
Error {
|
||||
@@ -42,7 +49,11 @@ pub enum ServerMethod {
|
||||
},
|
||||
}
|
||||
|
||||
pub async fn read_loop(socket: &Arc<Mutex<WebSocket>>) -> anyhow::Result<()> {
|
||||
pub async fn read_loop(
|
||||
server: &Arc<Server>,
|
||||
verifying_key: VerifyingKey,
|
||||
socket: &Arc<Mutex<WebSocket>>,
|
||||
) -> anyhow::Result<()> {
|
||||
while let Some(message) = read_socket(&mut *socket.lock().await).await? {
|
||||
match message {
|
||||
ServerMethod::Initialize { .. } => {
|
||||
@@ -61,6 +72,10 @@ pub async fn read_loop(socket: &Arc<Mutex<WebSocket>>) -> anyhow::Result<()> {
|
||||
ServerMethod::Error { error } => {
|
||||
eprintln!("Client error: {error}");
|
||||
}
|
||||
|
||||
ServerMethod::SendMessage { channel_id, data } => {
|
||||
message::send_message(server, verifying_key, socket, data, channel_id).await?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user