From 68e6e538bdb42a688dc207c28d6a995ab8f8fa36 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Fri, 19 Sep 2025 18:47:46 +0200 Subject: [PATCH] Fake auth --- Cargo.toml | 1 + src/auth.rs | 20 +++ src/lib.rs | 14 +- src/requests/message.rs | 2 +- src/types.rs | 6 +- src/utils/client.rs | 16 ++- src/utils/database.rs | 31 ++++- test-plugin/Cargo.lock | 281 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 353 insertions(+), 18 deletions(-) create mode 100644 src/auth.rs diff --git a/Cargo.toml b/Cargo.toml index 12fe364..70bbaf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ rusqlite = "0.37.0" serde = { version = "1.0.219", features = ["serde_derive"] } serde_json = "1.0.143" sha1 = "0.10.6" +ureq = "3.1.2" [features] default = [] diff --git a/src/auth.rs b/src/auth.rs new file mode 100644 index 0000000..96d719b --- /dev/null +++ b/src/auth.rs @@ -0,0 +1,20 @@ +use std::sync::Arc; + +use serde::Deserialize; + +use crate::{Server, utils::client::Client}; + +#[derive(Debug, Deserialize)] +struct AuthApiRes { + uuid: u32, +} + +pub fn auth(_server: &Arc, client: &mut Client, token: &str) -> crate::Result { + // let mut res = ureq::get(format!("https://api.voxa.org/server-auth?token={token}")).call()?; + + // let api_res: AuthApiRes = serde_json::from_str(&res.body_mut().read_to_string()?)?; + + client.set_uuid(232); + + Ok(232) +} diff --git a/src/lib.rs b/src/lib.rs index 1f56eed..76dab36 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,7 @@ use std::{ sync::{Arc, Mutex}, }; +pub mod auth; pub mod macros; pub mod requests; pub mod types; @@ -110,7 +111,7 @@ impl Server { fn handle_client(self: &Arc, stream: TcpStream) -> anyhow::Result<()> { Self::LOGGER.info(format!("New connection: {}", stream.peer_addr()?)); // Initialize client - let client = Client::new(stream)?; + let mut client = Client::new(stream)?; // Initialize handshake self.wrap_err( @@ -123,13 +124,14 @@ impl Server { )?; match self.wrap_err(&client, client.read_t::())? { - Some(types::WsMessage::Message(_)) => { - // Do auth stuff + Some(types::WsMessage::Message(types::handshake::ClientDetails { + auth_token, .. + })) => { + let auth_res = auth::auth(self, &mut client, &auth_token); + let uuid = self.wrap_err(&client, auth_res)?; self.wrap_err( &client, - client.send(types::ServerMessage::Authenticated { - user_id: format!(""), - }), + client.send(types::ServerMessage::Authenticated { uuid }), )?; } Some(_) => { diff --git a/src/requests/message.rs b/src/requests/message.rs index e69616e..b6e2f5c 100644 --- a/src/requests/message.rs +++ b/src/requests/message.rs @@ -26,7 +26,7 @@ pub fn send( &client, server.db.insert_message( &channel_id, - "idk", + client.get_uuid()?, &contents, chrono::Utc::now().timestamp(), ), diff --git a/src/types.rs b/src/types.rs index 1b0d26f..73b38b7 100644 --- a/src/types.rs +++ b/src/types.rs @@ -25,7 +25,9 @@ pub enum ClientMessage { #[serde(tag = "type", content = "params", rename_all = "snake_case")] pub enum ServerMessage { /// Successful authentication - Authenticated { user_id: String }, + Authenticated { + uuid: u32, + }, TempMessage { message: String, @@ -82,7 +84,7 @@ pub mod data { pub struct Message { pub id: i64, pub channel_id: String, - pub from: String, + pub from: u32, pub contents: String, pub timestamp: i64, } diff --git a/src/utils/client.rs b/src/utils/client.rs index 9137eab..7d84029 100644 --- a/src/utils/client.rs +++ b/src/utils/client.rs @@ -100,13 +100,13 @@ pub mod handshake { } } -pub struct Client(pub TcpStream); +pub struct Client(TcpStream, Option); impl Client { /// Create a client with no timeouts pub fn new(mut stream: TcpStream) -> crate::Result { handshake::handle_websocket_handshake(&mut stream)?; - Ok(Client(stream)) + Ok(Client(stream, None)) } /// Create a client and set read/write timeouts (useful in prod) @@ -122,7 +122,7 @@ impl Client { stream.set_write_timeout(Some(t))?; } handshake::handle_websocket_handshake(&mut stream)?; - Ok(Client(stream)) + Ok(Client(stream, None)) } /// Send a close frame and flush. `code` is a WebSocket close code (e.g., 1000 normal). @@ -323,11 +323,19 @@ impl Client { pub fn read(&self) -> crate::Result>> { self.read_t() } + + pub fn get_uuid(&self) -> crate::Result { + self.1.ok_or(anyhow!("Invalid UUID")) + } + + pub fn set_uuid(&mut self, uuid: u32) { + self.1 = Some(uuid) + } } impl Clone for Client { fn clone(&self) -> Self { - Client(self.0.try_clone().expect("failed to clone TcpStream")) + Client(self.0.try_clone().expect("failed to clone TcpStream"), None) } } diff --git a/src/utils/database.rs b/src/utils/database.rs index 3e3ca67..4b62b2d 100644 --- a/src/utils/database.rs +++ b/src/utils/database.rs @@ -1,7 +1,7 @@ use crate::{ServerConfig, types::data::Message}; use rusqlite::{Connection, Result, params}; -pub struct Database(pub Connection); +pub struct Database(Connection); // General use case impl Database { @@ -30,13 +30,13 @@ impl Database { pub fn insert_message( &self, channel_id: &str, - user_id: &str, + user_id: u32, contents: &str, timestamp: i64, ) -> Result { self.0.execute( "INSERT INTO chat (channel_id, user_id, contents, timestamp) - VALUES (?1, ?2, ?3, ?4)", + VALUES (?1, ?2, ?3, ?4)", params![channel_id, user_id, contents, timestamp], )?; @@ -45,12 +45,33 @@ impl Database { Ok(Message { id, channel_id: channel_id.to_string(), - from: user_id.to_string(), + from: user_id, contents: contents.to_string(), timestamp, }) } + /// Delete a message from the DB + pub fn delete_message(&self, message_id: usize) -> Result<()> { + self.0 + .execute("DELETE FROM chat WHERE id = ?1;", params![message_id])?; + + Ok(()) + } + + /// Delete a message from the DB + pub fn edit_message(&self, message_id: usize, contents: &str) -> Result<()> { + self.0.execute( + "UPDATE table_name + SET contents = ?2 + WHERE id = ?1; + ", + params![message_id, contents], + )?; + + Ok(()) + } + /// Get a message by its ID pub fn get_message_by_id(&self, message_id: usize) -> Result> { let mut stmt = self.0.prepare( @@ -63,7 +84,7 @@ impl Database { Ok(( row.get::<_, i64>(0)?, // id row.get::<_, String>(1)?, // channel_id - row.get::<_, String>(2)?, // user_id + row.get::<_, u32>(2)?, // user_id row.get::<_, String>(3)?, // contents row.get::<_, i64>(4)?, // timestamp )) diff --git a/test-plugin/Cargo.lock b/test-plugin/Cargo.lock index 679c798..0b37a69 100644 --- a/test-plugin/Cargo.lock +++ b/test-plugin/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -50,6 +56,12 @@ version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + [[package]] name = "cc" version = "1.2.37" @@ -94,6 +106,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -132,6 +153,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" +[[package]] +name = "flate2" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foldhash" version = "0.1.5" @@ -148,6 +185,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + [[package]] name = "hashbrown" version = "0.15.5" @@ -166,6 +214,23 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + [[package]] name = "iana-time-zone" version = "0.1.64" @@ -234,6 +299,15 @@ version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -249,6 +323,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + [[package]] name = "pkg-config" version = "0.3.32" @@ -273,6 +353,20 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "untrusted", + "windows-sys", +] + [[package]] name = "rusqlite" version = "0.37.0" @@ -287,6 +381,50 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rustls" +version = "0.23.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.22" @@ -354,6 +492,12 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" version = "2.0.106" @@ -384,6 +528,48 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537" +dependencies = [ + "base64", + "flate2", + "log", + "percent-encoding", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "ureq-proto", + "utf-8", + "webpki-roots", +] + +[[package]] +name = "ureq-proto" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2" +dependencies = [ + "base64", + "http", + "httparse", + "log", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "vcpkg" version = "0.2.15" @@ -408,8 +594,15 @@ dependencies = [ "serde", "serde_json", "sha1", + "ureq", ] +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + [[package]] name = "wasm-bindgen" version = "0.2.101" @@ -469,6 +662,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "webpki-roots" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "windows-core" version = "0.62.0" @@ -527,3 +729,82 @@ checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ "windows-link", ] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"