[Fix] Stability

This commit is contained in:
Alex Emmet 2026-08-28 13:22:59 +02:00
commit 8160f8d0cb
No known key found for this signature in database
44 changed files with 796 additions and 1296 deletions

View file

@ -4,57 +4,13 @@ version = "0.1.0"
edition = "2024"
[dependencies]
omikron-connector = { path = "../omikron-connector" }
iota-storage = { path = "../iota-storage" }
iota-state = { path = "../iota-state" }
iota-util = { path = "../iota-util" }
iota-logger = { path = "../iota-logger" }
mtp = { git = "https://git.methanium.net/Methanium/mtp.git" }
actix-web = { version = "4", features = ["rustls-0_23"] }
actix-web-actors = "4"
aes-gcm = "0.10.3"
async-trait = "0.1.89"
base64 = "0.22.1"
chrono = "0.4.43"
crossterm = "*"
dashmap = "6.1.0"
futures = "*"
futures-util = "*"
hex = "*"
hkdf = "0.12.4"
hyper = { version = "1.8.1", features = [
"capi",
"client",
"full",
"http1",
"http2",
"nightly",
"server",
] }
hyper-util = { version = "*" }
json = "*"
lazy_static = "1.5.0"
once_cell = "1.21.3"
open = "5.3.3"
pnet = "0.35.0"
rand = "0.8"
rand_core = { version = "0.6", features = ["getrandom", "std"] }
ratatui = "0.30.0"
reqwest = "0.13.2"
rusqlite = "0.40.0"
rustls = { version = "0.23.37", features = ["aws-lc-rs"] }
rustls-pemfile = "2.2.0"
serde_json = "1.0.149"
sha2 = "0.11.0"
strum = "0.28.0"
strum_macros = "0.28.0"
sysinfo = "0.39.0"
tokio = { version = "1.50.0", features = ["full"] }
tokio-tungstenite = { version = "*", features = ["native-tls"] }
tungstenite = "*"
uuid = { version = "*", features = ["v4"] }
walkdir = "2.5.0"
warp = "*"
x448 = { version = "*" }
zip = "6.0.0"

View file

@ -128,7 +128,10 @@ async fn users_remove(
return forbidden();
}
let uuid = payload.get("uuid").and_then(|v| v.as_i64()).unwrap_or(0);
let uuid = match user_id(&payload) {
Ok(uuid) => uuid,
Err(response) => return response,
};
iota_storage::users::user_manager::remove_user(uuid);
iota_storage::users::user_manager::save_users();
@ -194,7 +197,14 @@ fn success() -> HttpResponse {
}
fn error() -> HttpResponse {
HttpResponse::Ok().json(json!({ "type": "error" }))
HttpResponse::BadRequest().json(json!({ "type": "error" }))
}
fn user_id(payload: &Value) -> Result<i64, HttpResponse> {
payload
.get("uuid")
.and_then(Value::as_i64)
.ok_or_else(error)
}
fn is_allowed(addr: SocketAddr, ssl: bool) -> bool {
@ -208,3 +218,20 @@ fn is_allowed_req(req: &HttpRequest, ssl: bool) -> bool {
false
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn error_response_is_bad_request() {
assert_eq!(error().status(), actix_web::http::StatusCode::BAD_REQUEST);
}
#[test]
fn user_id_rejects_missing_or_non_integer_uuid() {
assert!(user_id(&json!({})).is_err());
assert!(user_id(&json!({ "uuid": "0" })).is_err());
assert_eq!(user_id(&json!({ "uuid": 0 })).ok(), Some(0));
}
}