diff options
| author | salmonik <raisersoft@proton.me> | 2026-02-28 19:19:28 +0100 |
|---|---|---|
| committer | salmonik <raisersoft@proton.me> | 2026-02-28 19:19:28 +0100 |
| commit | 4732867ffa8041a3406dade3ae3ad32cf95f0a0c (patch) | |
| tree | cd64723174b55b3459f9da05f883743da811f26b /src/bin/server | |
| parent | better raw mode for windows (diff) | |
| download | zagan-bet-4732867ffa8041a3406dade3ae3ad32cf95f0a0c.tar.gz zagan-bet-4732867ffa8041a3406dade3ae3ad32cf95f0a0c.zip | |
add authentication barebone
Diffstat (limited to '')
| -rw-r--r-- | src/bin/server/database.rs | 31 | ||||
| -rw-r--r-- | src/bin/server/handler.rs | 57 | ||||
| -rw-r--r-- | src/bin/server/main.rs | 1 | ||||
| -rw-r--r-- | src/bin/server/mod.rs | 1 |
4 files changed, 86 insertions, 4 deletions
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 @@ | |||
| 1 | use rusqlite::Connection; | ||
| 2 | |||
| 3 | pub fn init_db() -> Connection { | ||
| 4 | let conn = Connection::open("server.db").unwrap(); | ||
| 5 | conn.execute( | ||
| 6 | "CREATE TABLE IF NOT EXISTS users ( | ||
| 7 | username TEXT PRIMARY KEY, | ||
| 8 | hashed_password TEXT NOT NULL | ||
| 9 | )", | ||
| 10 | [], | ||
| 11 | ).unwrap(); | ||
| 12 | conn | ||
| 13 | } | ||
| 14 | |||
| 15 | pub fn add_user(conn: &Connection, username: &str, hashed_password: &str) -> Result<(), Box<dyn std::error::Error>> { | ||
| 16 | conn.execute( | ||
| 17 | "INSERT INTO users (username, hashed_password) VALUES (?1, ?2)", | ||
| 18 | [username, hashed_password], | ||
| 19 | )?; | ||
| 20 | Ok(()) | ||
| 21 | } | ||
| 22 | |||
| 23 | pub fn get_hashed_password(conn: &Connection, username: &str) -> Option<String> { | ||
| 24 | let mut stmt = conn.prepare("SELECT hashed_password FROM users WHERE username = ?1").unwrap(); | ||
| 25 | let mut rows = stmt.query([username]).unwrap(); | ||
| 26 | if let Ok(Some(row)) = rows.next() { | ||
| 27 | row.get(0).ok() | ||
| 28 | } else { | ||
| 29 | None | ||
| 30 | } | ||
| 31 | } | ||
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 @@ | |||
| 1 | use std::io::{BufRead, BufReader, Write}; | 1 | use std::io::{BufRead, BufReader, Write}; |
| 2 | use std::net::TcpStream; | 2 | use std::net::TcpStream; |
| 3 | use std::sync::Mutex; | ||
| 4 | use once_cell::sync::Lazy; | ||
| 5 | use rusqlite::Connection; | ||
| 6 | use crate::database; | ||
| 7 | |||
| 8 | static DB_CONN: Lazy<Mutex<Connection>> = Lazy::new(|| Mutex::new(database::init_db())); | ||
| 3 | 9 | ||
| 4 | pub fn handle_client(stream: TcpStream) { | 10 | pub fn handle_client(stream: TcpStream) { |
| 5 | println!("Client connected"); | 11 | let client_addr = stream.peer_addr().unwrap().to_string(); |
| 12 | let mut user = "guest".to_string(); | ||
| 13 | println!("[{} @ {}] Client connected", user, client_addr); | ||
| 6 | let reader_stream = stream.try_clone().unwrap(); | 14 | let reader_stream = stream.try_clone().unwrap(); |
| 7 | let reader = BufReader::new(reader_stream); | 15 | let reader = BufReader::new(reader_stream); |
| 8 | let mut writer = stream; | 16 | let mut writer = stream; |
| 9 | for line in reader.lines() { | 17 | for line in reader.lines() { |
| 10 | let line = line.unwrap(); | 18 | let line = line.unwrap(); |
| 11 | println!("Received: {}", line); | 19 | println!("[{} @ {}] Received: {}", user, client_addr, line); |
| 12 | writeln!(writer, "{}", line).unwrap(); | 20 | let response = process_message(&line, &mut user); |
| 21 | writeln!(writer, "{}", response).unwrap(); | ||
| 22 | } | ||
| 23 | println!("[{} @ {}] Client disconnected", user, client_addr); | ||
| 24 | } | ||
| 25 | |||
| 26 | fn process_message(msg: &str, user: &mut String) -> String { | ||
| 27 | let parts: Vec<&str> = msg.splitn(3, ' ').collect(); | ||
| 28 | match parts[0] { | ||
| 29 | "REGISTER" => { | ||
| 30 | if parts.len() != 3 { | ||
| 31 | "FAIL Invalid REGISTER format".to_string() | ||
| 32 | } else { | ||
| 33 | let username = parts[1]; | ||
| 34 | let hashed_pass = parts[2]; | ||
| 35 | let db = DB_CONN.lock().unwrap(); | ||
| 36 | match database::add_user(&db, username, hashed_pass) { | ||
| 37 | Ok(_) => format!("OK Registered {}", username), | ||
| 38 | Err(_) => "FAIL User already exists".to_string(), | ||
| 39 | } | ||
| 40 | } | ||
| 41 | } | ||
| 42 | "AUTH" => { | ||
| 43 | if parts.len() != 3 { | ||
| 44 | "FAIL Invalid AUTH format".to_string() | ||
| 45 | } else { | ||
| 46 | let username = parts[1]; | ||
| 47 | let provided_hash = parts[2]; | ||
| 48 | let db = DB_CONN.lock().unwrap(); | ||
| 49 | if let Some(stored_hash) = database::get_hashed_password(&db, username) { | ||
| 50 | if provided_hash == stored_hash { | ||
| 51 | *user = username.to_string(); | ||
| 52 | format!("OK {}", username) | ||
| 53 | } else { | ||
| 54 | "FAIL Invalid credentials".to_string() | ||
| 55 | } | ||
| 56 | } else { | ||
| 57 | "FAIL User not found".to_string() | ||
| 58 | } | ||
| 59 | } | ||
| 60 | } | ||
| 61 | "PING" => "PING".to_string(), | ||
| 62 | _ => msg.to_string(), // Echo back for compatibility | ||
| 13 | } | 63 | } |
| 14 | println!("Client disconnected"); | ||
| 15 | } | 64 | } |
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 @@ | |||
| 1 | mod args; | 1 | mod args; |
| 2 | mod handler; | 2 | mod handler; |
| 3 | mod database; | ||
| 3 | 4 | ||
| 4 | use std::net::TcpListener; | 5 | use std::net::TcpListener; |
| 5 | use std::thread; | 6 | 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 @@ | |||
| 1 | pub mod args; | 1 | pub mod args; |
| 2 | pub mod handler; | 2 | pub mod handler; |
| 3 | pub mod database; | ||
