This commit is contained in:
Mateusz Gruszczyński committed 2026-10-05 09:30:21 +02:00
1 parent 1dea7f55c8
commit c819f0a335
151 files changed
+7610 -4264

No files matched your search

+20 -7
View File
@@ -72,9 +72,12 @@ fn local_admin_public_roots() -> RootCertStore {
fn local_admin_certificate_pins(data_dir: &Path) -> Result<Vec<[u8; 32]>> {
let directory = data_dir.join("certs");
let mut pins = Vec::new();
for entry in std::fs::read_dir(&directory)
.with_context(|| format!("cannot read local certificate directory {}", directory.display()))?
{
for entry in std::fs::read_dir(&directory).with_context(|| {
format!(
"cannot read local certificate directory {}",
directory.display()
)
})? {
let entry = entry?;
let path = entry.path();
if path.extension().and_then(|value| value.to_str()) != Some("pem") {
@@ -105,7 +108,10 @@ fn local_admin_certificate_pins(data_dir: &Path) -> Result<Vec<[u8; 32]>> {
Ok(pins)
}
fn local_admin_scheme_from_probe(status: StatusCode, location: Option<&str>) -> Result<&'static str> {
fn local_admin_scheme_from_probe(
status: StatusCode,
location: Option<&str>,
) -> Result<&'static str> {
if status == StatusCode::PERMANENT_REDIRECT {
ensure!(
location.is_some_and(|value| value.starts_with("https://")),
@@ -198,10 +204,17 @@ impl LocalAdminClient {
}
async fn live_logs_command(dir: PathBuf, addr: SocketAddr) -> Result<()> {
ensure!(addr.ip().is_loopback(), "--livelogs requires the local loopback administration listener");
ensure!(
addr.ip().is_loopback(),
"--livelogs requires the local loopback administration listener"
);
auth::prepare_directory(&dir)?;
let path = dir.join("config.sqlite3");
ensure!(path.is_file(), "database does not exist at {}; start rust-proxy serve first", path.display());
ensure!(
path.is_file(),
"database does not exist at {}; start rust-proxy serve first",
path.display()
);
auth::prepare_database(&path)?;
let store = Store::open(&path, &Config::default()).await?;
let admin = LocalAdminClient::connect(&dir, addr).await?;
@@ -226,7 +239,7 @@ async fn live_logs_command(dir: PathBuf, addr: SocketAddr) -> Result<()> {
}
});
let interactive = io::stdin().is_terminal() && io::stdout().is_terminal();
println!("RustProxy live logs 0.25.4 - all vhosts. Type 'help' for interactive filters; Ctrl-C or 'quit' exits.");
println!("RustProxy live logs 0.25.5 - all vhosts. Type 'help' for interactive filters; Ctrl-C or 'quit' exits.");
if interactive { print!("> "); io::stdout().flush()?; }
let mut filters = LiveLogFilters::default();
let mut history = std::collections::BTreeMap::<u64, serde_json::Value>::new();