style: switch rustfmt to hard tabs; document tests-separate rule in TODO
- rustfmt.toml: hard_tabs = true; whole tree reformatted (no logic changes) - TODO §0.7: tests live in tests/, never inline #[cfg(test)] in code files (legacy inline tests to be migrated, see Backlog) - TODO: add backlog item for the inline-test migration
This commit is contained in:
parent
d8393e0f39
commit
18a0ffa53d
96 changed files with 6542 additions and 6537 deletions
|
|
@ -3,97 +3,97 @@ use serde::Serialize;
|
|||
|
||||
#[derive(Deserialize)]
|
||||
struct AddResponse {
|
||||
status: String,
|
||||
target: String,
|
||||
status: String,
|
||||
target: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct BlacklistItem {
|
||||
target: String,
|
||||
reason: String,
|
||||
target: String,
|
||||
reason: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct BlacklistResponse {
|
||||
items: Vec<BlacklistItem>,
|
||||
total: usize,
|
||||
items: Vec<BlacklistItem>,
|
||||
total: usize,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct LoginResponse {
|
||||
token: String,
|
||||
token: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct RemoveRequest<'a> {
|
||||
target: &'a str,
|
||||
target: &'a str,
|
||||
}
|
||||
|
||||
async fn authenticated_client() -> anyhow::Result<(reqwest::Client, String, String)> {
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
let password = std::env::var("RAMPART_API_PASSWORD")
|
||||
.map_err(|_| anyhow::anyhow!("RAMPART_API_PASSWORD must be set to use the manager blacklist API"))?;
|
||||
let client = reqwest::Client::new();
|
||||
let response = client
|
||||
.post(format!("{manager_url}/api/v1/auth/login"))
|
||||
.json(&serde_json::json!({"password": password}))
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let token = response.json::<LoginResponse>().await?.token;
|
||||
Ok((client, manager_url, token))
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
let password = std::env::var("RAMPART_API_PASSWORD")
|
||||
.map_err(|_| anyhow::anyhow!("RAMPART_API_PASSWORD must be set to use the manager blacklist API"))?;
|
||||
let client = reqwest::Client::new();
|
||||
let response = client
|
||||
.post(format!("{manager_url}/api/v1/auth/login"))
|
||||
.json(&serde_json::json!({"password": password}))
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let token = response.json::<LoginResponse>().await?.token;
|
||||
Ok((client, manager_url, token))
|
||||
}
|
||||
|
||||
pub async fn add(target: String, reason: Option<String>) -> anyhow::Result<()> {
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
|
||||
let body = serde_json::json!({
|
||||
"target": target,
|
||||
"type": "ip",
|
||||
"reason": reason.unwrap_or_else(|| "manual".to_string()),
|
||||
});
|
||||
let body = serde_json::json!({
|
||||
"target": target,
|
||||
"type": "ip",
|
||||
"reason": reason.unwrap_or_else(|| "manual".to_string()),
|
||||
});
|
||||
|
||||
let resp = client
|
||||
.post(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.json(&body)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json::<AddResponse>()
|
||||
.await?;
|
||||
println!("[OK] {}: {}", resp.status, resp.target);
|
||||
Ok(())
|
||||
let resp = client
|
||||
.post(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.json(&body)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json::<AddResponse>()
|
||||
.await?;
|
||||
println!("[OK] {}: {}", resp.status, resp.target);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn remove(target: String) -> anyhow::Result<()> {
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
let response = client
|
||||
.delete(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.json(&RemoveRequest { target: &target })
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let result: serde_json::Value = response.json().await?;
|
||||
println!("[OK] {}: {}", result["status"].as_str().unwrap_or("removed"), target);
|
||||
Ok(())
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
let response = client
|
||||
.delete(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.json(&RemoveRequest { target: &target })
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let result: serde_json::Value = response.json().await?;
|
||||
println!("[OK] {}: {}", result["status"].as_str().unwrap_or("removed"), target);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn list() -> anyhow::Result<()> {
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
let list = client
|
||||
.get(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json::<BlacklistResponse>()
|
||||
.await?;
|
||||
println!("Blacklist ({} entries)", list.total);
|
||||
println!("----------------------");
|
||||
for item in &list.items {
|
||||
println!(" {} ({})", item.target, item.reason);
|
||||
}
|
||||
Ok(())
|
||||
let (client, manager_url, token) = authenticated_client().await?;
|
||||
let list = client
|
||||
.get(format!("{manager_url}/api/v1/blacklist"))
|
||||
.bearer_auth(token)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?
|
||||
.json::<BlacklistResponse>()
|
||||
.await?;
|
||||
println!("Blacklist ({} entries)", list.total);
|
||||
println!("----------------------");
|
||||
for item in &list.items {
|
||||
println!(" {} ({})", item.target, item.reason);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
pub async fn run(key: Option<String>, value: Option<String>) -> anyhow::Result<()> {
|
||||
match (key, value) {
|
||||
(Some(_), Some(_)) => {
|
||||
anyhow::bail!("config updates are not implemented; edit the edge config and restart Rampart")
|
||||
},
|
||||
(Some(_), None) => anyhow::bail!("config lookup is not implemented"),
|
||||
(None, Some(_)) | (None, None) => {
|
||||
println!("Configuration");
|
||||
println!("=============\n");
|
||||
println!("Use: rampart config <key> [value]");
|
||||
println!();
|
||||
println!("Example keys:");
|
||||
println!(" workers.count");
|
||||
println!(" limits.rate_limit_login_pps");
|
||||
println!(" limits.max_connections_per_ip");
|
||||
Ok(())
|
||||
},
|
||||
}
|
||||
match (key, value) {
|
||||
(Some(_), Some(_)) => {
|
||||
anyhow::bail!("config updates are not implemented; edit the edge config and restart Rampart")
|
||||
},
|
||||
(Some(_), None) => anyhow::bail!("config lookup is not implemented"),
|
||||
(None, Some(_)) | (None, None) => {
|
||||
println!("Configuration");
|
||||
println!("=============\n");
|
||||
println!("Use: rampart config <key> [value]");
|
||||
println!();
|
||||
println!("Example keys:");
|
||||
println!(" workers.count");
|
||||
println!(" limits.rate_limit_login_pps");
|
||||
println!(" limits.max_connections_per_ip");
|
||||
Ok(())
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,104 +3,104 @@ use crate::xdp::{EnvironmentReport, FilesystemProbe, SystemProbe};
|
|||
/// Ищет интерфейс с маршрутом по умолчанию в /proc/net/route
|
||||
/// (destination == 00000000). Работает без root.
|
||||
fn default_route_interface(probe: &impl SystemProbe) -> Option<String> {
|
||||
let routes = probe.read_file("/proc/net/route").ok()?;
|
||||
routes.lines().skip(1).find_map(|line| {
|
||||
let fields: Vec<&str> = line.split_whitespace().collect();
|
||||
(fields.len() > 7 && fields[1] == "00000000").then(|| fields[0].to_owned())
|
||||
})
|
||||
let routes = probe.read_file("/proc/net/route").ok()?;
|
||||
routes.lines().skip(1).find_map(|line| {
|
||||
let fields: Vec<&str> = line.split_whitespace().collect();
|
||||
(fields.len() > 7 && fields[1] == "00000000").then(|| fields[0].to_owned())
|
||||
})
|
||||
}
|
||||
|
||||
/// Подсекция network/XDP: что видно окружению без root.
|
||||
fn print_network_section(all_ok: &mut bool) {
|
||||
println!("\nNetwork / XDP");
|
||||
println!("-------------");
|
||||
println!("\nNetwork / XDP");
|
||||
println!("-------------");
|
||||
|
||||
let probe = FilesystemProbe;
|
||||
let Some(interface) = default_route_interface(&probe) else {
|
||||
println!("[WARN] Default route interface not found, XDP checks skipped");
|
||||
return;
|
||||
};
|
||||
println!("Interface: {interface}");
|
||||
let probe = FilesystemProbe;
|
||||
let Some(interface) = default_route_interface(&probe) else {
|
||||
println!("[WARN] Default route interface not found, XDP checks skipped");
|
||||
return;
|
||||
};
|
||||
println!("Interface: {interface}");
|
||||
|
||||
let report = EnvironmentReport::collect(&probe, &interface);
|
||||
let kernel = report
|
||||
.kernel_version
|
||||
.map_or_else(|| "unknown".to_owned(), |v| v.to_string());
|
||||
println!("Kernel: {kernel}");
|
||||
println!(
|
||||
"BTF: {}",
|
||||
if report.btf_available {
|
||||
"available"
|
||||
} else {
|
||||
"missing (CO-RE disabled)"
|
||||
}
|
||||
);
|
||||
println!(
|
||||
"Privileges: {}",
|
||||
if report.privileged {
|
||||
"root (capabilities assumed)"
|
||||
} else {
|
||||
"non-root"
|
||||
}
|
||||
);
|
||||
println!("Driver: {}", report.driver_name.as_deref().unwrap_or("unknown"));
|
||||
println!("Attach mode: {}", report.attach_mode());
|
||||
println!("Verdict: {}", report.verdict());
|
||||
for warning in &report.warnings {
|
||||
println!("[WARN] {warning}");
|
||||
}
|
||||
if let Err(e) = report.validate() {
|
||||
println!("[FAIL] {e}");
|
||||
*all_ok = false;
|
||||
} else {
|
||||
println!("[OK] XDP environment");
|
||||
}
|
||||
let report = EnvironmentReport::collect(&probe, &interface);
|
||||
let kernel = report
|
||||
.kernel_version
|
||||
.map_or_else(|| "unknown".to_owned(), |v| v.to_string());
|
||||
println!("Kernel: {kernel}");
|
||||
println!(
|
||||
"BTF: {}",
|
||||
if report.btf_available {
|
||||
"available"
|
||||
} else {
|
||||
"missing (CO-RE disabled)"
|
||||
}
|
||||
);
|
||||
println!(
|
||||
"Privileges: {}",
|
||||
if report.privileged {
|
||||
"root (capabilities assumed)"
|
||||
} else {
|
||||
"non-root"
|
||||
}
|
||||
);
|
||||
println!("Driver: {}", report.driver_name.as_deref().unwrap_or("unknown"));
|
||||
println!("Attach mode: {}", report.attach_mode());
|
||||
println!("Verdict: {}", report.verdict());
|
||||
for warning in &report.warnings {
|
||||
println!("[WARN] {warning}");
|
||||
}
|
||||
if let Err(e) = report.validate() {
|
||||
println!("[FAIL] {e}");
|
||||
*all_ok = false;
|
||||
} else {
|
||||
println!("[OK] XDP environment");
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn run() -> anyhow::Result<()> {
|
||||
println!("Rampart Diagnostics");
|
||||
println!("=====================\n");
|
||||
println!("Rampart Diagnostics");
|
||||
println!("=====================\n");
|
||||
|
||||
let mut all_ok = true;
|
||||
let mut all_ok = true;
|
||||
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
|
||||
match reqwest::get(format!("{manager_url}/api/v1/health")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Manager API");
|
||||
},
|
||||
_ => {
|
||||
println!("[FAIL] Manager API");
|
||||
all_ok = false;
|
||||
},
|
||||
}
|
||||
match reqwest::get(format!("{manager_url}/api/v1/health")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Manager API");
|
||||
},
|
||||
_ => {
|
||||
println!("[FAIL] Manager API");
|
||||
all_ok = false;
|
||||
},
|
||||
}
|
||||
|
||||
match reqwest::get(format!("{manager_url}/api/v1/blacklist")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Blacklist API");
|
||||
},
|
||||
_ => {
|
||||
println!("[WARN] Blacklist API unavailable");
|
||||
},
|
||||
}
|
||||
match reqwest::get(format!("{manager_url}/api/v1/blacklist")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Blacklist API");
|
||||
},
|
||||
_ => {
|
||||
println!("[WARN] Blacklist API unavailable");
|
||||
},
|
||||
}
|
||||
|
||||
match reqwest::get(format!("{manager_url}/api/v1/servers")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Servers API");
|
||||
},
|
||||
_ => {
|
||||
println!("[WARN] Servers API unavailable");
|
||||
},
|
||||
}
|
||||
match reqwest::get(format!("{manager_url}/api/v1/servers")).await {
|
||||
Ok(resp) if resp.status().is_success() => {
|
||||
println!("[OK] Servers API");
|
||||
},
|
||||
_ => {
|
||||
println!("[WARN] Servers API unavailable");
|
||||
},
|
||||
}
|
||||
|
||||
print_network_section(&mut all_ok);
|
||||
print_network_section(&mut all_ok);
|
||||
|
||||
println!();
|
||||
if all_ok {
|
||||
println!("All checks passed.");
|
||||
} else {
|
||||
println!("Some checks failed. Run with --verbose for details.");
|
||||
}
|
||||
println!();
|
||||
if all_ok {
|
||||
println!("All checks passed.");
|
||||
} else {
|
||||
println!("Some checks failed. Run with --verbose for details.");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
pub async fn run(node: &str) -> anyhow::Result<()> {
|
||||
anyhow::bail!("graceful drain is not implemented for node {node}")
|
||||
anyhow::bail!("graceful drain is not implemented for node {node}")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
pub async fn enable() -> anyhow::Result<()> {
|
||||
anyhow::bail!("emergency mode is not implemented; change the edge policy and restart Rampart")
|
||||
anyhow::bail!("emergency mode is not implemented; change the edge policy and restart Rampart")
|
||||
}
|
||||
|
||||
pub async fn disable() -> anyhow::Result<()> {
|
||||
anyhow::bail!("emergency mode is not implemented; change the edge policy and restart Rampart")
|
||||
anyhow::bail!("emergency mode is not implemented; change the edge policy and restart Rampart")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
pub async fn run() -> anyhow::Result<()> {
|
||||
println!("Rampart Status");
|
||||
println!("================\n");
|
||||
println!("Rampart Status");
|
||||
println!("================\n");
|
||||
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
let manager_url = std::env::var("RAMPART_MANAGER").unwrap_or_else(|_| "http://localhost:8080".to_string());
|
||||
|
||||
match reqwest::get(format!("{manager_url}/api/v1/health")).await {
|
||||
Ok(resp) => {
|
||||
if let Ok(body) = resp.json::<serde_json::Value>().await {
|
||||
println!(
|
||||
"Manager: {} (v{})",
|
||||
body["status"].as_str().unwrap_or("unknown"),
|
||||
body["version"].as_str().unwrap_or("?")
|
||||
);
|
||||
}
|
||||
},
|
||||
Err(e) => println!("Manager: unreachable ({e})"),
|
||||
}
|
||||
match reqwest::get(format!("{manager_url}/api/v1/health")).await {
|
||||
Ok(resp) => {
|
||||
if let Ok(body) = resp.json::<serde_json::Value>().await {
|
||||
println!(
|
||||
"Manager: {} (v{})",
|
||||
body["status"].as_str().unwrap_or("unknown"),
|
||||
body["version"].as_str().unwrap_or("?")
|
||||
);
|
||||
}
|
||||
},
|
||||
Err(e) => println!("Manager: unreachable ({e})"),
|
||||
}
|
||||
|
||||
println!();
|
||||
println!("To check individual components, run: rampart doctor");
|
||||
Ok(())
|
||||
println!();
|
||||
println!("To check individual components, run: rampart doctor");
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue