mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-21 10:23:48 +01:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e15e1dcc76 | ||
|
|
734e9040fb | ||
|
|
01e3860741 | ||
|
|
7a65e7011f | ||
|
|
233d9e9e51 | ||
|
|
73c4e1f6bf |
No files matched your search
Generated
+36
-9
@@ -1476,7 +1476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1931,7 +1931,7 @@ dependencies = [
|
|||||||
"gobject-sys",
|
"gobject-sys",
|
||||||
"libc",
|
"libc",
|
||||||
"system-deps 9.0.1",
|
"system-deps 9.0.1",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3633,6 +3633,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"parking_lot 0.13.0",
|
"parking_lot 0.13.0",
|
||||||
"proton-auth-rs",
|
"proton-auth-rs",
|
||||||
|
"proton-base-rs",
|
||||||
"proton-drive-rs",
|
"proton-drive-rs",
|
||||||
"proton-gallery-rs",
|
"proton-gallery-rs",
|
||||||
"proton-sdk",
|
"proton-sdk",
|
||||||
@@ -3668,6 +3669,7 @@ dependencies = [
|
|||||||
"proton-drive-rs",
|
"proton-drive-rs",
|
||||||
"proton-gallery-app-rs",
|
"proton-gallery-app-rs",
|
||||||
"proton-gallery-rs",
|
"proton-gallery-rs",
|
||||||
|
"proton-media-rs",
|
||||||
"rustix",
|
"rustix",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -3924,20 +3926,32 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proton-auth-rs"
|
name = "proton-auth-rs"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e140db8b4444e50c818c9793c2078b57c16c5b6c285a8d4bbd74886f41b05c6f"
|
checksum = "383119b502a1741f1ec4a248cb1e8d2f4835d5ea415803b041f76b6f89cf1ffc"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"apple-native-keyring-store",
|
"apple-native-keyring-store",
|
||||||
"dbus-secret-service",
|
"dbus-secret-service",
|
||||||
"dbus-secret-service-keyring-store",
|
"dbus-secret-service-keyring-store",
|
||||||
"keyring-core",
|
"keyring-core",
|
||||||
|
"proton-sdk",
|
||||||
|
"serde_json",
|
||||||
"thiserror 2.0.21",
|
"thiserror 2.0.21",
|
||||||
"tracing",
|
"tracing",
|
||||||
"windows-native-keyring-store",
|
"windows-native-keyring-store",
|
||||||
"zeroize",
|
"zeroize",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-base-rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "451151bb1025ea5cb362f69e2bfb2d45afed603e5c6daa3dc752333a7c29c878"
|
||||||
|
dependencies = [
|
||||||
|
"rusqlite",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proton-drive-rs"
|
name = "proton-drive-rs"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -4032,6 +4046,19 @@ dependencies = [
|
|||||||
"zip",
|
"zip",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-media-rs"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f03aa6c403e4f2f7a8f9a444dff1e268d8bc9bcaf1d0d953cc3a1312d798f1ef"
|
||||||
|
dependencies = [
|
||||||
|
"lru",
|
||||||
|
"sha2 0.11.1",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proton-sdk"
|
name = "proton-sdk"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -4155,7 +4182,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"socket2",
|
"socket2",
|
||||||
"tracing",
|
"tracing",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4610,7 +4637,7 @@ dependencies = [
|
|||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys",
|
"linux-raw-sys",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4667,7 +4694,7 @@ dependencies = [
|
|||||||
"security-framework",
|
"security-framework",
|
||||||
"security-framework-sys",
|
"security-framework-sys",
|
||||||
"webpki-root-certs",
|
"webpki-root-certs",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5175,7 +5202,7 @@ dependencies = [
|
|||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rustix",
|
"rustix",
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5840,7 +5867,7 @@ version = "0.1.11"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
+3
-1
@@ -65,7 +65,9 @@ rusqlite = { version = "0.41", features = ["bundled"] }
|
|||||||
keyring-core = "1"
|
keyring-core = "1"
|
||||||
# The keyring store all three apps share: reconnects after a Secret Service
|
# The keyring store all three apps share: reconnects after a Secret Service
|
||||||
# restart (B285) and replaces items instead of editing them (B291).
|
# restart (B285) and replaces items instead of editing them (B291).
|
||||||
proton-auth-rs = "0.1"
|
proton-auth-rs = "0.1.1"
|
||||||
|
proton-base-rs = "0.1"
|
||||||
|
proton-media-rs = "0.1.1"
|
||||||
dbus-secret-service-keyring-store = { version = "1", features = ["crypto-rust"] }
|
dbus-secret-service-keyring-store = { version = "1", features = ["crypto-rust"] }
|
||||||
# The same Secret Service client the store wraps, used directly to replace an
|
# The same Secret Service client the store wraps, used directly to replace an
|
||||||
# item instead of editing it, which oo7 before 0.7.0 kept only in memory (B291).
|
# item instead of editing it, which oo7 before 0.7.0 kept only in memory (B291).
|
||||||
|
|||||||
@@ -25,7 +25,8 @@ shell-words.workspace = true
|
|||||||
sha2.workspace = true
|
sha2.workspace = true
|
||||||
rusqlite.workspace = true
|
rusqlite.workspace = true
|
||||||
keyring-core.workspace = true
|
keyring-core.workspace = true
|
||||||
proton-auth-rs = { workspace = true, features = ["keyring"] }
|
proton-auth-rs = { workspace = true, features = ["keyring", "session"] }
|
||||||
|
proton-base-rs.workspace = true
|
||||||
dbus-secret-service-keyring-store.workspace = true
|
dbus-secret-service-keyring-store.workspace = true
|
||||||
dbus-secret-service.workspace = true
|
dbus-secret-service.workspace = true
|
||||||
parking_lot.workspace = true
|
parking_lot.workspace = true
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ use std::time::Duration;
|
|||||||
use base64::Engine as _;
|
use base64::Engine as _;
|
||||||
use base64::engine::general_purpose::STANDARD as BASE64;
|
use base64::engine::general_purpose::STANDARD as BASE64;
|
||||||
use keyring_core::Entry;
|
use keyring_core::Entry;
|
||||||
|
use proton_auth_rs::session::{self, SignInError, Step};
|
||||||
use proton_auth_rs::{KeyringStore, SecretStore};
|
use proton_auth_rs::{KeyringStore, SecretStore};
|
||||||
use proton_drive_rs::{KeySalt, ProtonDriveClient};
|
use proton_drive_rs::{KeySalt, ProtonDriveClient};
|
||||||
use proton_sdk::account::KeyPassphrases;
|
use proton_sdk::account::KeyPassphrases;
|
||||||
@@ -279,74 +280,58 @@ pub async fn login_verified(
|
|||||||
get_totp: impl Fn() -> Result<String>,
|
get_totp: impl Fn() -> Result<String>,
|
||||||
get_mailbox: impl Fn(u32) -> Result<Mailbox>,
|
get_mailbox: impl Fn(u32) -> Result<Mailbox>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let password = Zeroizing::new(password.to_owned());
|
// The sequence is `proton_auth_rs::session`, shared with the other Proton
|
||||||
let session = ProtonApiSession::begin_verified(
|
// apps. It reads the key salts before unlocking, while this access token
|
||||||
client_config(),
|
// still has the `locked` scope: after its first refresh it never will
|
||||||
username,
|
// again, and without them no later resume can unlock the key chain. See
|
||||||
password.as_bytes(),
|
// `StoredSession::key_salts`.
|
||||||
verification,
|
let mut step = session::begin(client_config(), username, password, verification)
|
||||||
)
|
.await
|
||||||
.await
|
.map_err(sign_in_error)?;
|
||||||
.map_err(classify_verification_gate);
|
let (unlocked, remember) = loop {
|
||||||
let mut session = session?;
|
step = match step {
|
||||||
|
Step::SecondFactor(pending) => {
|
||||||
if session.is_waiting_for_second_factor() {
|
let code = get_totp()?;
|
||||||
let code = get_totp()?;
|
pending.second_factor(&code).await.map_err(sign_in_error)?
|
||||||
session.apply_second_factor_code(code.trim()).await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Grab the key salts while this access token still has the `locked` scope:
|
|
||||||
// after its first refresh it never will again, and without them no later
|
|
||||||
// resume can unlock the key chain. See `StoredSession::key_salts`.
|
|
||||||
let key_salts = ProtonDriveClient::new(&session, Vec::new())
|
|
||||||
.account()
|
|
||||||
.key_salts()
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// A single-password account's mailbox password is the login password. A
|
|
||||||
// two-password one has a second secret the user must type, and it is checked
|
|
||||||
// against the account now — a typo found at login is a retry, found later it
|
|
||||||
// is a daemon that never mounts.
|
|
||||||
let (passphrases, remember) = match session.password_mode() {
|
|
||||||
PasswordMode::Single => (
|
|
||||||
derive_verified(&session, password.as_bytes(), key_salts.clone()).await?,
|
|
||||||
true,
|
|
||||||
),
|
|
||||||
PasswordMode::Dual => {
|
|
||||||
let mut attempt = 0;
|
|
||||||
loop {
|
|
||||||
let mailbox = get_mailbox(attempt)?;
|
|
||||||
match derive_verified(&session, mailbox.password.as_bytes(), key_salts.clone())
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Ok(passphrases) => break (passphrases, mailbox.remember),
|
|
||||||
Err(Error::WrongMailboxPassword) if attempt + 1 < MAILBOX_ATTEMPTS => {
|
|
||||||
attempt += 1;
|
|
||||||
}
|
|
||||||
Err(e) => return Err(e),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
// A single-password account's mailbox password is the login password.
|
||||||
|
Step::Unlock(pending) => break (pending.unlock().await.map_err(sign_in_error)?, true),
|
||||||
|
// A two-password one has a second secret the user must type, and it is
|
||||||
|
// checked against the account now — a typo found at login is a retry,
|
||||||
|
// found later it is a daemon that never mounts.
|
||||||
|
Step::MailboxPassword(pending) => {
|
||||||
|
let mut attempt = 0;
|
||||||
|
break loop {
|
||||||
|
let mailbox = get_mailbox(attempt)?;
|
||||||
|
match pending.mailbox_password(&mailbox.password).await {
|
||||||
|
Ok(unlocked) => break (unlocked, mailbox.remember),
|
||||||
|
Err(SignInError::WrongMailboxPassword)
|
||||||
|
if attempt + 1 < MAILBOX_ATTEMPTS =>
|
||||||
|
{
|
||||||
|
attempt += 1;
|
||||||
|
}
|
||||||
|
Err(e) => return Err(sign_in_error(e)),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
let tokens = session.current_tokens().await;
|
let tokens = unlocked.tokens().await;
|
||||||
register_refresh_handler(&session, tokens.refresh_token.clone());
|
register_refresh_handler(&unlocked.session, tokens.refresh_token.clone());
|
||||||
let stored = StoredSession {
|
let stored = StoredSession {
|
||||||
session_id: session.session_id().as_str().to_owned(),
|
session_id: tokens.session_id,
|
||||||
username: session.username().to_owned(),
|
username: tokens.username,
|
||||||
user_id: session.user_id().as_str().to_owned(),
|
user_id: tokens.user_id,
|
||||||
access_token: tokens.access_token,
|
access_token: tokens.access_token,
|
||||||
refresh_token: tokens.refresh_token,
|
refresh_token: tokens.refresh_token,
|
||||||
scopes: session.scopes().to_vec(),
|
scopes: tokens.scopes,
|
||||||
password_mode: match session.password_mode() {
|
password_mode: session::password_mode_to_wire(tokens.password_mode),
|
||||||
PasswordMode::Single => 1,
|
|
||||||
PasswordMode::Dual => 2,
|
|
||||||
},
|
|
||||||
mailbox_password: String::new(),
|
mailbox_password: String::new(),
|
||||||
key_salts,
|
key_salts: unlocked.key_salts,
|
||||||
key_passphrases: None,
|
key_passphrases: None,
|
||||||
};
|
};
|
||||||
keep_passphrases(stored, &passphrases, remember)
|
keep_passphrases(stored, &unlocked.key_passphrases, remember)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Derive the key passphrases from `mailbox` and prove they unlock the account.
|
/// Derive the key passphrases from `mailbox` and prove they unlock the account.
|
||||||
@@ -420,20 +405,23 @@ fn decode_secret(secret: &[u8]) -> Option<KeyPassphrases> {
|
|||||||
decode(&serde_json::from_slice(secret).ok()?)
|
decode(&serde_json::from_slice(secret).ok()?)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Lift a human-verification gate out of the generic API error into the typed
|
/// A failed sign-in step as this crate's error.
|
||||||
/// variant a front-end can act on.
|
|
||||||
///
|
///
|
||||||
/// Only a gate that names a solvable method is converted. A `9001` with no
|
/// A blocked, refused or wrong-code attempt goes back to the Proton error it
|
||||||
/// `Details`, or one offering only `email`/`sms`, stays a plain API error:
|
/// came from, which is what the front-ends word themselves. Only a gate that
|
||||||
/// promoting it would send the UI to open a verification page it cannot
|
/// names a solvable method is a [`Error::HumanVerificationRequired`]: one that
|
||||||
/// complete, which reads to the user as a hang rather than a refusal.
|
/// offers only `email`/`sms` stays a plain API error, because sending the UI to
|
||||||
fn classify_verification_gate(e: ProtonError) -> Error {
|
/// open a page it cannot complete reads as a hang rather than a refusal.
|
||||||
let ProtonError::Api(api) = &e else {
|
fn sign_in_error(e: SignInError) -> Error {
|
||||||
return e.into();
|
match e {
|
||||||
};
|
SignInError::HumanVerification(hv) => Error::HumanVerificationRequired(hv),
|
||||||
match api.human_verification() {
|
SignInError::SecurityKeyOnly => Error::SecurityKeyOnly,
|
||||||
Some(hv) if hv.supports_captcha() => Error::HumanVerificationRequired(Box::new(hv)),
|
SignInError::Blocked(api) | SignInError::Rejected(api) | SignInError::WrongCode(api) => {
|
||||||
_ => e.into(),
|
Error::Proton(ProtonError::Api(api))
|
||||||
|
}
|
||||||
|
SignInError::WrongMailboxPassword => Error::WrongMailboxPassword,
|
||||||
|
SignInError::Proton(e) => e.into(),
|
||||||
|
other => Error::Other(other.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -457,26 +457,7 @@ fn load_config_at(path: &Path) -> AppConfig {
|
|||||||
/// [`AppDirs::save_config`] for the file at `path`.
|
/// [`AppDirs::save_config`] for the file at `path`.
|
||||||
fn save_config_at(path: &Path, config: &AppConfig) -> Result<()> {
|
fn save_config_at(path: &Path, config: &AppConfig) -> Result<()> {
|
||||||
refuse_to_replace_unreadable(path)?;
|
refuse_to_replace_unreadable(path)?;
|
||||||
let parent = path
|
proton_base_rs::atomic::write(path, &serde_json::to_vec_pretty(config)?)?;
|
||||||
.parent()
|
|
||||||
.ok_or_else(|| Error::Other("configuration path has no parent".into()))?;
|
|
||||||
std::fs::create_dir_all(parent)?;
|
|
||||||
let nonce = std::time::SystemTime::now()
|
|
||||||
.duration_since(std::time::UNIX_EPOCH)
|
|
||||||
.map(|duration| duration.as_nanos())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let tmp = path.with_extension(format!("json.tmp-{}-{nonce}", std::process::id()));
|
|
||||||
use std::os::unix::fs::OpenOptionsExt as _;
|
|
||||||
let mut file = std::fs::OpenOptions::new()
|
|
||||||
.write(true)
|
|
||||||
.create_new(true)
|
|
||||||
.mode(0o600)
|
|
||||||
.open(&tmp)?;
|
|
||||||
use std::io::Write as _;
|
|
||||||
file.write_all(&serde_json::to_vec_pretty(config)?)?;
|
|
||||||
file.sync_all()?;
|
|
||||||
std::fs::rename(&tmp, path)?;
|
|
||||||
std::fs::File::open(parent)?.sync_all()?;
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -621,15 +602,8 @@ impl AppDirs {
|
|||||||
use std::io::Read as _;
|
use std::io::Read as _;
|
||||||
std::fs::File::open("/dev/urandom")?.read_exact(&mut bytes)?;
|
std::fs::File::open("/dev/urandom")?.read_exact(&mut bytes)?;
|
||||||
let id: String = bytes.iter().map(|b| format!("{b:02x}")).collect();
|
let id: String = bytes.iter().map(|b| format!("{b:02x}")).collect();
|
||||||
let parent = path
|
// Not secret, and other tools may read it; keep it world-readable.
|
||||||
.parent()
|
proton_base_rs::atomic::write_with_mode(&path, format!("{id}\n").as_bytes(), 0o644)?;
|
||||||
.ok_or_else(|| Error::Other("machine id path has no parent".into()))?;
|
|
||||||
std::fs::create_dir_all(parent)?;
|
|
||||||
let tmp = path.with_extension(format!("tmp-{}", std::process::id()));
|
|
||||||
std::fs::write(&tmp, format!("{id}\n"))?;
|
|
||||||
std::fs::File::open(&tmp)?.sync_all()?;
|
|
||||||
std::fs::rename(&tmp, &path)?;
|
|
||||||
std::fs::File::open(parent)?.sync_all()?;
|
|
||||||
Ok(id)
|
Ok(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,13 @@ pub enum Error {
|
|||||||
#[error("that mailbox password does not unlock your account")]
|
#[error("that mailbox password does not unlock your account")]
|
||||||
WrongMailboxPassword,
|
WrongMailboxPassword,
|
||||||
|
|
||||||
|
/// The account's only second factor is a security key, which needs
|
||||||
|
/// WebAuthn. Asking for a code would only fail as a wrong one.
|
||||||
|
#[error(
|
||||||
|
"this account's only second factor is a security key, which pdfs cannot use yet — add an authenticator app in your Proton account settings"
|
||||||
|
)]
|
||||||
|
SecurityKeyOnly,
|
||||||
|
|
||||||
/// The login was gated behind human verification. Not a failure the user can
|
/// The login was gated behind human verification. Not a failure the user can
|
||||||
/// fix by retrying: the challenge has to be solved and the login restarted
|
/// fix by retrying: the challenge has to be solved and the login restarted
|
||||||
/// with the resulting token (see [`auth::login_verified`](crate::auth::login_verified)).
|
/// with the resulting token (see [`auth::login_verified`](crate::auth::login_verified)).
|
||||||
@@ -220,6 +227,7 @@ fn core_kind(e: &Error) -> ErrorKind {
|
|||||||
| Error::ReloginRequired
|
| Error::ReloginRequired
|
||||||
| Error::Locked
|
| Error::Locked
|
||||||
| Error::WrongMailboxPassword
|
| Error::WrongMailboxPassword
|
||||||
|
| Error::SecurityKeyOnly
|
||||||
| Error::HumanVerificationRequired(_) => ErrorKind::Denied,
|
| Error::HumanVerificationRequired(_) => ErrorKind::Denied,
|
||||||
Error::Proton(proton) => proton_kind(proton),
|
Error::Proton(proton) => proton_kind(proton),
|
||||||
_ => ErrorKind::Internal,
|
_ => ErrorKind::Internal,
|
||||||
|
|||||||
@@ -40,9 +40,7 @@ pub fn path(state_dir: &Path) -> PathBuf {
|
|||||||
/// and renamed, so a reader never sees half of it.
|
/// and renamed, so a reader never sees half of it.
|
||||||
pub fn record(state_dir: &Path, failure: &MountFailure) -> std::io::Result<()> {
|
pub fn record(state_dir: &Path, failure: &MountFailure) -> std::io::Result<()> {
|
||||||
let json = serde_json::to_vec(failure).map_err(std::io::Error::other)?;
|
let json = serde_json::to_vec(failure).map_err(std::io::Error::other)?;
|
||||||
let tmp = state_dir.join(format!("{FILE_NAME}.tmp"));
|
proton_base_rs::atomic::write_with_mode(&path(state_dir), &json, 0o644)
|
||||||
std::fs::write(&tmp, json)?;
|
|
||||||
std::fs::rename(&tmp, path(state_dir))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Forget the failure: a mount is up, or a new daemon has started.
|
/// Forget the failure: a mount is up, or a new daemon has started.
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ sha1.workspace = true
|
|||||||
proton-drive-rs.workspace = true
|
proton-drive-rs.workspace = true
|
||||||
proton-gallery-app-rs.workspace = true
|
proton-gallery-app-rs.workspace = true
|
||||||
proton-gallery-rs.workspace = true
|
proton-gallery-rs.workspace = true
|
||||||
|
proton-media-rs.workspace = true
|
||||||
hyper = { version = "1", features = ["http1", "server"] }
|
hyper = { version = "1", features = ["http1", "server"] }
|
||||||
hyper-util = { version = "0.1", features = ["tokio"] }
|
hyper-util = { version = "0.1", features = ["tokio"] }
|
||||||
http-body-util = "0.1"
|
http-body-util = "0.1"
|
||||||
|
|||||||
@@ -212,15 +212,12 @@ impl BlockRing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The result of fetching one block, shared between everyone who wanted it.
|
/// The result of fetching one block, shared between everyone who wanted it.
|
||||||
type BlockResult = Result<Arc<Vec<u8>>, Errno>;
|
pub(super) type BlockResult = Result<Arc<Vec<u8>>, Errno>;
|
||||||
|
|
||||||
/// Identifies a block *of a revision*: node, validity tag, and the plaintext
|
/// Identifies a block *of a revision*: node, validity tag, and the plaintext
|
||||||
/// range the block covers — see [`RingKey`] for why it is the range and not the
|
/// range the block covers — see [`RingKey`] for why it is the range and not the
|
||||||
/// index.
|
/// index.
|
||||||
type BlockKey = (NodeUid, i64, u64, BlockSpan);
|
pub(super) type BlockKey = (NodeUid, i64, u64, BlockSpan);
|
||||||
|
|
||||||
/// A claim on a block key: who owns the fetch, and where its result is published.
|
|
||||||
type Claim = (u64, tokio::sync::watch::Receiver<Option<BlockResult>>);
|
|
||||||
|
|
||||||
/// Block fetches in flight, so a block is downloaded and decrypted once however
|
/// Block fetches in flight, so a block is downloaded and decrypted once however
|
||||||
/// many readers want it at that moment (audit T1).
|
/// many readers want it at that moment (audit T1).
|
||||||
@@ -231,34 +228,7 @@ type Claim = (u64, tokio::sync::watch::Receiver<Option<BlockResult>>);
|
|||||||
/// for. Without this each of them pays the full round-trip and decrypt and all
|
/// for. Without this each of them pays the full round-trip and decrypt and all
|
||||||
/// but one result is discarded — roughly double the bandwidth and CPU in steady
|
/// but one result is discarded — roughly double the bandwidth and CPU in steady
|
||||||
/// state. Same shape as [`ReaderSlot::Pending`] one level up.
|
/// state. Same shape as [`ReaderSlot::Pending`] one level up.
|
||||||
#[derive(Default)]
|
pub(super) type BlockFlight = proton_media_rs::SingleFlight<BlockKey, BlockResult>;
|
||||||
pub(super) struct BlockFlight {
|
|
||||||
inflight: Mutex<HashMap<BlockKey, Claim>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Distinguishes attempts at the same key, so a leader only retires its own.
|
|
||||||
static NEXT_FLIGHT_ID: AtomicU64 = AtomicU64::new(0);
|
|
||||||
|
|
||||||
/// The leader's claim on a key. Retires it on drop — including when the task is
|
|
||||||
/// cancelled mid-fetch, which is what keeps a dropped `JoinSet` from leaving a
|
|
||||||
/// key nobody will ever publish.
|
|
||||||
struct Flight {
|
|
||||||
flight: Arc<BlockFlight>,
|
|
||||||
key: BlockKey,
|
|
||||||
id: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for Flight {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let mut inflight = self.flight.inflight.lock();
|
|
||||||
if inflight
|
|
||||||
.get(&self.key)
|
|
||||||
.is_some_and(|(id, _)| *id == self.id)
|
|
||||||
{
|
|
||||||
inflight.remove(&self.key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Where each file's reader is expected to read next, so sequential reads can be
|
/// Where each file's reader is expected to read next, so sequential reads can be
|
||||||
/// told from random ones and only the former prefetched (audit T2).
|
/// told from random ones and only the former prefetched (audit T2).
|
||||||
@@ -581,49 +551,11 @@ impl Core {
|
|||||||
cache_blocks: bool,
|
cache_blocks: bool,
|
||||||
) -> BlockResult {
|
) -> BlockResult {
|
||||||
let key: BlockKey = (uid.clone(), mtime, fsize, span);
|
let key: BlockKey = (uid.clone(), mtime, fsize, span);
|
||||||
let claim = {
|
self.block_flight
|
||||||
let mut inflight = self.block_flight.inflight.lock();
|
.join(key, || {
|
||||||
match inflight.get(&key) {
|
self.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
||||||
Some((_, rx)) => Err(rx.clone()),
|
})
|
||||||
None => {
|
.await
|
||||||
let id = NEXT_FLIGHT_ID.fetch_add(1, Ordering::Relaxed);
|
|
||||||
let (tx, rx) = tokio::sync::watch::channel(None);
|
|
||||||
inflight.insert(key.clone(), (id, rx));
|
|
||||||
Ok((
|
|
||||||
tx,
|
|
||||||
Flight {
|
|
||||||
flight: self.block_flight.clone(),
|
|
||||||
key: key.clone(),
|
|
||||||
id,
|
|
||||||
},
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let (tx, flight) = match claim {
|
|
||||||
Ok(lead) => lead,
|
|
||||||
Err(mut rx) => {
|
|
||||||
loop {
|
|
||||||
if let Some(result) = rx.borrow_and_update().clone() {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
if rx.changed().await.is_err() {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return self
|
|
||||||
.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let result = self
|
|
||||||
.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
|
||||||
.await;
|
|
||||||
// Retire the claim before publishing, so a racer that wakes and re-enters
|
|
||||||
// finds no stale entry to join.
|
|
||||||
drop(flight);
|
|
||||||
let _ = tx.send(Some(result.clone()));
|
|
||||||
result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download and decrypt one block, then put it where the next reader will
|
/// Download and decrypt one block, then put it where the next reader will
|
||||||
|
|||||||
@@ -336,6 +336,9 @@ pub(crate) fn login_error_message(error: &pdfs_core::Error) -> String {
|
|||||||
pdfs_core::Error::WrongMailboxPassword => {
|
pdfs_core::Error::WrongMailboxPassword => {
|
||||||
gettext("That mailbox password didn't unlock your account.")
|
gettext("That mailbox password didn't unlock your account.")
|
||||||
}
|
}
|
||||||
|
pdfs_core::Error::SecurityKeyOnly => gettext(
|
||||||
|
"This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code.",
|
||||||
|
),
|
||||||
pdfs_core::Error::Other(message) if message.contains("verification") => gettext(
|
pdfs_core::Error::Other(message) if message.contains("verification") => gettext(
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a new one.",
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a new one.",
|
||||||
),
|
),
|
||||||
@@ -711,6 +714,9 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_cancelled_prompt_says_which_step_was_skipped() {
|
fn a_cancelled_prompt_says_which_step_was_skipped() {
|
||||||
|
assert!(
|
||||||
|
login_error_message(&pdfs_core::Error::SecurityKeyOnly).contains("authenticator app")
|
||||||
|
);
|
||||||
let totp = pdfs_core::Error::Other("two-factor entry cancelled".into());
|
let totp = pdfs_core::Error::Other("two-factor entry cancelled".into());
|
||||||
assert!(login_error_message(&totp).contains("two-factor code"));
|
assert!(login_error_message(&totp).contains("two-factor code"));
|
||||||
let hv = pdfs_core::Error::Other("verification cancelled".into());
|
let hv = pdfs_core::Error::Other("verification cancelled".into());
|
||||||
|
|||||||
@@ -13,6 +13,15 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
|||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
- Signing in runs through `proton_auth_rs::session`, the sequence Proton Gallery and
|
||||||
|
Proton Stream use too. The stored session, the lock/unlock choice for two-password
|
||||||
|
accounts, the three mailbox-password tries and the messages stay as they were.
|
||||||
|
- An account whose only second factor is a security key now gets a clear message at
|
||||||
|
sign-in instead of a code prompt that could only fail.
|
||||||
|
- Block fetches shared by concurrent readers now use `SingleFlight` from
|
||||||
|
`proton-media-rs`, the same code Proton Stream uses. Same behaviour: one
|
||||||
|
download per block, every reader gets its result, and a reader whose fetch was
|
||||||
|
cancelled downloads the block itself.
|
||||||
- The shared Gallery engine now comes from the `proton-gallery-rs` and
|
- The shared Gallery engine now comes from the `proton-gallery-rs` and
|
||||||
`proton-gallery-app-rs` crates on crates.io instead of a pinned Git revision of
|
`proton-gallery-app-rs` crates on crates.io instead of a pinned Git revision of
|
||||||
Proton Gallery. Builds, vendoring and the Nix package no longer fetch from Git.
|
Proton Gallery. Builds, vendoring and the Nix package no longer fetch from Git.
|
||||||
@@ -22,6 +31,9 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
|||||||
- The keyring code (one Secret Service connection that reconnects after the provider
|
- The keyring code (one Secret Service connection that reconnects after the provider
|
||||||
restarts, B285, and replacing the session item instead of editing it, B291) now comes
|
restarts, B285, and replacing the session item instead of editing it, B291) now comes
|
||||||
from `proton-auth-rs`, shared with Proton Gallery and Proton Stream. No behaviour change.
|
from `proton-auth-rs`, shared with Proton Gallery and Proton Stream. No behaviour change.
|
||||||
|
- Config, machine-id and mount-failure files are written through `proton-base-rs`'s
|
||||||
|
atomic writer (temporary file, sync, rename, directory sync). The mount-failure file
|
||||||
|
is now synced before the rename too, so a crash cannot leave it empty.
|
||||||
|
|
||||||
## [3.9.0] — 2026-11-19
|
## [3.9.0] — 2026-11-19
|
||||||
|
|
||||||
|
|||||||
@@ -3599,6 +3599,10 @@ msgstr "Anmeldung abgebrochen: Es wurde kein Postfach-Passwort eingegeben."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "Das Postfach-Passwort hat Ihr Konto nicht entsperrt."
|
msgstr "Das Postfach-Passwort hat Ihr Konto nicht entsperrt."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "Der einzige zweite Faktor dieses Kontos ist ein Sicherheitsschlüssel, den diese App noch nicht nutzen kann. Fügen Sie in Ihren Proton-Kontoeinstellungen eine Authentifizierungs-App hinzu und melden Sie sich dann mit deren Code an."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3541,6 +3541,10 @@ msgstr "Sign-in cancelled: no mailbox password was entered."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "That mailbox password didn't unlock your account."
|
msgstr "That mailbox password didn't unlock your account."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3575,6 +3575,10 @@ msgstr "Inicio de sesión cancelado: no se introdujo la contraseña del buzón."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "Esa contraseña del buzón no desbloqueó tu cuenta."
|
msgstr "Esa contraseña del buzón no desbloqueó tu cuenta."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "El único segundo factor de esta cuenta es una llave de seguridad, que esta aplicación aún no puede usar. Añade una aplicación de autenticación en los ajustes de tu cuenta de Proton y luego inicia sesión con su código."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3600,6 +3600,10 @@ msgid "That mailbox password didn't unlock your account."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Ce mot de passe de boîte aux lettres n’a pas déverrouillé votre compte."
|
"Ce mot de passe de boîte aux lettres n’a pas déverrouillé votre compte."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "Le seul second facteur de ce compte est une clé de sécurité, que cette application ne peut pas encore utiliser. Ajoutez une application d’authentification dans les paramètres de votre compte Proton, puis connectez-vous avec son code."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3593,6 +3593,10 @@ msgid "That mailbox password didn't unlock your account."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Quella password della casella di posta non ha sbloccato il tuo account."
|
"Quella password della casella di posta non ha sbloccato il tuo account."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "L’unico secondo fattore di questo account è una chiave di sicurezza, che questa app non può ancora usare. Aggiungi un’app di autenticazione nelle impostazioni del tuo account Proton, poi accedi con il suo codice."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3583,6 +3583,10 @@ msgstr "Aanmelden geannuleerd: er is geen mailboxwachtwoord ingevoerd."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "Dat mailboxwachtwoord heeft je account niet ontgrendeld."
|
msgstr "Dat mailboxwachtwoord heeft je account niet ontgrendeld."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "De enige tweede factor van dit account is een beveiligingssleutel, die deze app nog niet kan gebruiken. Voeg een authenticator-app toe in je Proton-accountinstellingen en meld je daarna aan met de code daarvan."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3411,6 +3411,10 @@ msgstr ""
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3652,6 +3652,10 @@ msgstr "Anulowano logowanie: nie wpisano hasła skrzynki pocztowej."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "To hasło skrzynki pocztowej nie odblokowało Twojego konta."
|
msgstr "To hasło skrzynki pocztowej nie odblokowało Twojego konta."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "Jedynym drugim składnikiem tego konta jest klucz bezpieczeństwa, którego ta aplikacja nie może jeszcze używać. Dodaj aplikację uwierzytelniającą w ustawieniach konta Proton, a następnie zaloguj się jej kodem."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
@@ -3575,6 +3575,10 @@ msgstr "Entrada cancelada: nenhuma senha da caixa de correio foi digitada."
|
|||||||
msgid "That mailbox password didn't unlock your account."
|
msgid "That mailbox password didn't unlock your account."
|
||||||
msgstr "Essa senha da caixa de correio não desbloqueou sua conta."
|
msgstr "Essa senha da caixa de correio não desbloqueou sua conta."
|
||||||
|
|
||||||
|
#: crates/pdfs-gui/src/app/pages/login.rs
|
||||||
|
msgid "This account's only second factor is a security key, which this app can't use yet. Add an authenticator app in your Proton account settings, then sign in with its code."
|
||||||
|
msgstr "O único segundo fator desta conta é uma chave de segurança, que este app ainda não pode usar. Adicione um app autenticador nas configurações da sua conta Proton e depois entre com o código dele."
|
||||||
|
|
||||||
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
#: crates/pdfs-gui/src/app/pages/login.rs:340
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
"Sign-in cancelled: the verification wasn't completed. Sign in again to get a "
|
||||||
|
|||||||
Reference in new issue
Block a user