Tidy error variants.

crates/account/src/error.rs

@@ -1,5 +1,5 @@
 //! Errors generated by the account library.
-use sos_core::{ErrorExt, VaultId};
+use sos_core::{AuthenticationError, ErrorExt, VaultId};
 use std::path::PathBuf;
 use thiserror::Error;
 
@@ -174,6 +174,11 @@ impl ErrorExt for Error {
     }
 
     fn is_permission_denied(&self) -> bool {
-        matches!(self, Error::Vault(sos_vault::Error::PassphraseVerification))
+        matches!(
+            self,
+            Error::Vault(sos_vault::Error::Authentication(
+                AuthenticationError::PasswordVerification
+            ))
+        )
     }
 }

crates/account/src/local_account.rs

@@ -307,7 +307,7 @@ impl LocalAccount {
                 .storage
                 .folders()
                 .get(folder.id())
-                .ok_or(StorageError::CacheNotAvailable(*folder.id()))?
+                .ok_or(StorageError::FolderNotFound(*folder.id()))?
                 .commit_state()
                 .await?;
 
@@ -760,7 +760,7 @@ impl Account for LocalAccount {
             .storage
             .folders()
             .get(folder_id)
-            .ok_or(StorageError::CacheNotAvailable(*folder_id))?
+            .ok_or(StorageError::FolderNotFound(*folder_id))?
             .clone())
     }
 
@@ -1215,7 +1215,7 @@ impl Account for LocalAccount {
     async fn root_commit(&self, summary: &Summary) -> Result<CommitHash> {
         let folder =
             self.storage.folders().get(summary.id()).ok_or_else(|| {
-                StorageError::CacheNotAvailable(*summary.id())
+                StorageError::FolderNotFound(*summary.id())
             })?;
         let event_log = folder.event_log();
         let log_file = event_log.read().await;
@@ -1339,7 +1339,7 @@ impl Account for LocalAccount {
 
         let folder =
             self.storage.folders().get(summary.id()).ok_or_else(|| {
-                StorageError::CacheNotAvailable(*summary.id())
+                StorageError::FolderNotFound(*summary.id())
             })?;
 
         let event_log = folder.event_log();

crates/core/src/error.rs

@@ -81,6 +81,10 @@ pub enum Error {
     #[error(transparent)]
     Io(#[from] std::io::Error),
 
+    /// Authentication errors.
+    #[error(transparent)]
+    Authentication(#[from] AuthenticationError),
+
     /// Error generated by the JSON library.
     #[error(transparent)]
     Json(#[from] serde_json::Error),
@@ -151,13 +155,13 @@ pub trait ErrorExt {
     fn is_permission_denied(&self) -> bool;
 }
 
-/// Generic storage error shared between the client and server.
+/// Storage error shared between the client and server.
 #[derive(Debug, Error)]
 pub enum StorageError {
     /// Error generated attempting to access a folder
     /// that is not available in-memory.
-    #[error("cache not available for {0}")]
-    CacheNotAvailable(VaultId),
+    #[error("folder not found '{0}'")]
+    FolderNotFound(VaultId),
 }
 
 /// Authentication errors.
@@ -167,4 +171,10 @@ pub enum AuthenticationError {
     /// authenticated when authentication is required.
     #[error("account not authenticated, sign in required")]
     NotAuthenticated,
+
+    /// Error generated when attempting to verify a password fails.
+    ///
+    /// This can happen when unlocking a vault or verifying a password.
+    #[error("password verification failed")]
+    PasswordVerification,
 }

crates/net/src/error.rs

@@ -1,5 +1,5 @@
-//! Error type for the client module.
-use sos_core::Origin;
+//! Error type for network accounts.
+use sos_core::{AuthenticationError, Origin};
 use sos_core::{ErrorExt, VaultId};
 use sos_protocol::{transfer::CancelReason, AsConflict, ConflictError};
 use std::error::Error as StdError;
@@ -160,7 +160,12 @@ impl ErrorExt for Error {
     }
 
     fn is_permission_denied(&self) -> bool {
-        matches!(self, Error::Vault(sos_vault::Error::PassphraseVerification))
+        matches!(
+            self,
+            Error::Vault(sos_vault::Error::Authentication(
+                AuthenticationError::PasswordVerification
+            ))
+        )
     }
 }
 

crates/protocol/src/sync/primitives.rs

@@ -310,7 +310,7 @@ impl SyncComparison {
         for (id, folder) in &self.folders {
             let commit_state =
                 self.remote_status.folders.get(id).ok_or(
-                    sos_backend::StorageError::CacheNotAvailable(*id),
+                    sos_backend::StorageError::FolderNotFound(*id),
                 )?;
 
             match folder {

crates/server/src/error.rs

@@ -162,7 +162,7 @@ impl Error {
             Self::Forbidden => StatusCode::FORBIDDEN,
             Self::Conflict => StatusCode::CONFLICT,
             Self::BackendStorage(
-                sos_backend::StorageError::CacheNotAvailable(_),
+                sos_backend::StorageError::FolderNotFound(_),
             ) => StatusCode::NOT_FOUND,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         }

crates/storage/client/Cargo.toml

@@ -14,6 +14,7 @@ audit = ["sos-audit", "sos-backend/audit"]
 files = [
   "sos-external-files",
   "sos-sync/files",
+  "sos-reducers/files",
   "dep:tokio-util",
   "dep:age",
   "dep:binary-stream",

crates/storage/client/src/filesystem/mod.rs

@@ -611,7 +611,7 @@ impl ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(summary.id())
-            .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or(StorageError::FolderNotFound(*summary.id()))?;
         folder.clear().await?;
         folder.apply(events.iter().collect()).await?;
 
@@ -623,7 +623,7 @@ impl ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(summary.id())
-            .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or(StorageError::FolderNotFound(*summary.id()))?;
         let event_log = folder.event_log();
         let log_file = event_log.read().await;
         Ok(FolderReducer::new()
@@ -682,7 +682,7 @@ impl ClientSecretStorage for ClientFileSystemStorage {
             let folder = self
                 .folders
                 .get_mut(summary.id())
-                .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+                .ok_or(StorageError::FolderNotFound(*summary.id()))?;
             folder.create_secret(&secret_data).await?
         };
 
@@ -734,7 +734,7 @@ impl ClientSecretStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get(folder_id)
-            .ok_or(StorageError::CacheNotAvailable(*folder_id))?;
+            .ok_or(StorageError::FolderNotFound(*folder_id))?;
         Ok(folder.raw_secret(secret_id).await?)
     }
 
@@ -746,7 +746,7 @@ impl ClientSecretStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get(summary.id())
-            .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or(StorageError::FolderNotFound(*summary.id()))?;
         let result = folder
             .read_secret(id)
             .await?
@@ -851,7 +851,7 @@ impl ClientSecretStorage for ClientFileSystemStorage {
             let folder = self
                 .folders
                 .get_mut(summary.id())
-                .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+                .ok_or(StorageError::FolderNotFound(*summary.id()))?;
             let (_, meta, secret) = secret_data.into();
             folder
                 .update_secret(id, meta, secret)
@@ -915,7 +915,7 @@ impl ClientSecretStorage for ClientFileSystemStorage {
             let folder = self
                 .folders
                 .get_mut(summary.id())
-                .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+                .ok_or(StorageError::FolderNotFound(*summary.id()))?;
             folder
                 .delete_secret(id)
                 .await?
@@ -1106,7 +1106,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
     fn open_folder(&self, folder_id: &VaultId) -> Result<ReadEvent> {
         let summary = self
             .find(|s| s.id() == folder_id)
-            .ok_or(StorageError::CacheNotAvailable(*folder_id))?;
+            .ok_or(StorageError::FolderNotFound(*folder_id))?;
 
         let mut current = self.current.lock();
         *current = Some(summary.clone());
@@ -1153,7 +1153,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
             let folder = self
                 .folders
                 .get_mut(summary.id())
-                .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+                .ok_or(StorageError::FolderNotFound(*summary.id()))?;
             let event_log = folder.event_log();
             let mut log_file = event_log.write().await;
 
@@ -1208,7 +1208,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(summary.id())
-            .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or(StorageError::FolderNotFound(*summary.id()))?;
 
         folder.rename_folder(name.as_ref()).await?;
 
@@ -1241,7 +1241,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(summary.id())
-            .ok_or(StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or(StorageError::FolderNotFound(*summary.id()))?;
 
         let event = folder.update_folder_flags(flags).await?;
         let event = Event::Write(*summary.id(), event);
@@ -1288,7 +1288,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
         if let Some(folder) = self.folders.get(summary.id()) {
             Ok(folder.description().await?)
         } else {
-            Err(StorageError::CacheNotAvailable(*summary.id()).into())
+            Err(StorageError::FolderNotFound(*summary.id()).into())
         }
     }
 
@@ -1300,7 +1300,7 @@ impl ClientFolderStorage for ClientFileSystemStorage {
         if let Some(folder) = self.folders.get_mut(summary.id()) {
             Ok(folder.set_description(description).await?)
         } else {
-            Err(StorageError::CacheNotAvailable(*summary.id()).into())
+            Err(StorageError::FolderNotFound(*summary.id()).into())
         }
     }
 
@@ -1501,7 +1501,7 @@ impl ClientAccountStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(id)
-            .ok_or(StorageError::CacheNotAvailable(*id))?;
+            .ok_or(StorageError::FolderNotFound(*id))?;
         folder.unlock(key).await?;
         Ok(())
     }
@@ -1510,7 +1510,7 @@ impl ClientAccountStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(id)
-            .ok_or(StorageError::CacheNotAvailable(*id))?;
+            .ok_or(StorageError::FolderNotFound(*id))?;
         folder.lock().await;
         Ok(())
     }
@@ -1560,7 +1560,7 @@ impl ClientAccountStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get(folder_id)
-            .ok_or(StorageError::CacheNotAvailable(*folder_id))?;
+            .ok_or(StorageError::FolderNotFound(*folder_id))?;
         let event_log = folder.event_log();
         let log_file = event_log.read().await;
         let mut records = Vec::new();
@@ -1591,7 +1591,7 @@ impl ClientAccountStorage for ClientFileSystemStorage {
         let folder = self
             .folders
             .get(summary.id())
-            .ok_or_else(|| StorageError::CacheNotAvailable(*summary.id()))?;
+            .ok_or_else(|| StorageError::FolderNotFound(*summary.id()))?;
         let event_log = folder.event_log();
         let log_file = event_log.read().await;
         Ok(log_file.tree().commit_state()?)

crates/storage/client/src/filesystem/sync.rs

@@ -62,7 +62,7 @@ impl StorageEventLogs for ClientFileSystemStorage {
         let folder = self
             .folders
             .get(id)
-            .ok_or(StorageError::CacheNotAvailable(*id))?;
+            .ok_or(StorageError::FolderNotFound(*id))?;
         Ok(folder.event_log())
     }
 }
@@ -112,7 +112,7 @@ impl ForceMerge for ClientFileSystemStorage {
         let folder = self
             .folders
             .get_mut(folder_id)
-            .ok_or_else(|| StorageError::CacheNotAvailable(*folder_id))?;
+            .ok_or_else(|| StorageError::FolderNotFound(*folder_id))?;
         folder.force_merge(&diff).await?;
 
         outcome.changes += len;
@@ -362,7 +362,7 @@ impl Merge for ClientFileSystemStorage {
             let folder = self
                 .folders
                 .get_mut(folder_id)
-                .ok_or_else(|| StorageError::CacheNotAvailable(*folder_id))?;
+                .ok_or_else(|| StorageError::FolderNotFound(*folder_id))?;
 
             #[cfg(feature = "search")]
             {

crates/storage/server/src/database/sync.rs

@@ -355,7 +355,7 @@ impl Merge for ServerDatabaseStorage {
         );
 
         let log = self.folders.get_mut(folder_id).ok_or_else(|| {
-            sos_backend::StorageError::CacheNotAvailable(*folder_id)
+            sos_backend::StorageError::FolderNotFound(*folder_id)
         })?;
         let mut log = log.write().await;
 
@@ -429,7 +429,7 @@ impl StorageEventLogs for ServerDatabaseStorage {
         id: &VaultId,
     ) -> Result<Arc<RwLock<FolderEventLog>>> {
         Ok(Arc::clone(self.folders.get(id).ok_or(
-            sos_backend::StorageError::CacheNotAvailable(*id),
+            sos_backend::StorageError::FolderNotFound(*id),
         )?))
     }
 }

crates/storage/server/src/filesystem/sync.rs

@@ -315,7 +315,7 @@ impl Merge for ServerFileStorage {
         );
 
         let log = self.folders.get_mut(folder_id).ok_or_else(|| {
-            sos_backend::StorageError::CacheNotAvailable(*folder_id)
+            sos_backend::StorageError::FolderNotFound(*folder_id)
         })?;
         let mut log = log.write().await;
 
@@ -382,7 +382,7 @@ impl StorageEventLogs for ServerFileStorage {
         id: &VaultId,
     ) -> Result<Arc<RwLock<FolderEventLog>>> {
         Ok(Arc::clone(self.folders.get(id).ok_or(
-            sos_backend::StorageError::CacheNotAvailable(*id),
+            sos_backend::StorageError::FolderNotFound(*id),
         )?))
     }
 }

crates/vault/src/access_point.rs

@@ -8,7 +8,8 @@ use sos_core::{
     crypto::{AccessKey, AeadPack, KeyDerivation, PrivateKey},
     decode, encode,
     events::{ReadEvent, WriteEvent},
-    SecretId, VaultCommit, VaultEntry, VaultFlags, VaultId,
+    AuthenticationError, SecretId, VaultCommit, VaultEntry, VaultFlags,
+    VaultId,
 };
 use sos_vfs as vfs;
 use std::path::Path;
@@ -345,11 +346,14 @@ where
     ) -> Result<VaultMeta, E> {
         let private_key =
             self.private_key.as_ref().ok_or(Error::VaultLocked)?;
-        let meta_blob = self
-            .vault
-            .decrypt(private_key, meta_aead)
-            .await
-            .map_err(|_| Error::PassphraseVerification)?;
+        let meta_blob =
+            self.vault.decrypt(private_key, meta_aead).await.map_err(
+                |_| {
+                    sos_core::Error::from(
+                        AuthenticationError::PasswordVerification,
+                    )
+                },
+            )?;
         Ok(decode(&meta_blob).await?)
     }