summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorsalmonik <raisersoft@proton.me>2026-02-28 21:10:20 +0100
committersalmonik <raisersoft@proton.me>2026-02-28 21:10:20 +0100
commit9e3757eea25b71461c45521dd1ef6c17be34744f (patch)
tree74f598beb0ccf8370c920031df7b981294bcdefe /src/server
parentfolder restructuring (diff)
downloadzagan-bet-9e3757eea25b71461c45521dd1ef6c17be34744f.tar.gz
zagan-bet-9e3757eea25b71461c45521dd1ef6c17be34744f.zip
Revert "folder restructuring"
This reverts commit 17082597464198fe84be80313b7d51e1e57de639.
Diffstat (limited to 'src/server')
-rw-r--r--src/server/args.rs41
-rw-r--r--src/server/database.rs31
-rw-r--r--src/server/handler.rs64
-rw-r--r--src/server/main.rs24
-rw-r--r--src/server/mod.rs3
5 files changed, 0 insertions, 163 deletions
diff --git a/src/server/args.rs b/src/server/args.rs
deleted file mode 100644
index 31c0acc..0000000
--- a/src/server/args.rs
+++ /dev/null
@@ -1,41 +0,0 @@
1pub struct Args {
2 pub ip: String,
3 pub port: u16,
4}
5
6pub fn parse_args() -> Args {
7 let args: Vec<String> = std::env::args().collect();
8 let mut ip = "127.0.0.1".to_string();
9 let mut port = 11525;
10 let mut i = 1;
11 while i < args.len() {
12 if args[i] == "-p" {
13 if i + 1 < args.len() {
14 port = args[i + 1].parse::<u16>().unwrap_or_else(|_| {
15 eprintln!("Invalid port number: {}", args[i + 1]);
16 std::process::exit(1);
17 });
18 i += 2;
19 } else {
20 eprintln!("-p requires a port number");
21 std::process::exit(1);
22 }
23 } else if args[i] == "-i" {
24 if i + 1 < args.len() {
25 ip = args[i + 1].clone();
26 if ip != "127.0.0.1" && ip != "0.0.0.0" {
27 eprintln!("Invalid IP address: {}. Must be 127.0.0.1 or 0.0.0.0", ip);
28 std::process::exit(1);
29 }
30 i += 2;
31 } else {
32 eprintln!("-i requires an IP address");
33 std::process::exit(1);
34 }
35 } else {
36 eprintln!("Unknown argument: {}", args[i]);
37 std::process::exit(1);
38 }
39 }
40 Args { ip, port }
41}
diff --git a/src/server/database.rs b/src/server/database.rs
deleted file mode 100644
index 9c51997..0000000
--- a/src/server/database.rs
+++ /dev/null
@@ -1,31 +0,0 @@
1use rusqlite::Connection;
2
3pub 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
15pub 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
23pub 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/server/handler.rs b/src/server/handler.rs
deleted file mode 100644
index 2132d09..0000000
--- a/src/server/handler.rs
+++ /dev/null
@@ -1,64 +0,0 @@
1use std::io::{BufRead, BufReader, Write};
2use std::net::TcpStream;
3use std::sync::Mutex;
4use once_cell::sync::Lazy;
5use rusqlite::Connection;
6use crate::database;
7
8static DB_CONN: Lazy<Mutex<Connection>> = Lazy::new(|| Mutex::new(database::init_db()));
9
10pub fn handle_client(stream: TcpStream) {
11 let client_addr = stream.peer_addr().unwrap().to_string();
12 let mut user = "guest".to_string();
13 println!("[{} @ {}] Client connected", user, client_addr);
14 let reader_stream = stream.try_clone().unwrap();
15 let reader = BufReader::new(reader_stream);
16 let mut writer = stream;
17 for line in reader.lines() {
18 let line = line.unwrap();
19 println!("[{} @ {}] Received: {}", user, client_addr, line);
20 let response = process_message(&line, &mut user);
21 writeln!(writer, "{}", response).unwrap();
22 }
23 println!("[{} @ {}] Client disconnected", user, client_addr);
24}
25
26fn 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
63 }
64}
diff --git a/src/server/main.rs b/src/server/main.rs
deleted file mode 100644
index 7693069..0000000
--- a/src/server/main.rs
+++ /dev/null
@@ -1,24 +0,0 @@
1mod args;
2mod handler;
3mod database;
4
5use std::net::TcpListener;
6use std::thread;
7
8fn main() {
9 let args = args::parse_args();
10 let listener = match TcpListener::bind(format!("{}:{}", args.ip, args.port)) {
11 Ok(l) => l,
12 Err(e) => {
13 eprintln!("Failed to bind to {}:{}: {}", args.ip, args.port, e);
14 std::process::exit(1);
15 }
16 };
17 println!("Server listening on {}", listener.local_addr().unwrap());
18 for stream in listener.incoming() {
19 let stream = stream.unwrap();
20 thread::spawn(move || {
21 handler::handle_client(stream);
22 });
23 }
24}
diff --git a/src/server/mod.rs b/src/server/mod.rs
deleted file mode 100644
index b2d622e..0000000
--- a/src/server/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
1pub mod args;
2pub mod handler;
3pub mod database;