From 4732867ffa8041a3406dade3ae3ad32cf95f0a0c Mon Sep 17 00:00:00 2001 From: salmonik Date: Sat, 28 Feb 2026 19:19:28 +0100 Subject: add authentication barebone --- src/bin/server/database.rs | 31 +++++++++++++++++++++++++ src/bin/server/handler.rs | 57 ++++++++++++++++++++++++++++++++++++++++++---- src/bin/server/main.rs | 1 + src/bin/server/mod.rs | 1 + 4 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 src/bin/server/database.rs (limited to 'src/bin/server') diff --git a/src/bin/server/database.rs b/src/bin/server/database.rs new file mode 100644 index 0000000..9c51997 --- /dev/null +++ b/src/bin/server/database.rs @@ -0,0 +1,31 @@ +use rusqlite::Connection; + +pub fn init_db() -> Connection { + let conn = Connection::open("server.db").unwrap(); + conn.execute( + "CREATE TABLE IF NOT EXISTS users ( + username TEXT PRIMARY KEY, + hashed_password TEXT NOT NULL + )", + [], + ).unwrap(); + conn +} + +pub fn add_user(conn: &Connection, username: &str, hashed_password: &str) -> Result<(), Box> { + conn.execute( + "INSERT INTO users (username, hashed_password) VALUES (?1, ?2)", + [username, hashed_password], + )?; + Ok(()) +} + +pub fn get_hashed_password(conn: &Connection, username: &str) -> Option { + let mut stmt = conn.prepare("SELECT hashed_password FROM users WHERE username = ?1").unwrap(); + let mut rows = stmt.query([username]).unwrap(); + if let Ok(Some(row)) = rows.next() { + row.get(0).ok() + } else { + None + } +} diff --git a/src/bin/server/handler.rs b/src/bin/server/handler.rs index 906a91f..2132d09 100644 --- a/src/bin/server/handler.rs +++ b/src/bin/server/handler.rs @@ -1,15 +1,64 @@ use std::io::{BufRead, BufReader, Write}; use std::net::TcpStream; +use std::sync::Mutex; +use once_cell::sync::Lazy; +use rusqlite::Connection; +use crate::database; + +static DB_CONN: Lazy> = Lazy::new(|| Mutex::new(database::init_db())); pub fn handle_client(stream: TcpStream) { - println!("Client connected"); + let client_addr = stream.peer_addr().unwrap().to_string(); + let mut user = "guest".to_string(); + println!("[{} @ {}] Client connected", user, client_addr); let reader_stream = stream.try_clone().unwrap(); let reader = BufReader::new(reader_stream); let mut writer = stream; for line in reader.lines() { let line = line.unwrap(); - println!("Received: {}", line); - writeln!(writer, "{}", line).unwrap(); + println!("[{} @ {}] Received: {}", user, client_addr, line); + let response = process_message(&line, &mut user); + writeln!(writer, "{}", response).unwrap(); + } + println!("[{} @ {}] Client disconnected", user, client_addr); +} + +fn process_message(msg: &str, user: &mut String) -> String { + let parts: Vec<&str> = msg.splitn(3, ' ').collect(); + match parts[0] { + "REGISTER" => { + if parts.len() != 3 { + "FAIL Invalid REGISTER format".to_string() + } else { + let username = parts[1]; + let hashed_pass = parts[2]; + let db = DB_CONN.lock().unwrap(); + match database::add_user(&db, username, hashed_pass) { + Ok(_) => format!("OK Registered {}", username), + Err(_) => "FAIL User already exists".to_string(), + } + } + } + "AUTH" => { + if parts.len() != 3 { + "FAIL Invalid AUTH format".to_string() + } else { + let username = parts[1]; + let provided_hash = parts[2]; + let db = DB_CONN.lock().unwrap(); + if let Some(stored_hash) = database::get_hashed_password(&db, username) { + if provided_hash == stored_hash { + *user = username.to_string(); + format!("OK {}", username) + } else { + "FAIL Invalid credentials".to_string() + } + } else { + "FAIL User not found".to_string() + } + } + } + "PING" => "PING".to_string(), + _ => msg.to_string(), // Echo back for compatibility } - println!("Client disconnected"); } diff --git a/src/bin/server/main.rs b/src/bin/server/main.rs index 2c6e1dc..7693069 100644 --- a/src/bin/server/main.rs +++ b/src/bin/server/main.rs @@ -1,5 +1,6 @@ mod args; mod handler; +mod database; use std::net::TcpListener; use std::thread; diff --git a/src/bin/server/mod.rs b/src/bin/server/mod.rs index adb60bb..b2d622e 100644 --- a/src/bin/server/mod.rs +++ b/src/bin/server/mod.rs @@ -1,2 +1,3 @@ pub mod args; pub mod handler; +pub mod database; -- cgit v1.2.3