Revert "feat: don't stop with invalid key (#1612)"

This reverts commit d84f5b2.
atuinsh · Jan 30, 2024 · 408f730 · 408f730
1 parent 9597080
commit 408f730
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/atuin-client/src/history/store.rs b/atuin-client/src/history/store.rs
@@ -164,16 +164,7 @@ impl HistoryStore {
         for record in records.into_iter() {
             let hist = match record.version.as_str() {
                 HISTORY_VERSION => {
-                    let decrypted = record.decrypt::<PASETO_V4>(&self.encryption_key);
-
-                    let decrypted = match decrypted {
-                        Ok(d) => d,
-                        Err(e) => {
-                            println!("failed to decrypt history: {e}");
-                            continue;
-                        }
-                    };
-
+                    let decrypted = record.decrypt::<PASETO_V4>(&self.encryption_key)?;
                     HistoryRecord::deserialize(&decrypted.data, HISTORY_VERSION)
                 }
                 version => bail!("unknown history version {version:?}"),

diff --git a/atuin-client/src/record/encryption.rs b/atuin-client/src/record/encryption.rs
@@ -128,7 +128,6 @@ impl PASETO_V4 {
         // For now though we will only support the one key and key rotation will
         // have to be a hard reset
         let current_kid = wrapping_key.to_id();
-
         ensure!(
             current_kid == kid,
             "attempting to decrypt with incorrect key. currently using {current_kid}, expecting {kid}"