From 678eaf1a36c2d96933b1f6f8db7edd39680d2ca2 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 14 Jun 2026 02:19:36 +0200 Subject: fix(client/settings): Trim sync user_id and encryption_key The files might be newline delimited, which we should remove before we try to parse the contents. --- crates/turtle/src/atuin_client/settings.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'crates/turtle/src/atuin_client/settings.rs') diff --git a/crates/turtle/src/atuin_client/settings.rs b/crates/turtle/src/atuin_client/settings.rs index 98829529..9e14c4c8 100644 --- a/crates/turtle/src/atuin_client/settings.rs +++ b/crates/turtle/src/atuin_client/settings.rs @@ -834,12 +834,17 @@ impl Sync { pub(crate) fn user_id(&self) -> Result> { Self::try_read_file(self.user_id_path.as_ref())? - .map(|file| Uuid::try_parse(&file).map_err(Into::into)) + .map(|file| { + Uuid::parse_str(file.trim()).context( + "Failed to decode user id as UUID, while trying to decode sync user_id", + ) + }) .transpose() } pub(crate) fn encryption_key(&self) -> Result> { Self::try_read_file(self.encryption_key_path.as_ref())? .as_deref() + .map(str::trim) .map(decode_key) .transpose() } -- cgit v1.3.1