return err if no cipher version (#908)

xmtp · Jul 18, 2024 · 2de056e · 2de056e
1 parent 11a51ca
commit 2de056e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/xmtp_mls/src/storage/encrypted_store/mod.rs b/xmtp_mls/src/storage/encrypted_store/mod.rs
@@ -154,15 +154,22 @@ impl EncryptedMessageStore {
 
         if self.enc_key.is_some() {
             let cipher_version = sql_query("PRAGMA cipher_version").load::<CipherVersion>(conn)?;
+            if cipher_version.is_empty() {
+                return Err(StorageError::SqlCipherNotLoaded);
+            }
             let cipher_provider_version =
                 sql_query("PRAGMA cipher_provider_version").load::<CipherProviderVersion>(conn)?;
             log::info!(
-                "Sqlite cipher_version={}, cipher_provider_version={}",
-                cipher_version[0].cipher_version,
-                cipher_provider_version[0].cipher_provider_version,
+                "Sqlite cipher_version={:?}, cipher_provider_version={:?}",
+                cipher_version.first().as_ref().map(|v| &v.cipher_version),
+                cipher_provider_version
+                    .first()
+                    .as_ref()
+                    .map(|v| &v.cipher_provider_version)
             );
             if log_enabled!(log::Level::Info) {
-                conn.batch_execute("PRAGMA cipher_log = stderr; PRAGMA cipher_log_level = INFO;")?;
+                conn.batch_execute("PRAGMA cipher_log = stderr; PRAGMA cipher_log_level = INFO;")
+                    .ok();
             }
         }
 

diff --git a/xmtp_mls/src/storage/errors.rs b/xmtp_mls/src/storage/errors.rs
@@ -35,6 +35,8 @@ pub enum StorageError {
     Conflict(String),
     #[error(transparent)]
     Intent(#[from] IntentError),
+    #[error("The SQLCipher Sqlite extension is not present, but an encryption key is given")]
+    SqlCipherNotLoaded,
 }
 
 impl<T> From<PoisonError<T>> for StorageError {