diff --git a/justfile b/justfile index 4ac4f73..20a3fa9 100644 --- a/justfile +++ b/justfile @@ -32,8 +32,7 @@ build-container-release: podman build -t fb-server -f container/Containerfile . # Builds a release container and runs it -start-release: start-postgres-dev clean-podman init-sqlx build-container-release - podman network create {{network}} --ignore +start-release: start-postgres-dev clean-podman init-sqlx build-container-release create-network podman run -d --network {{network}} -e {{env_string}} -p 8080:8080 --name frostbyte fb-server # Initializes the database, runs migrations and then prepares sqlx @@ -45,10 +44,14 @@ init-sqlx: # Starts a postgres container for development [private] -start-postgres-dev: +start-postgres-dev: create-network podman rm -f {{pg_container}} podman run --network {{network}} --name {{pg_container}} -e POSTGRES_PASSWORD={{pg_pass}} -d -p {{pg_port}}:5432 docker.io/postgres:16.1-alpine +[private] +create-network: + podman network create {{network}} --ignore + # Forcefully stops and removes the frostbyte container [private] clean-podman: diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs index c5e7f02..60cfc4f 100755 --- a/server/src/routes/users.rs +++ b/server/src/routes/users.rs @@ -84,13 +84,14 @@ pub struct CaptchaResponse { } /// Request a captcha from the captcha service +#[allow(unreachable_code, unused_variables)] #[post("/captcha")] pub async fn captcha_request(cstate: Data) -> Result { unimplemented!("Captcha is currently disabled"); return Ok(HttpResponse::InternalServerError().json("Error")); // This might block the thread a bit too long - // let (answer, svg) = get_captcha(); + let (answer, svg) = get_captcha(); // let id = rand_core::OsRng.next_u32() as i32; diff --git a/server/src/util/util.rs b/server/src/util/util.rs index b50a703..62754a1 100644 --- a/server/src/util/util.rs +++ b/server/src/util/util.rs @@ -1,4 +1,4 @@ -use rand::{Rng, RngCore}; +use rand::Rng; // This will do for now pub fn hex_string(length: usize) -> String { @@ -9,11 +9,9 @@ pub fn hex_string(length: usize) -> String { } mod tests { - use super::*; - #[test] fn test_random_hex_string() { - let s = hex_string(16); + let s = super::hex_string(16); assert_eq!(s.len(), 16); } }