mirror of
https://github.com/narrrl/narl-workspace.git
synced 2026-11-03 16:41:27 +01:00
feat: mirror the diary to Proton Drive as a device
The data directory is the whole diary, and until now keeping a copy of it was someone's manual job. The server can now register itself in Proton Drive as a device — its own sync root, next to the desktop clients — and keep that folder equal to DIARY_DATA_DIR, encrypted client-side by the same Rust SDK the Linux client uses. One interactive `narl-diary proton-login`, then nothing prompts again. The stored session carries the tokens, the mailbox password (the key chain is rebuilt from it on every start) and the account key salts, which have to be captured at login: `core/v4/keys/salts` needs the `locked` scope, and only a password-login token has it. Refresh tokens are single-use, so every rotation is written back before it can be needed. It lives as a 0600 file next to the database, on the same volume as the data it protects; `--features keyring` puts it in the OS keyring instead, for hosts that have a Secret Service. The mirror is one-way and change-driven: writes mark the diary dirty and it is mirrored once the writing stops, with an interval as the backstop — an hour of writing is one backup, not sixty. `diary.db` goes up as a VACUUM INTO snapshot, so it is a real point in time rather than a file copied out from under a writer, and as a new revision each time, so Proton keeps the older ones. Uploads are immutable, so they are written once and skipped by size afterwards. Deletions do not propagate unless asked: a backup that forgets on command is one accident away from being no backup at all. Identification follows Proton's third-party rules — an honest `external-drive-narl_diary@<version>-alpha`, the disclosure printed before any credential is asked for, and remembered folder uids instead of walking the tree every run. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D5Gk8FPkRXu1e6Nj2BCRE1
This commit is contained in:
1 parent
c606169b01
commit
bac8a4c1d4
21 files changed
+4229
-46
No files matched your search
+129
@@ -0,0 +1,129 @@
|
||||
//! The subcommands that set the Proton Drive backup up and inspect it.
|
||||
//!
|
||||
//! Logging in is interactive exactly once: SRP needs the password and, on an
|
||||
//! account with a second factor, a code. Everything after that resumes from the
|
||||
//! stored session, so the server itself never prompts for anything. In Docker:
|
||||
//!
|
||||
//! ```sh
|
||||
//! docker compose exec -it diary narl-diary proton-login
|
||||
//! ```
|
||||
|
||||
use std::io::{IsTerminal, Write};
|
||||
|
||||
use anyhow::{bail, Context, Result};
|
||||
use sqlx::SqlitePool;
|
||||
|
||||
use crate::{backup, config::Config};
|
||||
|
||||
pub const USAGE: &str = "\
|
||||
narl-diary — a terminal-themed personal diary
|
||||
|
||||
narl-diary serve the diary (the default)
|
||||
narl-diary proton-login log in to Proton Drive and enable backups
|
||||
narl-diary proton-status show whether backups are configured
|
||||
narl-diary proton-logout forget the stored Proton session
|
||||
narl-diary backup-now mirror to Proton Drive once and exit
|
||||
";
|
||||
|
||||
pub async fn proton_login(config: &Config) -> Result<()> {
|
||||
let store = backup::session::SessionStore::new(config.proton_session_path());
|
||||
|
||||
// Said before anything is asked for, not after: Proton requires a
|
||||
// third-party client to be honest about what it is at the point where
|
||||
// someone is about to hand it their account.
|
||||
println!("{}", backup::proton::DISCLOSURE);
|
||||
println!("It talks to Proton Drive with your account, and stores the session locally.");
|
||||
println!();
|
||||
|
||||
let username = match env("PROTON_USERNAME") {
|
||||
Some(username) => username,
|
||||
None => prompt("Proton username: ")?,
|
||||
};
|
||||
let password = match env("PROTON_PASSWORD") {
|
||||
Some(password) => password,
|
||||
None => {
|
||||
if !std::io::stdin().is_terminal() {
|
||||
bail!("no terminal to ask for a password — set PROTON_PASSWORD, or run with `docker compose exec -it`");
|
||||
}
|
||||
rpassword::prompt_password("Proton password: ").context("could not read the password")?
|
||||
}
|
||||
};
|
||||
|
||||
backup::proton::login(&store, username.trim(), &password, || {
|
||||
match env("PROTON_TOTP") {
|
||||
Some(code) => Ok(code),
|
||||
None => prompt("Two-factor code: "),
|
||||
}
|
||||
})
|
||||
.await?;
|
||||
|
||||
println!("Logged in. The session is stored at {}.", store.path().display());
|
||||
println!("Backups start with the next server start, or run `narl-diary backup-now`.");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn proton_logout(config: &Config) -> Result<()> {
|
||||
let store = backup::session::SessionStore::new(config.proton_session_path());
|
||||
store.clear()?;
|
||||
println!("Forgot the Proton session. Backups are off until the next login.");
|
||||
println!(
|
||||
"The mirror already in Proton Drive is untouched; delete the device there to remove it."
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn proton_status(db: &SqlitePool, config: &Config) -> Result<()> {
|
||||
let store = backup::session::SessionStore::new(config.proton_session_path());
|
||||
let Some(stored) = store.load()? else {
|
||||
println!("Proton Drive backups are not configured.");
|
||||
println!("Run `narl-diary proton-login` to enable them.");
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
println!("Account: {}", stored.username);
|
||||
println!("Device: {}", config.backup.device_name);
|
||||
println!("Session: {}", store.path().display());
|
||||
match config.backup.interval {
|
||||
Some(interval) => println!("Interval: every {} minutes", interval.as_secs() / 60),
|
||||
None => println!("Interval: off (only on change and on request)"),
|
||||
}
|
||||
println!(
|
||||
"Quiet: {}s after the last change",
|
||||
config.backup.debounce.as_secs()
|
||||
);
|
||||
println!("Prune: {}", if config.backup.prune { "on" } else { "off" });
|
||||
|
||||
let mirrored: i64 = sqlx::query_scalar("SELECT count(*) FROM backup_files")
|
||||
.fetch_one(db)
|
||||
.await
|
||||
.unwrap_or(0);
|
||||
let last: Option<i64> = sqlx::query_scalar("SELECT max(uploaded_at) FROM backup_files")
|
||||
.fetch_one(db)
|
||||
.await
|
||||
.unwrap_or(None);
|
||||
println!("Mirrored: {mirrored} files");
|
||||
match last {
|
||||
Some(at) => println!("Last put: {at} (unix seconds)"),
|
||||
None => println!("Last put: never"),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn env(key: &str) -> Option<String> {
|
||||
std::env::var(key).ok().filter(|v| !v.trim().is_empty())
|
||||
}
|
||||
|
||||
fn prompt(label: &str) -> Result<String> {
|
||||
if !std::io::stdin().is_terminal() {
|
||||
bail!("no terminal to ask for {label:?} — run with `docker compose exec -it`, or set the matching environment variable");
|
||||
}
|
||||
print!("{label}");
|
||||
std::io::stdout().flush()?;
|
||||
let mut line = String::new();
|
||||
std::io::stdin().read_line(&mut line)?;
|
||||
let line = line.trim().to_string();
|
||||
if line.is_empty() {
|
||||
bail!("nothing entered");
|
||||
}
|
||||
Ok(line)
|
||||
}
|
||||
Reference in new issue
Block a user