Nothing behavioral except two status codes; mostly removing places where the same rule was written down more than once and could drift. - server/src/private.rs: the owner-only create/write helpers, which config.rs, certs.rs, and the session dirs each had their own copy of (certs.rs even duplicated the explanatory comment). One module owns the modes now, so the "nothing this server writes is readable by anyone else" property is checkable in one place. - server/src/media.rs: the image media-type/extension table, which the four places that have to agree on it each spelled out separately -- storing an upload, serving it back, building a content block, saving a produced image. The differing *defaults* stay at the call sites with the reasoning, since they genuinely differ by direction. - routes.rs: a missing file was a 400 and an unreadable one a 400 with a hand-rolled log line; they are now 404 and Internal respectively. UnknownSession became NotFound, since it was the only 404-with-message. - main.rs: xdg_dir takes the variable's value instead of reading the environment, which drops the unsafe set_var from its test and lets the test actually assert the relative-path rule. - echo.rs had its own 4-byte hex generator beside session::random_hex. - claude.rs: the two impl Translator blocks were one type's methods. - Stale comments: phase-2 markers on shipped work, a permission-mode list that had drifted from the CLI's, "dev-updater" as the leaf certificate's fallback common name, a half-written sentence in build-apk.sh. - App: the JSONArray walk written out in four fetchers, the four near-identical BackHandlers in AppRoot, and SessionScreen's inline fully-qualified names where the file otherwise imports. - server/wg-test.log was committed by accident; *.log is ignored now, and the gitignore comments describe where state actually lives. - PLAN.md's backend layout gains the new modules and drops hosts.rs for the ssh.rs that was built instead. Verified: 35 server tests, clippy clean, app compiles warning-free, and a scratch server driven over curl -- attachment upload/serve round-trip with both a known and an unknown content type, the new 404s, transcript and session-dir deletion, plus a real claude-cli session answering a prompt. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017xn8nHw1tw1R6PtiY1eEtw
49 lines
1.8 KiB
Rust
49 lines
1.8 KiB
Rust
//! Creating files and directories this server alone can read.
|
|
//!
|
|
//! Everything the server writes outside the repo goes through here: the
|
|
//! config (token hashes, hosts, sessions), the TLS private keys, and the
|
|
//! session directories holding whole transcripts. One module owns the
|
|
//! modes so "owner-only" is a property that can be checked in one place
|
|
//! rather than re-argued at every `create`.
|
|
|
|
use std::fs::File;
|
|
use std::os::unix::fs::{DirBuilderExt, OpenOptionsExt, PermissionsExt};
|
|
use std::path::Path;
|
|
|
|
use anyhow::{Context, Result};
|
|
|
|
/// Creates `dir` and its parents, owner-accessible only.
|
|
pub fn create_dir(dir: &Path) -> Result<()> {
|
|
std::fs::DirBuilder::new()
|
|
.recursive(true)
|
|
.mode(0o700)
|
|
.create(dir)
|
|
.with_context(|| format!("create {}", dir.display()))?;
|
|
// Set explicitly as well: `mode` applies only when the directory is
|
|
// created, so one that already existed -- made by hand, or by a
|
|
// version that didn't do this -- would otherwise keep whatever
|
|
// permissions it had while holding secrets.
|
|
std::fs::set_permissions(dir, std::fs::Permissions::from_mode(0o700))
|
|
.with_context(|| format!("restrict {}", dir.display()))
|
|
}
|
|
|
|
/// Opens `path` for writing, truncating it, owner-readable only from the
|
|
/// moment it exists rather than by a `chmod` afterwards.
|
|
pub fn create_file(path: &Path) -> Result<File> {
|
|
std::fs::OpenOptions::new()
|
|
.write(true)
|
|
.create(true)
|
|
.truncate(true)
|
|
.mode(0o600)
|
|
.open(path)
|
|
.with_context(|| format!("write {}", path.display()))
|
|
}
|
|
|
|
/// Writes `contents` to `path`, owner-readable only.
|
|
pub fn write_file(path: &Path, contents: &[u8]) -> Result<()> {
|
|
use std::io::Write;
|
|
create_file(path)?
|
|
.write_all(contents)
|
|
.with_context(|| format!("write {}", path.display()))
|
|
}
|