ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct placment of a6573cbe header check

Browse source
This commit is contained in:
Ethan O'Brien 2024-10-18 14:56:20 -05:00
parent 21849b2322
commit e0730a9fa6
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/router.rs
View file

@ -62,13 +62,6 @@ async fn api_req(req: HttpRequest, body: String) -> HttpResponse {
} else if !req.path().starts_with("/api") && !req.path().starts_with("/v1.0") { } else if !req.path().starts_with("/api") && !req.path().starts_with("/v1.0") {
return webui::main(req); return webui::main(req);
} }
if headers.get("a6573cbe").is_none() && req.path().starts_with("/api") {
if args.hidden {
return not_found(&headers);
} else {
return webui::main(req);
}
}
let blank_header = HeaderValue::from_static(""); let blank_header = HeaderValue::from_static("");
let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or("").parse::<i64>().unwrap_or(0); let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or("").parse::<i64>().unwrap_or(0);
let resp: Option<JsonValue> = if req.method() == "POST" { let resp: Option<JsonValue> = if req.method() == "POST" {
@ -176,10 +169,18 @@ async fn api_req(req: HttpRequest, body: String) -> HttpResponse {
pub async fn request(req: HttpRequest, body: String) -> HttpResponse { pub async fn request(req: HttpRequest, body: String) -> HttpResponse {
let args = crate::get_args(); let args = crate::get_args();
let headers = req.headers();
if args.hidden && req.path().starts_with("/api/webui/") { if args.hidden && req.path().starts_with("/api/webui/") {
return not_found(&req.headers()); return not_found(&headers);
} }
if req.path().starts_with("/v1.0") && req.headers().get("Authorization").is_none() { if headers.get("a6573cbe").is_none() && req.path().starts_with("/api") {
if args.hidden {
return not_found(&headers);
} else {
return webui::main(req);
}
}
if req.path().starts_with("/v1.0") && headers.get("Authorization").is_none() {
if args.hidden { if args.hidden {
return gree::not_found(); return gree::not_found();
} else { } else {