aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 17:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Propagate decryption error from the callback

Browse Source
This commit is contained in:
Avinash Sajjanshetty
2025-08-29 18:02:56 +05:30
parent 13e62ce435
commit 95d14f5f1f
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/error.rs
View File

@@ -120,6 +120,8 @@ pub enum CompletionError {
UringIOError(&'static str),
#[error("Completion was aborted")]
Aborted,
#[error("Decryption failed for page={page_idx}")]
DecryptionError { page_idx: usize },
}
#[macro_export]

36
core/storage/database.rs
View File

@@ -103,25 +103,29 @@ impl DatabaseStorage for DatabaseFile {
let Ok((buf, bytes_read)) = res else {
return;
};
if bytes_read > 0 {
match encryption_ctx.decrypt_page(buf.as_slice(), page_idx) {
Ok(decrypted_data) => {
let original_buf = original_c.as_read().buf();
original_buf.as_mut_slice().copy_from_slice(&decrypted_data);
original_c.complete(bytes_read);
}
Err(_) => {
tracing::error!(
"Failed to decrypt page data for page_id={page_idx}"
);
original_c.complete(-1);
}
assert!(
bytes_read > 0,
"Expected to read some data on success for page_id={page_idx}"
);
match encryption_ctx.decrypt_page(buf.as_slice(), page_idx) {
Ok(decrypted_data) => {
let original_buf = original_c.as_read().buf();
original_buf.as_mut_slice().copy_from_slice(&decrypted_data);
original_c.complete(bytes_read);
}
Err(e) => {
tracing::error!(
"Failed to decrypt page data for page_id={page_idx}: {e}"
);
assert_eq!(
original_c.has_error(),
false,
"Original completion already has an error"
);
original_c.error(CompletionError::DecryptionError { page_idx });
}
} else {
original_c.complete(bytes_read);
}
});
let new_completion = Completion::new_read(read_buffer, decrypt_complete);
self.file.pread(pos, new_completion)
} else {